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

deps: eth-block-tracker@^8.0.0 -> @metamask/eth-block-tracker@^9.0.2 #303

Merged
merged 9 commits into from
May 23, 2024
Merged

deps: eth-block-tracker@^8.0.0 -> @metamask/eth-block-tracker@^9.0.2 #303

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ee7e75
deps: eth-block-tracker@^8.0.0 -> @metamask/[email protected]
legobeat May 23, 2024
3c287ae
lockbump @metamask/[email protected]>8.4.0
legobeat May 23, 2024
fd54e71
lockbump @metamask/[email protected]>6.2.1
legobeat May 23, 2024
9acdcb0
lockbump @metamask/[email protected]>7.3.3
legobeat May 23, 2024
454502d
lockbump @metamask/[email protected]>2.3.2
legobeat May 23, 2024
74f629e
deps: @metamask/[email protected]>^9.0.1
legobeat May 23, 2024
4e5f83d
Fix unit tests
matthewwalsh0 May 23, 2024
3c5c2ee
deps(network-controller): @metamask/eth-block-tracker@^9.0.1->^9.0.2
legobeat May 23, 2024
5628b1a
params are back in test data
legobeat May 23, 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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/eth-block-tracker": "^9.0.2",
"@metamask/eth-json-rpc-provider": "^2.1.0",
"@metamask/eth-sig-util": "^7.0.0",
"@metamask/json-rpc-engine": "^7.1.1",
"@metamask/rpc-errors": "^6.0.0",
"@metamask/utils": "^8.1.0",
"eth-block-tracker": "^8.0.0",
"klona": "^2.0.6",
"pify": "^5.0.0",
"safe-stable-stringify": "^2.4.3"
Expand Down
2 changes: 1 addition & 1 deletion src/block-cache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PollingBlockTracker } from '@metamask/eth-block-tracker';
import { providerFromEngine } from '@metamask/eth-json-rpc-provider';
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
import { PollingBlockTracker } from 'eth-block-tracker';
import pify from 'pify';

import { createBlockCacheMiddleware } from '.';
Expand Down
2 changes: 1 addition & 1 deletion src/block-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
import type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';
import type { PollingBlockTracker } from 'eth-block-tracker';

