Skip to content

feat: Enable ppom on other chains #22633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpuri merged 14 commits into from
Jan 25, 2024
Merged

feat: Enable ppom on other chains #22633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
252fe8f
Redo multichain in another PR
segun Jan 23, 2024
59fcf2c
Merge branch 'develop' into olu/enable-ppom-on-other-chains-2
segun Jan 23, 2024
de70176
Merge branch 'develop' into olu/enable-ppom-on-other-chains-2
segun Jan 24, 2024
7cc133c
Update LavaMoat policies
metamaskbot Jan 24, 2024
f563ccc
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
jpuri Jan 24, 2024
4b9d648
Merge branch 'olu/enable-ppom-on-other-chains-2' of github.com:MetaMa…
jpuri Jan 24, 2024
e70a5c1
Update
jpuri Jan 24, 2024
019aaf6
Update LavaMoat policies
metamaskbot Jan 24, 2024
b98780c
Fix lint issue
jpuri Jan 24, 2024
0a87270
Merge branch 'olu/enable-ppom-on-other-chains-2' of github.com:MetaMa…
jpuri Jan 24, 2024
67d4f9b
Update
jpuri Jan 25, 2024
a36a306
merge
jpuri Jan 25, 2024
c7f4656
Update
jpuri Jan 25, 2024
9cc99f0
Update LavaMoat policies
metamaskbot Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/scripts/lib/createStreamSink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Writable as WritableStream } from 'readable-stream';
import { Writable } from 'readable-stream';
import promiseToCallback from 'promise-to-callback';

class AsyncWritableStream extends WritableStream {
class AsyncWritableStream extends Writable {
constructor(asyncWriteFn, _opts) {
const opts = { objectMode: true, ..._opts };
super(opts);
Copy link
Copy Markdown
Contributor

@jpuri jpuri Jan 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was needed to fix a weird lint issue.

Expand Down
12 changes: 11 additions & 1 deletion app/scripts/lib/ppom/ppom-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ const ConfirmationMethods = Object.freeze([
'personal_sign',
]);

export const SUPPORTED_CHAIN_IDS: string[] = [
CHAIN_IDS.MAINNET,
CHAIN_IDS.BSC,
CHAIN_IDS.POLYGON,
CHAIN_IDS.ARBITRUM,
CHAIN_IDS.OPTIMISM,
CHAIN_IDS.AVALANCHE,
CHAIN_IDS.LINEA_MAINNET,
];

/**
* Middleware function that handles JSON RPC requests.
* This function will be called for every JSON RPC request.
Expand Down Expand Up @@ -49,7 +59,7 @@ export function createPPOMMiddleware(
if (
securityAlertsEnabled &&
ConfirmationMethods.includes(req.method) &&
chainId === CHAIN_IDS.MAINNET
SUPPORTED_CHAIN_IDS.includes(chainId)
) {
// eslint-disable-next-line require-atomic-updates
req.securityAlertResponse = await ppomController.usePPOM(
Expand Down
5 changes: 1 addition & 4 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,16 +769,13 @@ export default class MetamaskController extends EventEmitter {
this.ppomController = new PPOMController({
messenger: this.controllerMessenger.getRestricted({
name: 'PPOMController',
allowedEvents: ['NetworkController:stateChange'],
}),
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(
networkControllerMessenger,
'NetworkController:stateChange',
),
securityAlertsEnabled:
this.preferencesController.store.getState().securityAlertsEnabled,
onPreferencesChange: this.preferencesController.store.subscribe.bind(
Expand Down
20 changes: 10 additions & 10 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
"packages": {
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
Expand Down Expand Up @@ -1513,14 +1513,20 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/message-manager>@metamask/eth-sig-util": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
Expand Down Expand Up @@ -1703,12 +1709,6 @@
"webpack>events": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/ppom-validator>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
Expand Down Expand Up @@ -1838,7 +1838,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down Expand Up @@ -1883,7 +1883,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down
20 changes: 10 additions & 10 deletions lavamoat/browserify/desktop/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
"packages": {
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
Expand Down Expand Up @@ -1590,14 +1590,20 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/message-manager>@metamask/eth-sig-util": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
Expand Down Expand Up @@ -1807,12 +1813,6 @@
"webpack>events": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/ppom-validator>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
Expand Down Expand Up @@ -1979,7 +1979,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down Expand Up @@ -2024,7 +2024,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down
54 changes: 18 additions & 36 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
"packages": {
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
Expand Down Expand Up @@ -1590,14 +1590,20 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/message-manager>@metamask/eth-sig-util": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
Expand Down Expand Up @@ -1812,12 +1818,14 @@
"URL": true,
"clearInterval": true,
"console.error": true,
"crypto": true,
"setInterval": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/eth-query>json-rpc-random-id": true,
"@metamask/ppom-validator>@metamask/base-controller": true,
"@metamask/ppom-validator>@metamask/controller-utils": true,
"@metamask/ppom-validator>crypto-js": true,
"@metamask/ppom-validator>elliptic": true,
"await-semaphore": true,
"browserify>buffer": true
Expand All @@ -1831,40 +1839,14 @@
"immer": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils": {
"@metamask/ppom-validator>crypto-js": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
"crypto": true,
"define": true,
"msCrypto": true
},
"packages": {
"@metamask/utils>@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true,
"superstruct": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
"browserify>browser-resolve": true
}
},
"@metamask/ppom-validator>elliptic": {
Expand Down Expand Up @@ -2033,7 +2015,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down Expand Up @@ -2078,7 +2060,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down
54 changes: 18 additions & 36 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
"packages": {
"@metamask/address-book-controller>@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
Expand Down Expand Up @@ -1513,14 +1513,20 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
}
},
"@metamask/message-manager>@metamask/eth-sig-util": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
Expand Down Expand Up @@ -1735,12 +1741,14 @@
"URL": true,
"clearInterval": true,
"console.error": true,
"crypto": true,
"setInterval": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/eth-query>json-rpc-random-id": true,
"@metamask/ppom-validator>@metamask/base-controller": true,
"@metamask/ppom-validator>@metamask/controller-utils": true,
"@metamask/ppom-validator>crypto-js": true,
"@metamask/ppom-validator>elliptic": true,
"await-semaphore": true,
"browserify>buffer": true
Expand All @@ -1754,40 +1762,14 @@
"immer": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils": {
"@metamask/ppom-validator>crypto-js": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
"crypto": true,
"define": true,
"msCrypto": true
},
"packages": {
"@metamask/utils>@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true,
"superstruct": true
}
},
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"bn.js": true
"browserify>browser-resolve": true
}
},
"@metamask/ppom-validator>elliptic": {
Expand Down Expand Up @@ -1956,7 +1938,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down Expand Up @@ -2001,7 +1983,7 @@
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ppom-validator>@metamask/controller-utils>ethjs-unit": true,
"@metamask/message-manager>@metamask/controller-utils>ethjs-unit": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
Expand Down
Loading