From 98279b6592c59e300e7dc980916a076da33a3f85 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Wed, 26 Jul 2023 05:28:33 +0530 Subject: [PATCH] Updating extension for ppom-validator updates (#20000) --- .metamaskrc.dist | 1 + .../lib/{ => ppom}/indexed-db-backend.test.ts | 0 .../lib/{ => ppom}/indexed-db-backend.ts | 0 app/scripts/lib/ppom/ppom-middleware.test.ts | 110 ++++ app/scripts/lib/ppom/ppom-middleware.ts | 43 ++ app/scripts/lib/ppom/ppom.js | 573 ++++++++++++++++++ app/scripts/metamask-controller.js | 13 +- builds.yml | 5 + development/build/static.js | 2 +- package.json | 3 +- yarn.lock | 20 +- 11 files changed, 753 insertions(+), 17 deletions(-) rename app/scripts/lib/{ => ppom}/indexed-db-backend.test.ts (100%) rename app/scripts/lib/{ => ppom}/indexed-db-backend.ts (100%) create mode 100644 app/scripts/lib/ppom/ppom-middleware.test.ts create mode 100644 app/scripts/lib/ppom/ppom-middleware.ts create mode 100644 app/scripts/lib/ppom/ppom.js diff --git a/.metamaskrc.dist b/.metamaskrc.dist index 0e0bc421eb1f..0bd4d399549c 100644 --- a/.metamaskrc.dist +++ b/.metamaskrc.dist @@ -12,3 +12,4 @@ INFURA_PROJECT_ID=00000000000 ; Set this to test changes to the phishing warning page. ;PHISHING_WARNING_PAGE_URL= +BLOCKAID_FILE_CDN= diff --git a/app/scripts/lib/indexed-db-backend.test.ts b/app/scripts/lib/ppom/indexed-db-backend.test.ts similarity index 100% rename from app/scripts/lib/indexed-db-backend.test.ts rename to app/scripts/lib/ppom/indexed-db-backend.test.ts diff --git a/app/scripts/lib/indexed-db-backend.ts b/app/scripts/lib/ppom/indexed-db-backend.ts similarity index 100% rename from app/scripts/lib/indexed-db-backend.ts rename to app/scripts/lib/ppom/indexed-db-backend.ts diff --git a/app/scripts/lib/ppom/ppom-middleware.test.ts b/app/scripts/lib/ppom/ppom-middleware.test.ts new file mode 100644 index 000000000000..be7b5558d1ca --- /dev/null +++ b/app/scripts/lib/ppom/ppom-middleware.test.ts @@ -0,0 +1,110 @@ +import { createPPOMMiddleware } from './ppom-middleware'; + +Object.defineProperty(globalThis, 'fetch', { + writable: true, + value: () => undefined, +}); + +Object.defineProperty(globalThis, 'performance', { + writable: true, + value: () => undefined, +}); + +describe('PPOMMiddleware', () => { + it('should call ppomController.usePPOM for requests of type confirmation', async () => { + const useMock = jest.fn(); + const controller = { + usePPOM: useMock, + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + await middlewareFunction( + { method: 'eth_sendTransaction' }, + undefined, + () => undefined, + ); + expect(useMock).toHaveBeenCalledTimes(1); + }); + + it('should add validation response on confirmation requests', async () => { + const controller = { + usePPOM: async () => Promise.resolve('VALIDATION_RESULT'), + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + const req = { method: 'eth_sendTransaction', ppomResponse: undefined }; + await middlewareFunction(req, undefined, () => undefined); + expect(req.ppomResponse).toBeDefined(); + }); + + it('should call next method when ppomController.usePPOM completes', async () => { + const ppom = { + validateJsonRpc: () => undefined, + }; + const controller = { + usePPOM: async (callback: any) => { + callback(ppom); + }, + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + const nextMock = jest.fn(); + await middlewareFunction( + { method: 'eth_sendTransaction' }, + undefined, + nextMock, + ); + expect(nextMock).toHaveBeenCalledTimes(1); + }); + + it('should call next method when ppomController.usePPOM throws error', async () => { + const controller = { + usePPOM: async (_callback: any) => { + throw Error('Some error'); + }, + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + const nextMock = jest.fn(); + await middlewareFunction( + { method: 'eth_sendTransaction' }, + undefined, + nextMock, + ); + expect(nextMock).toHaveBeenCalledTimes(1); + }); + + it('should call ppom.validateJsonRpc when invoked', async () => { + const validateMock = jest.fn(); + const ppom = { + validateJsonRpc: validateMock, + }; + const controller = { + usePPOM: async (callback: any) => { + callback(ppom); + }, + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + await middlewareFunction( + { method: 'eth_sendTransaction' }, + undefined, + () => undefined, + ); + expect(validateMock).toHaveBeenCalledTimes(1); + }); + + it('should not call ppom.validateJsonRpc when request is not for confirmation method', async () => { + const validateMock = jest.fn(); + const ppom = { + validateJsonRpc: validateMock, + }; + const controller = { + usePPOM: async (callback: any) => { + callback(ppom); + }, + }; + const middlewareFunction = createPPOMMiddleware(controller as any); + await middlewareFunction( + { method: 'eth_someRequest' }, + undefined, + () => undefined, + ); + expect(validateMock).toHaveBeenCalledTimes(0); + }); +}); diff --git a/app/scripts/lib/ppom/ppom-middleware.ts b/app/scripts/lib/ppom/ppom-middleware.ts new file mode 100644 index 000000000000..c58f74d60c4e --- /dev/null +++ b/app/scripts/lib/ppom/ppom-middleware.ts @@ -0,0 +1,43 @@ +import { PPOM } from '@blockaid/ppom'; + +import { PPOMController } from '@metamask/ppom-validator'; + +const ConfirmationMethods = Object.freeze([ + 'eth_sendRawTransaction', + 'eth_sendTransaction', + 'eth_sign', + 'eth_signTypedData', + 'eth_signTypedData_v1', + 'eth_signTypedData_v3', + 'eth_signTypedData_v4', + 'personal_sign', +]); + +/** + * Middleware function that handles JSON RPC requests. + * This function will be called for every JSON RPC request. + * It will call the PPOM to check if the request is malicious or benign. + * If the request is benign, it will be forwarded to the next middleware. + * If the request is malicious or warning, it will trigger the PPOM alert dialog, + * after the user has confirmed or rejected the request, + * the request will be forwarded to the next middleware, together with the PPOM response. + * + * @param ppomController - Instance of PPOMController. + * @returns PPOMMiddleware function. + */ +export function createPPOMMiddleware(ppomController: PPOMController) { + return async (req: any, _res: any, next: () => void) => { + try { + if (ConfirmationMethods.includes(req.method)) { + // eslint-disable-next-line require-atomic-updates + req.ppomResponse = await ppomController.usePPOM(async (ppom: PPOM) => { + return ppom.validateJsonRpc(req); + }); + } + } catch (error: unknown) { + console.error('Error validating JSON RPC using PPOM: ', error); + } finally { + next(); + } + }; +} diff --git a/app/scripts/lib/ppom/ppom.js b/app/scripts/lib/ppom/ppom.js new file mode 100644 index 000000000000..39915b3a4b6e --- /dev/null +++ b/app/scripts/lib/ppom/ppom.js @@ -0,0 +1,573 @@ +/* eslint-disable */ + +let wasm; + +const heap = new Array(128).fill(undefined); + +heap.push(undefined, null, true, false); + +function getObject(idx) { + return heap[idx]; +} + +let heap_next = heap.length; + +function dropObject(idx) { + if (idx < 132) return; + heap[idx] = heap_next; + heap_next = idx; +} + +function takeObject(idx) { + const ret = getObject(idx); + dropObject(idx); + return ret; +} + +let WASM_VECTOR_LEN = 0; + +let cachedUint8Memory0 = null; + +function getUint8Memory0() { + if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) { + cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8Memory0; +} + +const cachedTextEncoder = + typeof TextEncoder !== 'undefined' + ? new TextEncoder('utf-8') + : { + encode: () => { + throw Error('TextEncoder not available'); + }, + }; + +const encodeString = + typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); + } + : function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length, + }; + }; + +function passStringToWasm0(arg, malloc, realloc) { + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8Memory0() + .subarray(ptr, ptr + buf.length) + .set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len, 1) >>> 0; + + const mem = getUint8Memory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7f) break; + mem[ptr + offset] = code; + } + + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, (len = offset + arg.length * 3), 1) >>> 0; + const view = getUint8Memory0().subarray(ptr + offset, ptr + len); + const ret = encodeString(arg, view); + + offset += ret.written; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} + +function isLikeNone(x) { + return x === undefined || x === null; +} + +let cachedInt32Memory0 = null; + +function getInt32Memory0() { + if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) { + cachedInt32Memory0 = new Int32Array(wasm.memory.buffer); + } + return cachedInt32Memory0; +} + +const cachedTextDecoder = + typeof TextDecoder !== 'undefined' + ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) + : { + decode: () => { + throw Error('TextDecoder not available'); + }, + }; + +if (typeof TextDecoder !== 'undefined') { + cachedTextDecoder.decode(); +} + +function getStringFromWasm0(ptr, len) { + ptr = ptr >>> 0; + return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); +} + +function addHeapObject(obj) { + if (heap_next === heap.length) heap.push(heap.length + 1); + const idx = heap_next; + heap_next = heap[idx]; + + heap[idx] = obj; + return idx; +} + +function debugString(val) { + // primitive types + const type = typeof val; + if (type == 'number' || type == 'boolean' || val == null) { + return `${val}`; + } + if (type == 'string') { + return `"${val}"`; + } + if (type == 'symbol') { + const description = val.description; + if (description == null) { + return 'Symbol'; + } else { + return `Symbol(${description})`; + } + } + if (type == 'function') { + const name = val.name; + if (typeof name == 'string' && name.length > 0) { + return `Function(${name})`; + } else { + return 'Function'; + } + } + // objects + if (Array.isArray(val)) { + const length = val.length; + let debug = '['; + if (length > 0) { + debug += debugString(val[0]); + } + for (let i = 1; i < length; i++) { + debug += ', ' + debugString(val[i]); + } + debug += ']'; + return debug; + } + // Test for built-in + const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); + let className; + if (builtInMatches.length > 1) { + className = builtInMatches[1]; + } else { + // Failed to match the standard '[object ClassName]' + return toString.call(val); + } + if (className == 'Object') { + // we're a user defined class or Object + // JSON.stringify avoids problems with cycles, and is generally much + // easier than looping through ownProperties of `val`. + try { + return 'Object(' + JSON.stringify(val) + ')'; + } catch (_) { + return 'Object'; + } + } + // errors + if (val instanceof Error) { + return `${val.name}: ${val.message}\n${val.stack}`; + } + // TODO we could test for more things here, like `Set`s and `Map`s. + return className; +} + +function makeMutClosure(arg0, arg1, dtor, f) { + const state = { a: arg0, b: arg1, cnt: 1 }; + const real = (...args) => { + // First up with a closure we increment the internal reference + // count. This ensures that the Rust closure environment won't + // be deallocated while we're invoking it. + state.cnt++; + const a = state.a; + state.a = 0; + try { + return f(a, state.b, ...args); + } finally { + if (--state.cnt === 0) { + dtor(a, state.b); + } else { + state.a = a; + } + } + }; + real.original = state; + + return real; +} +function __wbg_adapter_20(arg0, arg1, arg2) { + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke( + arg0, + arg1, + addHeapObject(arg2), + ); +} + +function __wbg_adapter_21(arg0, arg1) { + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__destroy( + arg0, + arg1, + ); +} + +/** + */ +export function main() { + wasm.main(); +} + +let cachedUint32Memory0 = null; + +function getUint32Memory0() { + if (cachedUint32Memory0 === null || cachedUint32Memory0.byteLength === 0) { + cachedUint32Memory0 = new Uint32Array(wasm.memory.buffer); + } + return cachedUint32Memory0; +} + +function passArrayJsValueToWasm0(array, malloc) { + const ptr = malloc(array.length * 4, 4) >>> 0; + const mem = getUint32Memory0(); + for (let i = 0; i < array.length; i++) { + mem[ptr / 4 + i] = addHeapObject(array[i]); + } + WASM_VECTOR_LEN = array.length; + return ptr; +} + +function handleError(f, args) { + try { + return f.apply(this, args); + } catch (e) { + wasm.__wbindgen_exn_store(addHeapObject(e)); + } +} +function __wbg_adapter_39(arg0, arg1, arg2, arg3) { + wasm.wasm_bindgen__convert__closures__invoke2_mut( + arg0, + arg1, + addHeapObject(arg2), + addHeapObject(arg3), + ); +} + +/** + * JavaScript wrapper for [`PPOM`] + */ +export class PPOM { + static __wrap(ptr) { + ptr = ptr >>> 0; + const obj = Object.create(PPOM.prototype); + obj.__wbg_ptr = ptr; + + return obj; + } + + __destroy_into_raw() { + const ptr = this.__wbg_ptr; + this.__wbg_ptr = 0; + + return ptr; + } + + free() { + const ptr = this.__destroy_into_raw(); + wasm.__wbg_ppom_free(ptr); + } + /** + * @param {Function} json_rpc_callback + * @param {any[]} files + * @returns {Promise} + */ + static new(json_rpc_callback, files) { + const ptr0 = passArrayJsValueToWasm0(files, wasm.__wbindgen_malloc); + const len0 = WASM_VECTOR_LEN; + const ret = wasm.ppom_new(addHeapObject(json_rpc_callback), ptr0, len0); + return takeObject(ret); + } + /** + * @param {any} request + * @returns {Promise} + */ + validateJsonRpc(request) { + const ret = wasm.ppom_validateJsonRpc( + this.__wbg_ptr, + addHeapObject(request), + ); + return takeObject(ret); + } +} + +async function __wbg_load(module, imports) { + if (typeof Response === 'function' && module instanceof Response) { + if (typeof WebAssembly.instantiateStreaming === 'function') { + try { + return await WebAssembly.instantiateStreaming(module, imports); + } catch (e) { + if (module.headers.get('Content-Type') != 'application/wasm') { + console.warn( + '`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n', + e, + ); + } else { + throw e; + } + } + } + + const bytes = await module.arrayBuffer(); + return await WebAssembly.instantiate(bytes, imports); + } else { + const instance = await WebAssembly.instantiate(module, imports); + + if (instance instanceof WebAssembly.Instance) { + return { instance, module }; + } else { + return instance; + } + } +} + +function __wbg_get_imports() { + const imports = {}; + imports.wbg = {}; + imports.wbg.__wbg_buffer_085ec1f694018c4f = function (arg0) { + const ret = getObject(arg0).buffer; + return addHeapObject(ret); + }; + imports.wbg.__wbg_call_01734de55d61e11d = function () { + return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).call(getObject(arg1), getObject(arg2)); + return addHeapObject(ret); + }, arguments); + }; + imports.wbg.__wbg_call_4c92f6aec1e1d6e6 = function () { + return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg0).call( + getObject(arg1), + getObject(arg2), + getObject(arg3), + ); + return addHeapObject(ret); + }, arguments); + }; + imports.wbg.__wbg_from_d7c216d4616bb368 = function (arg0) { + const ret = Array.from(getObject(arg0)); + return addHeapObject(ret); + }; + imports.wbg.__wbg_get_44be0491f933a435 = function (arg0, arg1) { + const ret = getObject(arg0)[arg1 >>> 0]; + return addHeapObject(ret); + }; + imports.wbg.__wbg_length_72e2208bbc0efc61 = function (arg0) { + const ret = getObject(arg0).length; + return ret; + }; + imports.wbg.__wbg_length_d813e535247d427e = function (arg0) { + const ret = getObject(arg0).length; + return ret; + }; + imports.wbg.__wbg_length_fff51ee6522a1a18 = function (arg0) { + const ret = getObject(arg0).length; + return ret; + }; + imports.wbg.__wbg_new_43f1b47c28813cbd = function (arg0, arg1) { + try { + var state0 = { a: arg0, b: arg1 }; + var cb0 = (arg0, arg1) => { + const a = state0.a; + state0.a = 0; + try { + return __wbg_adapter_39(a, state0.b, arg0, arg1); + } finally { + state0.a = a; + } + }; + const ret = new Promise(cb0); + return addHeapObject(ret); + } finally { + state0.a = state0.b = 0; + } + }; + imports.wbg.__wbg_new_8125e318e6245eed = function (arg0) { + const ret = new Uint8Array(getObject(arg0)); + return addHeapObject(ret); + }; + imports.wbg.__wbg_parse_670c19d4e984792e = function () { + return handleError(function (arg0, arg1) { + const ret = JSON.parse(getStringFromWasm0(arg0, arg1)); + return addHeapObject(ret); + }, arguments); + }; + imports.wbg.__wbg_ppom_new = function (arg0) { + const ret = PPOM.__wrap(arg0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_resolve_53698b95aaf7fcf8 = function (arg0) { + const ret = Promise.resolve(getObject(arg0)); + return addHeapObject(ret); + }; + imports.wbg.__wbg_set_5cf90238115182c3 = function (arg0, arg1, arg2) { + getObject(arg0).set(getObject(arg1), arg2 >>> 0); + }; + imports.wbg.__wbg_stringify_e25465938f3f611f = function () { + return handleError(function (arg0) { + const ret = JSON.stringify(getObject(arg0)); + return addHeapObject(ret); + }, arguments); + }; + imports.wbg.__wbg_then_b2267541e2a73865 = function (arg0, arg1, arg2) { + const ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); + return addHeapObject(ret); + }; + imports.wbg.__wbg_then_f7e06ee3c11698eb = function (arg0, arg1) { + const ret = getObject(arg0).then(getObject(arg1)); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_cb_drop = function (arg0) { + const obj = takeObject(arg0).original; + if (obj.cnt-- == 1) { + obj.a = 0; + return true; + } + const ret = false; + return ret; + }; + imports.wbg.__wbindgen_closure_wrapper_wasm_bindgen__closure__Closure_T___wrap__breaks_if_inlined = + function (arg0, arg1, arg2) { + const ret = makeMutClosure( + arg0, + arg1, + __wbg_adapter_21, + __wbg_adapter_20, + ); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_debug_string = function (arg0, arg1) { + const ret = debugString(getObject(arg1)); + const ptr1 = passStringToWasm0( + ret, + wasm.__wbindgen_malloc, + wasm.__wbindgen_realloc, + ); + const len1 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len1; + getInt32Memory0()[arg0 / 4 + 0] = ptr1; + }; + imports.wbg.__wbindgen_error_new = function (arg0, arg1) { + const ret = new Error(getStringFromWasm0(arg0, arg1)); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_is_undefined = function (arg0) { + const ret = getObject(arg0) === undefined; + return ret; + }; + imports.wbg.__wbindgen_memory = function () { + const ret = wasm.memory; + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_object_drop_ref = function (arg0) { + takeObject(arg0); + }; + imports.wbg.__wbindgen_string_get = function (arg0, arg1) { + const obj = getObject(arg1); + const ret = typeof obj === 'string' ? obj : undefined; + var ptr1 = isLikeNone(ret) + ? 0 + : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len1; + getInt32Memory0()[arg0 / 4 + 0] = ptr1; + }; + imports.wbg.__wbindgen_string_new = function (arg0, arg1) { + const ret = getStringFromWasm0(arg0, arg1); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_throw = function (arg0, arg1) { + throw new Error(getStringFromWasm0(arg0, arg1)); + }; + + return imports; +} + +function __wbg_init_memory(imports, maybe_memory) {} + +function __wbg_finalize_init(instance, module) { + wasm = instance.exports; + __wbg_init.__wbindgen_wasm_module = module; + cachedInt32Memory0 = null; + cachedUint32Memory0 = null; + cachedUint8Memory0 = null; + + wasm.__wbindgen_start(); + return wasm; +} + +function initSync(module) { + if (wasm !== undefined) return wasm; + + const imports = __wbg_get_imports(); + + __wbg_init_memory(imports); + + if (!(module instanceof WebAssembly.Module)) { + module = new WebAssembly.Module(module); + } + + const instance = new WebAssembly.Instance(module, imports); + + return __wbg_finalize_init(instance, module); +} + +async function __wbg_init(input) { + if (wasm !== undefined) return wasm; + + const imports = __wbg_get_imports(); + + if ( + typeof input === 'string' || + (typeof Request === 'function' && input instanceof Request) || + (typeof URL === 'function' && input instanceof URL) + ) { + input = fetch(input); + } + + __wbg_init_memory(imports); + + const { instance, module } = await __wbg_load(await input, imports); + + return __wbg_finalize_init(instance, module); +} + +export { initSync }; +export default __wbg_init; diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index c2f2c9c39246..dbea5e3ffb98 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -75,7 +75,7 @@ import { TransactionUpdateController } from '@metamask-institutional/transaction ///: END:ONLY_INCLUDE_IN import { SignatureController } from '@metamask/signature-controller'; ///: BEGIN:ONLY_INCLUDE_IN(blockaid) -import { PPOMController, createPPOMMiddleware } from '@metamask/ppom-validator'; +import { PPOMController } from '@metamask/ppom-validator'; ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(desktop) @@ -151,6 +151,10 @@ import { isManifestV3 } from '../../shared/modules/mv3.utils'; import { hexToDecimal } from '../../shared/modules/conversion.utils'; import { ACTION_QUEUE_METRICS_E2E_TEST } from '../../shared/constants/test-flags'; +///: BEGIN:ONLY_INCLUDE_IN(blockaid) +import { createPPOMMiddleware } from './lib/ppom/ppom-middleware'; +import * as PPOMModule from './lib/ppom/ppom'; +///: END:ONLY_INCLUDE_IN import { onMessageReceived, checkForMultipleVersionsRunning, @@ -212,7 +216,7 @@ import { import createRPCMethodTrackingMiddleware from './lib/createRPCMethodTrackingMiddleware'; import { securityProviderCheck } from './lib/security-provider-helpers'; ///: BEGIN:ONLY_INCLUDE_IN(blockaid) -import { IndexedDBPPOMStorage } from './lib/indexed-db-backend'; +import { IndexedDBPPOMStorage } from './lib/ppom/indexed-db-backend'; ///: END:ONLY_INCLUDE_IN import { updateCurrentLocale } from './translate'; @@ -639,6 +643,7 @@ export default class MetamaskController extends EventEmitter { }), storageBackend: new IndexedDBPPOMStorage('PPOMDB', 1), provider: this.provider, + ppomProvider: { PPOM: PPOMModule.PPOM, ppomInit: PPOMModule.default }, state: initState.PPOMController, chainId: this.networkController.state.providerConfig.chainId, onNetworkChange: networkControllerMessenger.subscribe.bind( @@ -650,6 +655,7 @@ export default class MetamaskController extends EventEmitter { onPreferencesChange: this.preferencesController.store.subscribe.bind( this.preferencesController.store, ), + cdnBaseUrl: process.env.BLOCKAID_FILE_CDN, }); ///: END:ONLY_INCLUDE_IN @@ -1712,9 +1718,6 @@ export default class MetamaskController extends EventEmitter { this.swapsController.resetState, this.ensController.resetState, this.approvalController.clear.bind(this.approvalController), - ///: BEGIN:ONLY_INCLUDE_IN(blockaid) - this.ppomController.clear.bind(this.ppomController), - ///: END:ONLY_INCLUDE_IN // WE SHOULD ADD TokenListController.resetState here too. But it's not implemented yet. ]; diff --git a/builds.yml b/builds.yml index 4a988c9f4342..eb178509ffdb 100644 --- a/builds.yml +++ b/builds.yml @@ -47,6 +47,7 @@ buildTypes: - desktop - build-flask - keyring-snaps + # - blockaid env: - INFURA_FLASK_PROJECT_ID - SEGMENT_FLASK_WRITE_KEY @@ -117,6 +118,8 @@ features: - SKIP_OTP_PAIRING_FLOW: false - WEB_SOCKET_PORT: null blockaid: + env: + - BLOCKAID_FILE_CDN: null ### # Build Type code extensions. Things like different support links, warning pages, banners @@ -225,6 +228,8 @@ env: - NODE_DEBUG: '' # Used by react-devtools-core - EDITOR_URL: '' + # CDN for blockaid files + - BLOCKAID_FILE_CDN ### # Meta variables diff --git a/development/build/static.js b/development/build/static.js index 29e6a7ab7663..335db4f65ec0 100644 --- a/development/build/static.js +++ b/development/build/static.js @@ -205,7 +205,7 @@ function getCopyTargets( if (activeFeatures.includes('blockaid')) { allCopyTargets.push({ - src: getPathInsideNodeModules('@metamask/ppom-validator', 'dist/'), + src: getPathInsideNodeModules('@blockaid/ppom', '/'), pattern: '*.wasm', dest: '', }); diff --git a/package.json b/package.json index df0f17b4792d..4692fc822eb4 100644 --- a/package.json +++ b/package.json @@ -203,6 +203,7 @@ }, "dependencies": { "@babel/runtime": "^7.18.9", + "@blockaid/ppom": "^0.1.2", "@download/blockies": "^1.0.3", "@ensdomains/content-hash": "^2.5.6", "@ethereumjs/common": "^3.1.1", @@ -256,7 +257,7 @@ "@metamask/permission-controller": "^4.0.0", "@metamask/phishing-controller": "^3.0.0", "@metamask/post-message-stream": "^6.0.0", - "@metamask/ppom-validator": "^0.0.1", + "@metamask/ppom-validator": "^0.1.2", "@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 06d73141b494..c9793146340d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,10 +1619,10 @@ __metadata: languageName: node linkType: hard -"@blockaid/ppom-mock@npm:^1.0.0": - version: 1.0.0 - resolution: "@blockaid/ppom-mock@npm:1.0.0" - checksum: 297efc29210aae5fb258bbecefcd742645966041bd9af6f256aa80c671920d5e7d9e669c4d1e34795f8556997663abc42422bfafc511ab8379134ce1c8ac324e +"@blockaid/ppom@npm:^0.1.2": + version: 0.1.2 + resolution: "@blockaid/ppom@npm:0.1.2" + checksum: 986b23086c6bc2b37342f460f1178278d3e11d4b3beaba5664ad91b71a21466528b6c915c51df7828ba636fc927676f14e5373193ff35ee26dd19da5dfaab05b languageName: node linkType: hard @@ -4545,15 +4545,14 @@ __metadata: languageName: node linkType: hard -"@metamask/ppom-validator@npm:^0.0.1": - version: 0.0.1 - resolution: "@metamask/ppom-validator@npm:0.0.1" +"@metamask/ppom-validator@npm:^0.1.2": + version: 0.1.2 + resolution: "@metamask/ppom-validator@npm:0.1.2" dependencies: - "@blockaid/ppom-mock": ^1.0.0 "@metamask/base-controller": ^3.0.0 "@metamask/controller-utils": ^4.0.0 await-semaphore: ^0.1.3 - checksum: a94edcd618f670b392a84caa236bbc951a6a99100d8a5fa7bd89b78747c3b06b289738b42aee433659b647441eab0a8741e1951a0e29ef6aa98ffa10a3f33f5b + checksum: 8d2dfc2aa66d852765abd06af2709442a44fd3f96b204c9affa80cb9e2add39eb0b538bf3666f94afc0256d4f6a871bbead66723c5854ed823cfbf59d715da20 languageName: node linkType: hard @@ -24226,6 +24225,7 @@ __metadata: "@babel/preset-typescript": ^7.16.7 "@babel/register": ^7.5.5 "@babel/runtime": ^7.18.9 + "@blockaid/ppom": ^0.1.2 "@download/blockies": ^1.0.3 "@ensdomains/content-hash": ^2.5.6 "@ethereumjs/common": ^3.1.1 @@ -24289,7 +24289,7 @@ __metadata: "@metamask/phishing-controller": ^3.0.0 "@metamask/phishing-warning": ^2.1.0 "@metamask/post-message-stream": ^6.0.0 - "@metamask/ppom-validator": ^0.0.1 + "@metamask/ppom-validator": ^0.1.2 "@metamask/providers": ^11.1.0 "@metamask/rate-limit-controller": ^3.0.0 "@metamask/rpc-methods": ^1.0.0-prerelease.1