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

fix: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-stream@^8 #28060

Merged
merged 2 commits into from
Oct 25, 2024
Merged

fix: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-stream@^8 #28060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf8ca4f
deps: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-…
legobeat Oct 17, 2024
ad3acdc
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
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
34 changes: 12 additions & 22 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,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 @@ -2538,11 +2549,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 +2593,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 +4582,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
34 changes: 12 additions & 22 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,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 @@ -2538,11 +2549,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 +2593,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 +4582,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
34 changes: 12 additions & 22 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,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 @@ -2538,11 +2549,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 +2593,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 +4582,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
34 changes: 12 additions & 22 deletions lavamoat/browserify/mmi/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,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 @@ -2630,11 +2641,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 @@ -2674,17 +2685,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 @@ -4674,16 +4674,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
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 @@ -329,6 +329,7 @@
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/json-rpc-engine": "^10.0.0",
"@metamask/json-rpc-middleware-stream": "^8.0.4",
"@metamask/keyring-api": "^8.1.3",
"@metamask/keyring-controller": "^17.2.2",
"@metamask/logging-controller": "^6.0.0",
Expand Down Expand Up @@ -407,7 +408,6 @@
"immer": "^9.0.6",
"is-retry-allowed": "^2.2.0",
"jest-junit": "^14.0.1",
"json-rpc-middleware-stream": "^5.0.1",
"labeled-stream-splicer": "^2.0.2",
"localforage": "^1.9.0",
"lodash": "^4.17.21",
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 @@ -5560,15 +5560,15 @@ __metadata:
languageName: node
linkType: hard

"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2":
version: 8.0.2
resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.2"
"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.4":
version: 8.0.4
resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.4"
dependencies:
"@metamask/json-rpc-engine": "npm:^9.0.2"
"@metamask/json-rpc-engine": "npm:^10.0.0"
"@metamask/safe-event-emitter": "npm:^3.0.0"
"@metamask/utils": "npm:^9.1.0"
readable-stream: "npm:^3.6.2"
checksum: 10/aaf41cb6fa015494eb0424959d14022b1355c390066898603223e3418d93bd72249b6e54caee3e23b4d6a679f389c2374f687882f2a7202379b4f4b042a84974
checksum: 10/93c842e1ac8e624c65d888cb3539b38ade5b8415ea45f649d78dad91e7139f11fa96bbf89136998d21def7711b3f710939f8e4498ce31a6cf461892e3f4ba176
languageName: node
linkType: hard

Expand Down Expand Up @@ -25970,6 +25970,7 @@ __metadata:
"@metamask/gas-fee-controller": "npm:^18.0.0"
"@metamask/jazzicon": "npm:^2.0.0"
"@metamask/json-rpc-engine": "npm:^10.0.0"
"@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
"@metamask/keyring-api": "npm:^8.1.3"
"@metamask/keyring-controller": "npm:^17.2.2"
"@metamask/logging-controller": "npm:^6.0.0"
Expand Down Expand Up @@ -26188,7 +26189,6 @@ __metadata:
jest-environment-jsdom: "patch:jest-environment-jsdom@npm%3A29.7.0#~/.yarn/patches/jest-environment-jsdom-npm-29.7.0-0b72dd0e0b.patch"
jest-junit: "npm:^14.0.1"
jsdom: "npm:^16.7.0"
json-rpc-middleware-stream: "npm:^5.0.1"
json-schema-to-ts: "npm:^3.0.1"
koa: "npm:^2.7.0"
labeled-stream-splicer: "npm:^2.0.2"
Expand Down
Loading