Skip to content

chore: migrate eth-json-rpc-filters to use JsonRpcEngineV2 #39057

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

Draft
rekmarks wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −42
Draft

chore: migrate eth-json-rpc-filters to use JsonRpcEngineV2 #39057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 22 additions & 29 deletions app/scripts/lib/createMetamaskMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { createWalletMiddleware } from '@metamask/eth-json-rpc-middleware';
import {
asLegacyMiddleware,
createScaffoldMiddleware,
JsonRpcEngineV2,
} from '@metamask/json-rpc-engine/v2';
import { createScaffoldMiddleware } from '@metamask/json-rpc-engine/v2';

import {
createPendingNonceMiddleware,
Expand Down Expand Up @@ -32,28 +28,25 @@ export default function createMetamaskMiddleware({
getPendingTransactionByHash,
processRequestExecutionPermissions,
}: Options) {
const engine = JsonRpcEngineV2.create({
middleware: [
/* eslint-disable @typescript-eslint/naming-convention */
createScaffoldMiddleware({
eth_syncing: false,
web3_clientVersion: `MetaMask/v${version}`,
}),
/* eslint-enable @typescript-eslint/naming-convention */
createWalletMiddleware({
getAccounts,
processTransaction,
processTypedMessage,
processTypedMessageV3,
processTypedMessageV4,
processPersonalMessage,
processDecryptMessage,
processEncryptionPublicKey,
processRequestExecutionPermissions,
}),
createPendingNonceMiddleware({ getPendingNonce }),
createPendingTxMiddleware({ getPendingTransactionByHash }),
],
});
return asLegacyMiddleware(engine);
return [
/* eslint-disable @typescript-eslint/naming-convention */
createScaffoldMiddleware({
eth_syncing: false,
web3_clientVersion: `MetaMask/v${version}`,
}),
/* eslint-enable @typescript-eslint/naming-convention */
createWalletMiddleware({
getAccounts,
processTransaction,
processTypedMessage,
processTypedMessageV3,
processTypedMessageV4,
processPersonalMessage,
processDecryptMessage,
processEncryptionPublicKey,
processRequestExecutionPermissions,
}),
createPendingNonceMiddleware({ getPendingNonce }),
createPendingTxMiddleware({ getPendingTransactionByHash }),
];
}
23 changes: 17 additions & 6 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import {
createScaffoldMiddleware,
JsonRpcEngine,
} from '@metamask/json-rpc-engine';
import {
JsonRpcEngineV2,
asLegacyMiddleware,
} from '@metamask/json-rpc-engine/v2';
import { createEngineStream } from '@metamask/json-rpc-middleware-stream';
import { ObservableStore } from '@metamask/obs-store';
import { storeAsStream } from '@metamask/obs-store/dist/asStream';
Expand Down Expand Up @@ -2451,7 +2455,7 @@ export default class MetamaskController extends EventEmitter {
scope,
origin,
tabId,
middleware: subscriptionManager.middleware,
middleware: asLegacyMiddleware(subscriptionManager.middleware),
});
}

Expand Down Expand Up @@ -7842,10 +7846,17 @@ export default class MetamaskController extends EventEmitter {
}),
);

engine.push(filterMiddleware);
engine.push(subscriptionManager.middleware);

engine.push(this.metamaskMiddleware);
engine.push(
asLegacyMiddleware(
JsonRpcEngineV2.create({
middleware: [
filterMiddleware,
subscriptionManager.middleware,
...this.metamaskMiddleware,
],
}),
),
);

engine.push(this.eip5792Middleware);

Expand Down Expand Up @@ -8012,7 +8023,7 @@ export default class MetamaskController extends EventEmitter {
}),
);

engine.push(this.metamaskMiddleware);
engine.push(asLegacyMiddleware(...this.metamaskMiddleware));

engine.push(this.eip5792Middleware);

Expand Down
Binary file added metamask-eth-json-rpc-filters-9.0.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
"@metamask/ens-controller": "^18.0.0",
"@metamask/ens-resolver-snap": "^1.1.0",
"@metamask/error-reporting-service": "^3.0.0",
"@metamask/eth-json-rpc-filters": "^9.0.0",
"@metamask/eth-json-rpc-filters": "file:./metamask-eth-json-rpc-filters-9.0.0.tgz",
"@metamask/eth-json-rpc-middleware": "^22.0.1",
"@metamask/eth-ledger-bridge-keyring": "11.1.2",
"@metamask/eth-qr-keyring": "^1.1.0",
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6456,16 +6456,16 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-json-rpc-filters@npm:^9.0.0":
"@metamask/eth-json-rpc-filters@file:./metamask-eth-json-rpc-filters-9.0.0.tgz::locator=metamask-crx%40workspace%3A.":
version: 9.0.0
resolution: "@metamask/eth-json-rpc-filters@npm:9.0.0"
resolution: "@metamask/eth-json-rpc-filters@file:./metamask-eth-json-rpc-filters-9.0.0.tgz#./metamask-eth-json-rpc-filters-9.0.0.tgz::hash=e65c20&locator=metamask-crx%40workspace%3A."
dependencies:
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/json-rpc-engine": "npm:^10.0.0"
"@metamask/json-rpc-engine": "npm:^10.2.0"
"@metamask/safe-event-emitter": "npm:^3.0.0"
async-mutex: "npm:^0.5.0"
pify: "npm:^5.0.0"
checksum: 10/12095db69902e267d568d67b4241677502558159691d47216f82701f8e2875a051636b8ff483351d17e01d090b7a1eb8d5dec4cc17a9e47c99aa6d2ec0a073b4
checksum: 10/9b3a5493d052393e7e493d5409cfd1774f7d8ded8be026b69e69d6e6692c58e2f99371a015ff90b0e4df33bea3b48b0a1a6e12d0268f6c11e4fd788a3d8726e9
languageName: node
linkType: hard

Expand Down Expand Up @@ -6882,7 +6882,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.0":
"@metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.0":
version: 10.2.0
resolution: "@metamask/json-rpc-engine@npm:10.2.0"
dependencies:
Expand Down Expand Up @@ -32841,7 +32841,7 @@ __metadata:
"@metamask/eslint-config-nodejs": "npm:^9.0.0"
"@metamask/eslint-config-typescript": "npm:^9.0.1"
"@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
"@metamask/eth-json-rpc-filters": "npm:^9.0.0"
"@metamask/eth-json-rpc-filters": "file:./metamask-eth-json-rpc-filters-9.0.0.tgz"
"@metamask/eth-json-rpc-middleware": "npm:^22.0.1"
"@metamask/eth-json-rpc-provider": "npm:^6.0.0"
"@metamask/eth-ledger-bridge-keyring": "npm:11.1.2"
Expand Down
Loading