import { projectLogger, createModuleLogger } from './logging-utils';
import type {
Expand Down Expand Up @@ -32,7 +32,7 @@
//

class BlockCacheStrategy {
private cache: Cache;

Check warning on line 35 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Use a hash name instead

Check warning on line 35 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Use a hash name instead

Check warning on line 35 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Use a hash name instead

constructor() {
this.cache = {};
Expand Down Expand Up @@ -110,7 +110,7 @@
)
) {
if (
!result ||

Check warning on line 113 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Prefer using an optional chain expression instead, as it's more concise and easier to read

Check warning on line 113 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Prefer using an optional chain expression instead, as it's more concise and easier to read

Check warning on line 113 in src/block-cache.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Prefer using an optional chain expression instead, as it's more concise and easier to read
!result.blockHash ||
result.blockHash ===
'0x0000000000000000000000000000000000000000000000000000000000000000'
Expand Down
2 changes: 1 addition & 1 deletion src/block-ref-rewrite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
import type { Json, JsonRpcParams } from '@metamask/utils';
import type { PollingBlockTracker } from 'eth-block-tracker';

import { blockTagParamIndex } from './utils/cache';

Expand Down
2 changes: 1 addition & 1 deletion src/block-ref.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { PollingBlockTracker } from '@metamask/eth-block-tracker';
import { providerFromEngine } from '@metamask/eth-json-rpc-provider';
import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
import { PollingBlockTracker } from 'eth-block-tracker';

import { createBlockRefMiddleware } from '.';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/block-ref.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
Expand All @@ -6,7 +7,6 @@ import type {
JsonRpcParams,
PendingJsonRpcResponse,
} from '@metamask/utils';
import type { PollingBlockTracker } from 'eth-block-tracker';
import { klona } from 'klona/full';
import pify from 'pify';

Expand Down
2 changes: 1 addition & 1 deletion src/block-tracker-inspector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
import type {
Json,
JsonRpcParams,
PendingJsonRpcResponse,
} from '@metamask/utils';
import type { PollingBlockTracker } from 'eth-block-tracker';

import { projectLogger, createModuleLogger } from './logging-utils';

Expand Down
2 changes: 1 addition & 1 deletion src/retryOnEmpty.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { PollingBlockTracker } from '@metamask/eth-block-tracker';
import { providerFromEngine } from '@metamask/eth-json-rpc-provider';
import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
import { errorCodes, rpcErrors } from '@metamask/rpc-errors';
import type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';
import { PollingBlockTracker } from 'eth-block-tracker';

import { createRetryOnEmptyMiddleware } from '.';
import type { ProviderRequestStub } from '../test/util/helpers';
Expand Down
2 changes: 1 addition & 1 deletion src/retryOnEmpty.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
Expand All @@ -6,7 +7,6 @@ import type {
JsonRpcParams,
PendingJsonRpcResponse,
} from '@metamask/utils';
import type { PollingBlockTracker } from 'eth-block-tracker';
import { klona } from 'klona/full';
import pify from 'pify';

Expand Down
1 change: 0 additions & 1 deletion test/util/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ export function buildStubForBlockNumberRequest(
return {
request: {
method: 'eth_blockNumber',
params: [],
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, with v9.0.2 we should be able to restore this. Though I'm not sure whether it matters

Copy link
Contributor Author

@legobeat legobeat May 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Good call. It looks like it shouldn't matter but I'm better safe than sorry here so putting it back here as well so we don't have some subtle regression not break tests down the line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

At least it's good to see it work fine with both variants after 9.0.2

},
response: (req) => ({
id: req.id,
Expand Down
80 changes: 45 additions & 35 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,19 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-block-tracker@npm:^9.0.2":
version: 9.0.2
resolution: "@metamask/eth-block-tracker@npm:9.0.2"
dependencies:
"@metamask/eth-json-rpc-provider": ^2.3.1
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^8.1.0
json-rpc-random-id: ^1.0.1
pify: ^5.0.0
checksum: ec66cb100b011cafb2052bf0ab6935336ea4c8afd1f6c48326faf362a387d36112b5fffe296f3c75edfb09b29516182015c6f31ee6cb615c0ef4d2aa4ddb9c88
languageName: node
linkType: hard

"@metamask/eth-json-rpc-middleware@workspace:.":
version: 0.0.0-use.local
resolution: "@metamask/eth-json-rpc-middleware@workspace:."
Expand All @@ -939,6 +952,7 @@ __metadata:
"@metamask/eslint-config-jest": ^12.1.0
"@metamask/eslint-config-nodejs": ^12.1.0
"@metamask/eslint-config-typescript": ^12.1.0
"@metamask/eth-block-tracker": ^9.0.2
"@metamask/eth-json-rpc-provider": ^2.1.0
"@metamask/eth-sig-util": ^7.0.0
"@metamask/json-rpc-engine": ^7.1.1
Expand All @@ -958,7 +972,6 @@ __metadata:
eslint-plugin-n: ^15.7.0
eslint-plugin-prettier: ^4.2.1
eslint-plugin-promise: ^6.1.1
eth-block-tracker: ^8.0.0
jest: ^27.5.1
klona: ^2.0.6
pify: ^5.0.0
Expand All @@ -972,14 +985,14 @@ __metadata:
languageName: unknown
linkType: soft

"@metamask/eth-json-rpc-provider@npm:^2.1.0":
version: 2.3.1
resolution: "@metamask/eth-json-rpc-provider@npm:2.3.1"
"@metamask/eth-json-rpc-provider@npm:^2.1.0, @metamask/eth-json-rpc-provider@npm:^2.3.1":
version: 2.3.2
resolution: "@metamask/eth-json-rpc-provider@npm:2.3.2"
dependencies:
"@metamask/json-rpc-engine": ^7.3.1
"@metamask/json-rpc-engine": ^7.3.2
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^8.2.0
checksum: fa0a987eb7e0dcff495489e95c358f6786a4a793a42ac900bb022027d27e6534ded743092e79a2191b9b4d760f418f39f6cfb99a5a5a0085f252016579be6865
"@metamask/utils": ^8.3.0
checksum: e6731271aad3b972d85b9230c26d35a9b88722f3bd3024675ad2f568e634e9fdfef4717ef2892f3cc512d381cf17a4e20dbd5eb808ced765082bea3379ad6ddc
languageName: node
linkType: hard

Expand All @@ -997,24 +1010,24 @@ __metadata:
languageName: node
linkType: hard

"@metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.1":
version: 7.3.1
resolution: "@metamask/json-rpc-engine@npm:7.3.1"
"@metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.2":
version: 7.3.3
resolution: "@metamask/json-rpc-engine@npm:7.3.3"
dependencies:
"@metamask/rpc-errors": ^6.1.0
"@metamask/rpc-errors": ^6.2.1
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^8.2.0
checksum: 4952eb4e70c0011d334fb4a9bf56aa2d68bef745c892dddd06f6ed7e6303fb95b3b60b4e32c88b6d77bfc5091acc8e71ad274f389419e4bdcc5741ef49cde87d
"@metamask/utils": ^8.3.0
checksum: 7bab8b4d2341a6243ba451bc58283f0a6905b09f7257857859848a51a795444ca6899b1a6908b15f8ed236fb574ab85a630c9cb28d127ab52c4630e496c16006
languageName: node
linkType: hard

"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.1.0":
version: 6.1.0
resolution: "@metamask/rpc-errors@npm:6.1.0"
"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1":
version: 6.2.1
resolution: "@metamask/rpc-errors@npm:6.2.1"
dependencies:
"@metamask/utils": ^8.1.0
"@metamask/utils": ^8.3.0
fast-safe-stringify: ^2.0.6
checksum: 9f4821d804e2fcaa8987b0958d02c6d829b7c7db49740c811cb593f381d0c4b00dabb7f1802907f1b2f6126f7c0d83ec34219183d29650f5d24df014ac72906a
checksum: a9223c3cb9ab05734ea0dda990597f90a7cdb143efa0c026b1a970f2094fe5fa3c341ed39b1e7623be13a96b98fb2c697ef51a2e2b87d8f048114841d35ee0a9
languageName: node
linkType: hard

Expand All @@ -1025,9 +1038,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0":
version: 8.2.1
resolution: "@metamask/utils@npm:8.2.1"
"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.3.0":
version: 8.4.0
resolution: "@metamask/utils@npm:8.4.0"
dependencies:
"@ethereumjs/tx": ^4.2.0
"@noble/hashes": ^1.3.1
Expand All @@ -1037,7 +1050,8 @@ __metadata:
pony-cause: ^2.1.10
semver: ^7.5.4
superstruct: ^1.0.3
checksum: 36a714a17e4949d2040bedb28d4373a22e7e86bb797aa2d59223f9799fd76e662443bcede113719c4e200f5e9d90a9d62feafad5028fff8b9a7a85fface097ca
uuid: ^9.0.1
checksum: b0397e97bac7192f6189a8625a2dfcb56d3c2cf4dd2cb3d4e012a7e9786f04f59f6917805544bc131a6dacd2c8344e237ae43ad47429bb5eb35c6cf1248440b4
languageName: node
linkType: hard

Expand Down Expand Up @@ -3046,19 +3060,6 @@ __metadata:
languageName: node
linkType: hard

"eth-block-tracker@npm:^8.0.0":
version: 8.0.0
resolution: "eth-block-tracker@npm:8.0.0"
dependencies:
"@metamask/eth-json-rpc-provider": ^2.1.0
"@metamask/safe-event-emitter": ^3.0.0
"@metamask/utils": ^8.1.0
json-rpc-random-id: ^1.0.1
pify: ^5.0.0
checksum: 3416c2ee653f81d1f71f3a9b80e04837fb516494f64ded45c053dfc24c6c6ce8dac7e5b8376cd57f52838f43a93d20a8e17d4d875e50d1e4c267543ffe0e6ad8
languageName: node
linkType: hard

"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2":
version: 2.1.2
resolution: "ethereum-cryptography@npm:2.1.2"
Expand Down Expand Up @@ -6695,6 +6696,15 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^9.0.1":
version: 9.0.1
resolution: "uuid@npm:9.0.1"
bin:
uuid: dist/bin/uuid
checksum: 39931f6da74e307f51c0fb463dc2462807531dc80760a9bff1e35af4316131b4fc3203d16da60ae33f07fdca5b56f3f1dd662da0c99fea9aaeab2004780cc5f4
languageName: node
linkType: hard

"v8-compile-cache-lib@npm:^3.0.1":
version: 3.0.1
resolution: "v8-compile-cache-lib@npm:3.0.1"
Expand Down
Loading