From 2550eaa9ac17aa059b33d1818679ef57a25f6eeb Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 14 Aug 2023 21:48:40 +0530 Subject: [PATCH] PPOM dependency updates (#20342) --- app/scripts/controllers/decrypt-message.ts | 5 +- .../controllers/encryption-public-key.ts | 5 +- builds.yml | 2 +- lavamoat/browserify/beta/policy.json | 102 +++++++-------- lavamoat/browserify/desktop/policy.json | 102 +++++++-------- lavamoat/browserify/flask/policy.json | 117 ++++++++++-------- lavamoat/browserify/main/policy.json | 102 +++++++-------- lavamoat/browserify/mmi/policy.json | 102 +++++++-------- package.json | 6 +- yarn.lock | 32 ++--- 10 files changed, 299 insertions(+), 276 deletions(-) diff --git a/app/scripts/controllers/decrypt-message.ts b/app/scripts/controllers/decrypt-message.ts index fee01257f..a0d180806 100644 --- a/app/scripts/controllers/decrypt-message.ts +++ b/app/scripts/controllers/decrypt-message.ts @@ -45,7 +45,10 @@ export type CoreMessage = AbstractMessage & { }; export type StateMessage = Required< - Omit + Omit< + AbstractMessage, + 'securityAlertResponse' | 'securityProviderResponse' | 'metadata' | 'error' + > >; export type DecryptMessageControllerState = { diff --git a/app/scripts/controllers/encryption-public-key.ts b/app/scripts/controllers/encryption-public-key.ts index 8448fba8a..4c3bcc622 100644 --- a/app/scripts/controllers/encryption-public-key.ts +++ b/app/scripts/controllers/encryption-public-key.ts @@ -44,7 +44,10 @@ export type CoreMessage = AbstractMessage & { }; export type StateMessage = Required< - Omit + Omit< + AbstractMessage, + 'securityAlertResponse' | 'securityProviderResponse' | 'metadata' | 'error' + > > & { msgParams: string; }; diff --git a/builds.yml b/builds.yml index 13b51de6c..4283eb26e 100644 --- a/builds.yml +++ b/builds.yml @@ -47,7 +47,7 @@ buildTypes: - desktop - build-flask - keyring-snaps - # - blockaid + - blockaid env: - INFURA_FLASK_PROJECT_ID - SEGMENT_FLASK_WRITE_KEY diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index a02644c04..3207a448f 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -380,7 +380,7 @@ "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, "@ethersproject/abi>@ethersproject/properties": true, - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "@ethersproject/hdnode>@ethersproject/transactions": { @@ -1088,6 +1088,7 @@ }, "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -1095,8 +1096,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey": { @@ -1111,11 +1111,11 @@ "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-snap-keyring>@metamask/eth-sig-util": { @@ -1422,11 +1422,11 @@ "@metamask/eth-trezor-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { @@ -1802,6 +1802,33 @@ "eslint>optionator>fast-levenshtein": true } }, + "@metamask/ppom-validator>elliptic": { + "packages": { + "@metamask/ppom-validator>elliptic>brorand": true, + "@metamask/ppom-validator>elliptic>hmac-drbg": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "bn.js": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true, + "pumpify>inherits": true + } + }, + "@metamask/ppom-validator>elliptic>brorand": { + "globals": { + "crypto": true, + "msCrypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@metamask/ppom-validator>elliptic>hmac-drbg": { + "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true + } + }, "@metamask/rpc-methods": { "packages": { "@metamask/browser-passworder": true, @@ -2853,7 +2880,7 @@ }, "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -2865,6 +2892,7 @@ }, "browserify>crypto-browserify>browserify-sign": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify>create-hmac": true, @@ -2872,15 +2900,14 @@ "browserify>crypto-browserify>public-encrypt>parse-asn1": true, "browserify>stream-browserify": true, "ethereumjs-util>create-hash": true, - "ganache>secp256k1>elliptic": true, "pumpify>inherits": true } }, "browserify>crypto-browserify>create-ecdh": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, - "browserify>buffer": true, - "ganache>secp256k1>elliptic": true + "browserify>buffer": true } }, "browserify>crypto-browserify>create-hmac": { @@ -2903,8 +2930,8 @@ }, "browserify>crypto-browserify>diffie-hellman>miller-rabin": { "packages": { - "bn.js": true, - "ganache>secp256k1>elliptic>brorand": true + "@metamask/ppom-validator>elliptic>brorand": true, + "bn.js": true } }, "browserify>crypto-browserify>pbkdf2": { @@ -2951,10 +2978,10 @@ }, "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": { "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "bn.js": true, "browserify>buffer": true, "browserify>vm-browserify": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3315,6 +3342,7 @@ "packages": { "@ethereumjs/common>crc-32": true, "@ethersproject/abi": true, + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, @@ -3331,7 +3359,6 @@ "ethereumjs-util>ethereum-cryptography>hash.js": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, - "ganache>secp256k1>elliptic": true, "lodash": true } }, @@ -3455,7 +3482,7 @@ }, "eth-lattice-keyring>gridplus-sdk>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "eth-lattice-keyring>gridplus-sdk>uuid": { @@ -3496,6 +3523,7 @@ }, "eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -3503,8 +3531,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "eth-sig-util>ethereumjs-util>ethjs-util": { @@ -3542,14 +3569,14 @@ }, "ethereumjs-abi>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-util": { @@ -3642,7 +3669,7 @@ }, "ethereumjs-util>ethereum-cryptography>hash.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3674,7 +3701,7 @@ }, "ethereumjs-util>ethereum-cryptography>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "ethereumjs-util>rlp": { @@ -3720,14 +3747,14 @@ }, "ethereumjs-wallet>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-wallet>randombytes": { @@ -3926,33 +3953,6 @@ "define": true } }, - "ganache>secp256k1>elliptic": { - "packages": { - "bn.js": true, - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>brorand": true, - "ganache>secp256k1>elliptic>hmac-drbg": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true, - "pumpify>inherits": true - } - }, - "ganache>secp256k1>elliptic>brorand": { - "globals": { - "crypto": true, - "msCrypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "ganache>secp256k1>elliptic>hmac-drbg": { - "packages": { - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true - } - }, "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 01e56f8b9..cc3765332 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -380,7 +380,7 @@ "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, "@ethersproject/abi>@ethersproject/properties": true, - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "@ethersproject/hdnode>@ethersproject/transactions": { @@ -1159,6 +1159,7 @@ }, "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -1166,8 +1167,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey": { @@ -1182,11 +1182,11 @@ "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-snap-keyring": { @@ -1550,11 +1550,11 @@ "@metamask/eth-trezor-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { @@ -2006,6 +2006,33 @@ "@metamask/post-message-stream>readable-stream>safe-buffer": true } }, + "@metamask/ppom-validator>elliptic": { + "packages": { + "@metamask/ppom-validator>elliptic>brorand": true, + "@metamask/ppom-validator>elliptic>hmac-drbg": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "bn.js": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true, + "pumpify>inherits": true + } + }, + "@metamask/ppom-validator>elliptic>brorand": { + "globals": { + "crypto": true, + "msCrypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@metamask/ppom-validator>elliptic>hmac-drbg": { + "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true + } + }, "@metamask/providers>@metamask/object-multiplex": { "globals": { "console.warn": true @@ -3388,7 +3415,7 @@ }, "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3400,6 +3427,7 @@ }, "browserify>crypto-browserify>browserify-sign": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify>create-hmac": true, @@ -3407,15 +3435,14 @@ "browserify>crypto-browserify>public-encrypt>parse-asn1": true, "browserify>stream-browserify": true, "ethereumjs-util>create-hash": true, - "ganache>secp256k1>elliptic": true, "pumpify>inherits": true } }, "browserify>crypto-browserify>create-ecdh": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, - "browserify>buffer": true, - "ganache>secp256k1>elliptic": true + "browserify>buffer": true } }, "browserify>crypto-browserify>create-hmac": { @@ -3438,8 +3465,8 @@ }, "browserify>crypto-browserify>diffie-hellman>miller-rabin": { "packages": { - "bn.js": true, - "ganache>secp256k1>elliptic>brorand": true + "@metamask/ppom-validator>elliptic>brorand": true, + "bn.js": true } }, "browserify>crypto-browserify>pbkdf2": { @@ -3486,10 +3513,10 @@ }, "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": { "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "bn.js": true, "browserify>buffer": true, "browserify>vm-browserify": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3866,6 +3893,7 @@ "packages": { "@ethereumjs/common>crc-32": true, "@ethersproject/abi": true, + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, @@ -3882,7 +3910,6 @@ "ethereumjs-util>ethereum-cryptography>hash.js": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, - "ganache>secp256k1>elliptic": true, "lodash": true } }, @@ -4006,7 +4033,7 @@ }, "eth-lattice-keyring>gridplus-sdk>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "eth-lattice-keyring>gridplus-sdk>uuid": { @@ -4047,6 +4074,7 @@ }, "eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -4054,8 +4082,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "eth-sig-util>ethereumjs-util>ethjs-util": { @@ -4093,14 +4120,14 @@ }, "ethereumjs-abi>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-util": { @@ -4193,7 +4220,7 @@ }, "ethereumjs-util>ethereum-cryptography>hash.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -4225,7 +4252,7 @@ }, "ethereumjs-util>ethereum-cryptography>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "ethereumjs-util>rlp": { @@ -4271,14 +4298,14 @@ }, "ethereumjs-wallet>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-wallet>randombytes": { @@ -4477,33 +4504,6 @@ "define": true } }, - "ganache>secp256k1>elliptic": { - "packages": { - "bn.js": true, - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>brorand": true, - "ganache>secp256k1>elliptic>hmac-drbg": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true, - "pumpify>inherits": true - } - }, - "ganache>secp256k1>elliptic>brorand": { - "globals": { - "crypto": true, - "msCrypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "ganache>secp256k1>elliptic>hmac-drbg": { - "packages": { - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true - } - }, "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 01e56f8b9..08100deb2 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -380,7 +380,7 @@ "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, "@ethersproject/abi>@ethersproject/properties": true, - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "@ethersproject/hdnode>@ethersproject/transactions": { @@ -1159,6 +1159,7 @@ }, "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -1166,8 +1167,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey": { @@ -1182,11 +1182,11 @@ "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-snap-keyring": { @@ -1550,11 +1550,11 @@ "@metamask/eth-trezor-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { @@ -2006,6 +2006,48 @@ "@metamask/post-message-stream>readable-stream>safe-buffer": true } }, + "@metamask/ppom-validator": { + "globals": { + "clearInterval": true, + "console.error": true, + "setInterval": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/controller-utils": true, + "@metamask/ppom-validator>elliptic": true, + "await-semaphore": true, + "browserify>buffer": true, + "eth-query>json-rpc-random-id": true + } + }, + "@metamask/ppom-validator>elliptic": { + "packages": { + "@metamask/ppom-validator>elliptic>brorand": true, + "@metamask/ppom-validator>elliptic>hmac-drbg": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "bn.js": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true, + "pumpify>inherits": true + } + }, + "@metamask/ppom-validator>elliptic>brorand": { + "globals": { + "crypto": true, + "msCrypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@metamask/ppom-validator>elliptic>hmac-drbg": { + "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true + } + }, "@metamask/providers>@metamask/object-multiplex": { "globals": { "console.warn": true @@ -3388,7 +3430,7 @@ }, "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3400,6 +3442,7 @@ }, "browserify>crypto-browserify>browserify-sign": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify>create-hmac": true, @@ -3407,15 +3450,14 @@ "browserify>crypto-browserify>public-encrypt>parse-asn1": true, "browserify>stream-browserify": true, "ethereumjs-util>create-hash": true, - "ganache>secp256k1>elliptic": true, "pumpify>inherits": true } }, "browserify>crypto-browserify>create-ecdh": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, - "browserify>buffer": true, - "ganache>secp256k1>elliptic": true + "browserify>buffer": true } }, "browserify>crypto-browserify>create-hmac": { @@ -3438,8 +3480,8 @@ }, "browserify>crypto-browserify>diffie-hellman>miller-rabin": { "packages": { - "bn.js": true, - "ganache>secp256k1>elliptic>brorand": true + "@metamask/ppom-validator>elliptic>brorand": true, + "bn.js": true } }, "browserify>crypto-browserify>pbkdf2": { @@ -3486,10 +3528,10 @@ }, "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": { "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "bn.js": true, "browserify>buffer": true, "browserify>vm-browserify": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3866,6 +3908,7 @@ "packages": { "@ethereumjs/common>crc-32": true, "@ethersproject/abi": true, + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, @@ -3882,7 +3925,6 @@ "ethereumjs-util>ethereum-cryptography>hash.js": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, - "ganache>secp256k1>elliptic": true, "lodash": true } }, @@ -4006,7 +4048,7 @@ }, "eth-lattice-keyring>gridplus-sdk>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "eth-lattice-keyring>gridplus-sdk>uuid": { @@ -4047,6 +4089,7 @@ }, "eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -4054,8 +4097,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "eth-sig-util>ethereumjs-util>ethjs-util": { @@ -4093,14 +4135,14 @@ }, "ethereumjs-abi>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-util": { @@ -4193,7 +4235,7 @@ }, "ethereumjs-util>ethereum-cryptography>hash.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -4225,7 +4267,7 @@ }, "ethereumjs-util>ethereum-cryptography>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "ethereumjs-util>rlp": { @@ -4271,14 +4313,14 @@ }, "ethereumjs-wallet>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-wallet>randombytes": { @@ -4477,33 +4519,6 @@ "define": true } }, - "ganache>secp256k1>elliptic": { - "packages": { - "bn.js": true, - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>brorand": true, - "ganache>secp256k1>elliptic>hmac-drbg": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true, - "pumpify>inherits": true - } - }, - "ganache>secp256k1>elliptic>brorand": { - "globals": { - "crypto": true, - "msCrypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "ganache>secp256k1>elliptic>hmac-drbg": { - "packages": { - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true - } - }, "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index a02644c04..3207a448f 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -380,7 +380,7 @@ "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, "@ethersproject/abi>@ethersproject/properties": true, - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "@ethersproject/hdnode>@ethersproject/transactions": { @@ -1088,6 +1088,7 @@ }, "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -1095,8 +1096,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey": { @@ -1111,11 +1111,11 @@ "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-snap-keyring>@metamask/eth-sig-util": { @@ -1422,11 +1422,11 @@ "@metamask/eth-trezor-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { @@ -1802,6 +1802,33 @@ "eslint>optionator>fast-levenshtein": true } }, + "@metamask/ppom-validator>elliptic": { + "packages": { + "@metamask/ppom-validator>elliptic>brorand": true, + "@metamask/ppom-validator>elliptic>hmac-drbg": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "bn.js": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true, + "pumpify>inherits": true + } + }, + "@metamask/ppom-validator>elliptic>brorand": { + "globals": { + "crypto": true, + "msCrypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@metamask/ppom-validator>elliptic>hmac-drbg": { + "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true + } + }, "@metamask/rpc-methods": { "packages": { "@metamask/browser-passworder": true, @@ -2853,7 +2880,7 @@ }, "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -2865,6 +2892,7 @@ }, "browserify>crypto-browserify>browserify-sign": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify>create-hmac": true, @@ -2872,15 +2900,14 @@ "browserify>crypto-browserify>public-encrypt>parse-asn1": true, "browserify>stream-browserify": true, "ethereumjs-util>create-hash": true, - "ganache>secp256k1>elliptic": true, "pumpify>inherits": true } }, "browserify>crypto-browserify>create-ecdh": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, - "browserify>buffer": true, - "ganache>secp256k1>elliptic": true + "browserify>buffer": true } }, "browserify>crypto-browserify>create-hmac": { @@ -2903,8 +2930,8 @@ }, "browserify>crypto-browserify>diffie-hellman>miller-rabin": { "packages": { - "bn.js": true, - "ganache>secp256k1>elliptic>brorand": true + "@metamask/ppom-validator>elliptic>brorand": true, + "bn.js": true } }, "browserify>crypto-browserify>pbkdf2": { @@ -2951,10 +2978,10 @@ }, "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": { "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "bn.js": true, "browserify>buffer": true, "browserify>vm-browserify": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3315,6 +3342,7 @@ "packages": { "@ethereumjs/common>crc-32": true, "@ethersproject/abi": true, + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, @@ -3331,7 +3359,6 @@ "ethereumjs-util>ethereum-cryptography>hash.js": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, - "ganache>secp256k1>elliptic": true, "lodash": true } }, @@ -3455,7 +3482,7 @@ }, "eth-lattice-keyring>gridplus-sdk>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "eth-lattice-keyring>gridplus-sdk>uuid": { @@ -3496,6 +3523,7 @@ }, "eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -3503,8 +3531,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "eth-sig-util>ethereumjs-util>ethjs-util": { @@ -3542,14 +3569,14 @@ }, "ethereumjs-abi>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-util": { @@ -3642,7 +3669,7 @@ }, "ethereumjs-util>ethereum-cryptography>hash.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3674,7 +3701,7 @@ }, "ethereumjs-util>ethereum-cryptography>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "ethereumjs-util>rlp": { @@ -3720,14 +3747,14 @@ }, "ethereumjs-wallet>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-wallet>randombytes": { @@ -3926,33 +3953,6 @@ "define": true } }, - "ganache>secp256k1>elliptic": { - "packages": { - "bn.js": true, - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>brorand": true, - "ganache>secp256k1>elliptic>hmac-drbg": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true, - "pumpify>inherits": true - } - }, - "ganache>secp256k1>elliptic>brorand": { - "globals": { - "crypto": true, - "msCrypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "ganache>secp256k1>elliptic>hmac-drbg": { - "packages": { - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true - } - }, "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 6b526f97a..d8c191d6d 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -380,7 +380,7 @@ "@ethersproject/abi>@ethersproject/bytes": true, "@ethersproject/abi>@ethersproject/logger": true, "@ethersproject/abi>@ethersproject/properties": true, - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "@ethersproject/hdnode>@ethersproject/transactions": { @@ -1316,6 +1316,7 @@ }, "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -1323,8 +1324,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey": { @@ -1339,11 +1339,11 @@ "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-snap-keyring>@metamask/eth-sig-util": { @@ -1650,11 +1650,11 @@ "@metamask/eth-trezor-keyring>hdkey>secp256k1": { "packages": { "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "@metamask/ppom-validator>elliptic": 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 + "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { @@ -2030,6 +2030,33 @@ "eslint>optionator>fast-levenshtein": true } }, + "@metamask/ppom-validator>elliptic": { + "packages": { + "@metamask/ppom-validator>elliptic>brorand": true, + "@metamask/ppom-validator>elliptic>hmac-drbg": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "bn.js": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true, + "pumpify>inherits": true + } + }, + "@metamask/ppom-validator>elliptic>brorand": { + "globals": { + "crypto": true, + "msCrypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@metamask/ppom-validator>elliptic>hmac-drbg": { + "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true, + "ethereumjs-util>ethereum-cryptography>hash.js": true + } + }, "@metamask/rpc-methods": { "packages": { "@metamask/browser-passworder": true, @@ -3081,7 +3108,7 @@ }, "browserify>crypto-browserify>browserify-cipher>browserify-des>des.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3093,6 +3120,7 @@ }, "browserify>crypto-browserify>browserify-sign": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "browserify>crypto-browserify>create-hmac": true, @@ -3100,15 +3128,14 @@ "browserify>crypto-browserify>public-encrypt>parse-asn1": true, "browserify>stream-browserify": true, "ethereumjs-util>create-hash": true, - "ganache>secp256k1>elliptic": true, "pumpify>inherits": true } }, "browserify>crypto-browserify>create-ecdh": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, - "browserify>buffer": true, - "ganache>secp256k1>elliptic": true + "browserify>buffer": true } }, "browserify>crypto-browserify>create-hmac": { @@ -3131,8 +3158,8 @@ }, "browserify>crypto-browserify>diffie-hellman>miller-rabin": { "packages": { - "bn.js": true, - "ganache>secp256k1>elliptic>brorand": true + "@metamask/ppom-validator>elliptic>brorand": true, + "bn.js": true } }, "browserify>crypto-browserify>pbkdf2": { @@ -3179,10 +3206,10 @@ }, "browserify>crypto-browserify>public-encrypt>parse-asn1>asn1.js": { "packages": { + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "bn.js": true, "browserify>buffer": true, "browserify>vm-browserify": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3543,6 +3570,7 @@ "packages": { "@ethereumjs/common>crc-32": true, "@ethersproject/abi": true, + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>buffer": true, "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, @@ -3559,7 +3587,6 @@ "ethereumjs-util>ethereum-cryptography>hash.js": true, "ethereumjs-wallet>aes-js": true, "ethereumjs-wallet>bs58check": true, - "ganache>secp256k1>elliptic": true, "lodash": true } }, @@ -3683,7 +3710,7 @@ }, "eth-lattice-keyring>gridplus-sdk>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "eth-lattice-keyring>gridplus-sdk>uuid": { @@ -3724,6 +3751,7 @@ }, "eth-sig-util>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, @@ -3731,8 +3759,7 @@ "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, "ethereumjs-util>rlp": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-wallet>safe-buffer": true } }, "eth-sig-util>ethereumjs-util>ethjs-util": { @@ -3770,14 +3797,14 @@ }, "ethereumjs-abi>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-util": { @@ -3870,7 +3897,7 @@ }, "ethereumjs-util>ethereum-cryptography>hash.js": { "packages": { - "ganache>secp256k1>elliptic>minimalistic-assert": true, + "@metamask/ppom-validator>elliptic>minimalistic-assert": true, "pumpify>inherits": true } }, @@ -3902,7 +3929,7 @@ }, "ethereumjs-util>ethereum-cryptography>secp256k1": { "packages": { - "ganache>secp256k1>elliptic": true + "@metamask/ppom-validator>elliptic": true } }, "ethereumjs-util>rlp": { @@ -3948,14 +3975,14 @@ }, "ethereumjs-wallet>ethereumjs-util": { "packages": { + "@metamask/ppom-validator>elliptic": true, "bn.js": true, "browserify>assert": true, "browserify>buffer": true, "eth-sig-util>ethereumjs-util>ethjs-util": true, "ethereumjs-util>create-hash": true, "ethereumjs-util>ethereum-cryptography": true, - "ethereumjs-util>rlp": true, - "ganache>secp256k1>elliptic": true + "ethereumjs-util>rlp": true } }, "ethereumjs-wallet>randombytes": { @@ -4154,33 +4181,6 @@ "define": true } }, - "ganache>secp256k1>elliptic": { - "packages": { - "bn.js": true, - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>brorand": true, - "ganache>secp256k1>elliptic>hmac-drbg": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true, - "pumpify>inherits": true - } - }, - "ganache>secp256k1>elliptic>brorand": { - "globals": { - "crypto": true, - "msCrypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "ganache>secp256k1>elliptic>hmac-drbg": { - "packages": { - "ethereumjs-util>ethereum-cryptography>hash.js": true, - "ganache>secp256k1>elliptic>minimalistic-assert": true, - "ganache>secp256k1>elliptic>minimalistic-crypto-utils": true - } - }, "globalthis>define-properties": { "packages": { "globalthis>define-properties>has-property-descriptors": true, diff --git a/package.json b/package.json index 23f872073..1290980e5 100644 --- a/package.json +++ b/package.json @@ -205,7 +205,7 @@ }, "dependencies": { "@babel/runtime": "^7.18.9", - "@blockaid/ppom": "^0.1.2", + "@blockaid/ppom": "^1.0.2", "@download/blockies": "^1.0.3", "@ensdomains/content-hash": "^2.5.6", "@ethereumjs/common": "^3.1.1", @@ -250,7 +250,7 @@ "@metamask/key-tree": "^9.0.0", "@metamask/keyring-controller": "^7.0.0", "@metamask/logo": "^3.1.1", - "@metamask/message-manager": "^7.0.2", + "@metamask/message-manager": "^7.3.0", "@metamask/metamask-eth-abis": "^3.0.0", "@metamask/network-controller": "^12.0.0", "@metamask/notification-controller": "^3.0.0", @@ -258,7 +258,7 @@ "@metamask/permission-controller": "^4.0.0", "@metamask/phishing-controller": "^6.0.0", "@metamask/post-message-stream": "^6.0.0", - "@metamask/ppom-validator": "^0.1.2", + "@metamask/ppom-validator": "^0.2.0", "@metamask/providers": "^11.1.0", "@metamask/rate-limit-controller": "^3.0.0", "@metamask/rpc-methods": "^1.0.0-prerelease.1", diff --git a/yarn.lock b/yarn.lock index 23b862842..5f6089519 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,10 +1619,10 @@ __metadata: languageName: node linkType: hard -"@blockaid/ppom@npm:^0.1.2": - version: 0.1.2 - resolution: "@blockaid/ppom@npm:0.1.2" - checksum: ff5485db12a11a0b60465faf27b22e365c5a6fdc9b08d932e8a50a50effe1d07059c0e9d3e76f8bf051fbe32f473f6fdac57c5993f6633d2668d3760aa53223b +"@blockaid/ppom@npm:^1.0.2": + version: 1.0.2 + resolution: "@blockaid/ppom@npm:1.0.2" + checksum: d288117f19400108b0177df63d6accc3e06a60f203d36b9e3b1d8cabc55e167674cb000d1fe50971a7fe73662ca55659211682a0d20e676c66ccba112043d9fb languageName: node linkType: hard @@ -4364,9 +4364,9 @@ __metadata: languageName: node linkType: hard -"@metamask/message-manager@npm:^7.0.2, @metamask/message-manager@npm:^7.2.0": - version: 7.2.0 - resolution: "@metamask/message-manager@npm:7.2.0" +"@metamask/message-manager@npm:^7.2.0, @metamask/message-manager@npm:^7.3.0": + version: 7.3.0 + resolution: "@metamask/message-manager@npm:7.3.0" dependencies: "@metamask/base-controller": "npm:^3.2.0" "@metamask/controller-utils": "npm:^4.3.0" @@ -4376,7 +4376,7 @@ __metadata: ethereumjs-util: "npm:^7.0.10" jsonschema: "npm:^1.2.4" uuid: "npm:^8.3.2" - checksum: 2129b2418b8a45234e4e00c1f3aabd386e2b6d5bba7db04b1a19fcd8d4930c8c10de6660a272bab227e9bfed684dc6a37cef26403471ffd5c6fe71921e06e576 + checksum: 2001622731a01a777270d9d4c5f1c7897aa3071bcbc6eb6ccbac819574d0c4786a070ef519fcf11aaa950cedd5a1feba3e1cc55b8641c2a87cb791aab5120903 languageName: node linkType: hard @@ -4566,14 +4566,16 @@ __metadata: languageName: node linkType: hard -"@metamask/ppom-validator@npm:^0.1.2": - version: 0.1.2 - resolution: "@metamask/ppom-validator@npm:0.1.2" +"@metamask/ppom-validator@npm:^0.2.0": + version: 0.2.0 + resolution: "@metamask/ppom-validator@npm:0.2.0" dependencies: "@metamask/base-controller": "npm:^3.0.0" "@metamask/controller-utils": "npm:^4.0.0" await-semaphore: "npm:^0.1.3" - checksum: 1a034882e7040fe66061c956f3736bc6cf164212cc07c9bf520dd64f9df49b6ef51554c1d00ec832e723293d4287e37c1d9ca00112e185bba58aedd6205e27c3 + elliptic: "npm:^6.5.4" + json-rpc-random-id: "npm:^1.0.1" + checksum: c86e3d2aa8321347ffaf45290d9c8b0d4f3a594c88dc2090933b6159a604c2f574360462faba7cbda7fa1f32f730d159f90847bdd47badb0dc0cd027be0db9e8 languageName: node linkType: hard @@ -24213,7 +24215,7 @@ __metadata: "@babel/preset-typescript": "npm:^7.16.7" "@babel/register": "npm:^7.5.5" "@babel/runtime": "npm:^7.18.9" - "@blockaid/ppom": "npm:^0.1.2" + "@blockaid/ppom": "npm:^1.0.2" "@download/blockies": "npm:^1.0.3" "@ensdomains/content-hash": "npm:^2.5.6" "@ethereumjs/common": "npm:^3.1.1" @@ -24267,7 +24269,7 @@ __metadata: "@metamask/key-tree": "npm:^9.0.0" "@metamask/keyring-controller": "npm:^7.0.0" "@metamask/logo": "npm:^3.1.1" - "@metamask/message-manager": "npm:^7.0.2" + "@metamask/message-manager": "npm:^7.3.0" "@metamask/metamask-eth-abis": "npm:^3.0.0" "@metamask/network-controller": "npm:^12.0.0" "@metamask/notification-controller": "npm:^3.0.0" @@ -24276,7 +24278,7 @@ __metadata: "@metamask/phishing-controller": "npm:^6.0.0" "@metamask/phishing-warning": "npm:^2.1.0" "@metamask/post-message-stream": "npm:^6.0.0" - "@metamask/ppom-validator": "npm:^0.1.2" + "@metamask/ppom-validator": "npm:^0.2.0" "@metamask/providers": "npm:^11.1.0" "@metamask/rate-limit-controller": "npm:^3.0.0" "@metamask/rpc-methods": "npm:^1.0.0-prerelease.1"