Skip to content
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

Jump to bottom

fix(deps): @metamask/eth-json-rpc-middleware 15 #27923

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

fix(deps): @metamask/eth-json-rpc-middleware 15 #27923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ae7259
deps: @metamask/eth-json-rpc-middleware@^14.0.1-patched->@^15.0.0
legobeat Oct 17, 2024
194f6f9
deps: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-…
legobeat Oct 17, 2024
6bccde0
deps: @metamask/providers@^14.0.2->^18.0.0
legobeat Oct 17, 2024
4eecb1f
deps: @metamask/providers@^18.0.0->^18.1.0
legobeat Oct 18, 2024
47882f1
fix: work around broken export/import of @metamask/providers
legobeat Oct 24, 2024
078ee36
chore: update lavamoat policies
legobeat Oct 24, 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
13 changes: 0 additions & 13 deletions .yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/scripts/inpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cleanContextForImports();
import log from 'loglevel';
import { v4 as uuid } from 'uuid';
import { WindowPostMessageStream } from '@metamask/post-message-stream';
import { initializeProvider } from '@metamask/providers/dist/initializeInpageProvider';
import { initializeProvider } from '../../node_modules/@metamask/providers/dist/initializeInpageProvider.cjs';
Copy link
Contributor

@naugtur naugtur Oct 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The reason why normal importing didn't work might have something to do with the still incomplete exports support in some of the tools we are using.
browserify/resolve#224
This package is depended upon by more things than you think.

have you tried
@metamask/providers/dist/initializeInpageProvider.cjs ?
It's possible that the way it resolves is <package name>/literal/path/in/package

Copy link
Contributor Author

@legobeat legobeat Oct 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The reason why normal importing didn't work might have something to do with the still incomplete exports support in some of the tools we are using.

That does seem to be the case!

This package is depended upon by more things than you think.

Oh, I'm painfully aware :D

have you tried @metamask/providers/dist/initializeInpageProvider.cjs ?

Yes. For some reason that works for @metamask/providers v17 but not for v18 (here).

import shouldInjectProvider from '../../shared/modules/provider-injection';

// contexts
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import {
fetchMultiExchangeRate,
} from '@metamask/assets-controllers';
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
import { createEngineStream } from '@metamask/json-rpc-middleware-stream';
import { ObservableStore } from '@metamask/obs-store';
import { storeAsStream } from '@metamask/obs-store/dist/asStream';
import { createEngineStream } from 'json-rpc-middleware-stream';
import { providerAsMiddleware } from '@metamask/eth-json-rpc-middleware';
import { debounce, throttle, memoize, wrap } from 'lodash';
import {
Expand Down
68 changes: 16 additions & 52 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,24 +831,11 @@
"setTimeout": true
},
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/eth-json-rpc-middleware>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
"@metamask/eth-sig-util": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -1276,6 +1263,17 @@
"@metamask/utils": true
}
},
"@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/keyring-api": {
"globals": {
"URL": true
Expand Down Expand Up @@ -1615,25 +1613,12 @@
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"uuid": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/rpc-errors": true,
Expand Down Expand Up @@ -2538,11 +2523,11 @@
"setTimeout": true
},
"packages": {
"@metamask/json-rpc-middleware-stream": true,
"@metamask/object-multiplex": true,
"@metamask/post-message-stream": true,
"@metamask/snaps-controllers>@metamask/base-controller": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
"@metamask/snaps-controllers>@metamask/permission-controller": true,
"@metamask/snaps-controllers>@metamask/rpc-errors": true,
"@metamask/snaps-controllers>@xstate/fsm": true,
Expand Down Expand Up @@ -2582,17 +2567,6 @@
"@metamask/utils": true
}
},
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/snaps-controllers>@metamask/permission-controller": {
"globals": {
"console.error": true
Expand Down Expand Up @@ -4582,16 +4556,6 @@
"stream-http": true
}
},
"json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"readable-stream": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
68 changes: 16 additions & 52 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,24 +831,11 @@
"setTimeout": true
},
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/eth-json-rpc-middleware>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
"@metamask/eth-sig-util": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -1276,6 +1263,17 @@
"@metamask/utils": true
}
},
"@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/keyring-api": {
"globals": {
"URL": true
Expand Down Expand Up @@ -1615,25 +1613,12 @@
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"uuid": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/rpc-errors": true,
Expand Down Expand Up @@ -2538,11 +2523,11 @@
"setTimeout": true
},
"packages": {
"@metamask/json-rpc-middleware-stream": true,
"@metamask/object-multiplex": true,
"@metamask/post-message-stream": true,
"@metamask/snaps-controllers>@metamask/base-controller": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
"@metamask/snaps-controllers>@metamask/permission-controller": true,
"@metamask/snaps-controllers>@metamask/rpc-errors": true,
"@metamask/snaps-controllers>@xstate/fsm": true,
Expand Down Expand Up @@ -2582,17 +2567,6 @@
"@metamask/utils": true
}
},
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/snaps-controllers>@metamask/permission-controller": {
"globals": {
"console.error": true
Expand Down Expand Up @@ -4582,16 +4556,6 @@
"stream-http": true
}
},
"json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"readable-stream": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
68 changes: 16 additions & 52 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,24 +831,11 @@
"setTimeout": true
},
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/eth-json-rpc-middleware>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
"@metamask/eth-sig-util": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
"packages": {
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -1276,6 +1263,17 @@
"@metamask/utils": true
}
},
"@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/keyring-api": {
"globals": {
"URL": true
Expand Down Expand Up @@ -1615,25 +1613,12 @@
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true,
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"uuid": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
"@metamask/network-controller>@metamask/json-rpc-engine": {
"packages": {
"@metamask/network-controller>@metamask/rpc-errors": true,
Expand Down Expand Up @@ -2538,11 +2523,11 @@
"setTimeout": true
},
"packages": {
"@metamask/json-rpc-middleware-stream": true,
"@metamask/object-multiplex": true,
"@metamask/post-message-stream": true,
"@metamask/snaps-controllers>@metamask/base-controller": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
"@metamask/snaps-controllers>@metamask/permission-controller": true,
"@metamask/snaps-controllers>@metamask/rpc-errors": true,
"@metamask/snaps-controllers>@xstate/fsm": true,
Expand Down Expand Up @@ -2582,17 +2567,6 @@
"@metamask/utils": true
}
},
"@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"readable-stream": true
}
},
"@metamask/snaps-controllers>@metamask/permission-controller": {
"globals": {
"console.error": true
Expand Down Expand Up @@ -4582,16 +4556,6 @@
"stream-http": true
}
},
"json-rpc-middleware-stream": {
"globals": {
"console.warn": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"readable-stream": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
Loading
Loading