Skip to content

Commit 60e5e64

Browse files
authored
chore: Use npm package resolution to load viem fork (#17754)
So we don't tweak every single import. This will make it easier to go back to the main viem package in the future. Follows the same strategy as the forward port in #17753
1 parent 8784100 commit 60e5e64

169 files changed

Lines changed: 300 additions & 336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

yarn-project/archiver/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
"@aztec/protocol-contracts": "workspace:^",
7979
"@aztec/stdlib": "workspace:^",
8080
"@aztec/telemetry-client": "workspace:^",
81-
"@spalladino/viem": "2.38.2-eip7594.0",
8281
"lodash.groupby": "^4.6.0",
8382
"lodash.omit": "^4.5.0",
8483
"tsc-watch": "^6.0.0",
85-
"tslib": "^2.5.0"
84+
"tslib": "^2.5.0",
85+
"viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
8686
},
8787
"devDependencies": {
8888
"@jest/globals": "^30.0.0",

yarn-project/archiver/src/archiver/archiver.test.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,9 @@ import { makeAndSignCommitteeAttestationsAndSigners, makeBlockAttestationFromBlo
2929
import { getTelemetryClient } from '@aztec/telemetry-client';
3030

3131
import { jest } from '@jest/globals';
32-
import {
33-
type FormattedBlock,
34-
type Log,
35-
type Transaction,
36-
encodeFunctionData,
37-
multicall3Abi,
38-
toHex,
39-
} from '@spalladino/viem';
4032
import assert from 'assert';
4133
import { type MockProxy, mock } from 'jest-mock-extended';
34+
import { type FormattedBlock, type Log, type Transaction, encodeFunctionData, multicall3Abi, toHex } from 'viem';
4235

4336
import { Archiver } from './archiver.js';
4437
import type { ArchiverDataStore } from './archiver_store.js';

yarn-project/archiver/src/archiver/archiver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ import {
7272
trackSpan,
7373
} from '@aztec/telemetry-client';
7474

75-
import { type GetContractReturnType, createPublicClient, fallback, http } from '@spalladino/viem';
7675
import { EventEmitter } from 'events';
7776
import groupBy from 'lodash.groupby';
77+
import { type GetContractReturnType, createPublicClient, fallback, http } from 'viem';
7878

7979
import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
8080
import type { ArchiverConfig } from './config.js';

yarn-project/archiver/src/archiver/data_retrieval.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
getAbiItem,
3030
hexToBytes,
3131
multicall3Abi,
32-
} from '@spalladino/viem';
32+
} from 'viem';
3333

3434
import { NoBlobBodiesFoundError } from './errors.js';
3535
import type { DataRetrieval } from './structs/data_retrieval.js';

yarn-project/aztec-faucet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
"@aztec/foundation": "workspace:^",
6868
"@aztec/l1-artifacts": "workspace:^",
6969
"@koa/cors": "^5.0.0",
70-
"@spalladino/viem": "2.38.2-eip7594.0",
7170
"koa": "^2.16.1",
7271
"koa-bodyparser": "^4.4.1",
7372
"koa-router": "^13.1.1",
73+
"viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
7474
"zod": "^3.23.8"
7575
},
7676
"devDependencies": {

yarn-project/aztec-faucet/src/faucet.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
type WalletClient,
1313
getContract,
1414
parseEther,
15-
} from '@spalladino/viem';
16-
import { mnemonicToAccount } from '@spalladino/viem/accounts';
15+
} from 'viem';
16+
import { mnemonicToAccount } from 'viem/accounts';
1717

1818
import type { FaucetConfig, L1AssetConfig } from './config.js';
1919

yarn-project/aztec-node/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
"@aztec/telemetry-client": "workspace:^",
9090
"@aztec/validator-client": "workspace:^",
9191
"@aztec/world-state": "workspace:^",
92-
"@spalladino/viem": "2.38.2-eip7594.0",
9392
"koa": "^2.16.1",
9493
"koa-router": "^13.1.1",
95-
"tslib": "^2.4.0"
94+
"tslib": "^2.4.0",
95+
"viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
9696
},
9797
"devDependencies": {
9898
"@jest/globals": "^30.0.0",

yarn-project/aztec-node/src/aztec-node/config.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import type { SequencerClientConfig, TxSenderConfig } from '@aztec/sequencer-cli
55
import { AztecAddress } from '@aztec/stdlib/aztec-address';
66
import type { ValidatorClientConfig } from '@aztec/validator-client/config';
77

8-
import type { Hex } from '@spalladino/viem';
9-
import { generatePrivateKey, privateKeyToAddress } from '@spalladino/viem/accounts';
8+
import type { Hex } from 'viem';
9+
import { generatePrivateKey, privateKeyToAddress } from 'viem/accounts';
1010

1111
import { createKeyStoreForValidator } from './config.js';
1212

yarn-project/aztec-node/src/aztec-node/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
2929
import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
3030
import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
3131

32-
import { privateKeyToAddress } from '@spalladino/viem/accounts';
32+
import { privateKeyToAddress } from 'viem/accounts';
3333

3434
import { type SentinelConfig, sentinelConfigMappings } from '../sentinel/config.js';
3535

yarn-project/aztec-node/src/aztec-node/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ import {
115115
} from '@aztec/validator-client';
116116
import { createWorldStateSynchronizer } from '@aztec/world-state';
117117

118-
import { createPublicClient, fallback, http } from '@spalladino/viem';
118+
import { createPublicClient, fallback, http } from 'viem';
119119

120120
import { createSentinel } from '../sentinel/factory.js';
121121
import { Sentinel } from '../sentinel/sentinel.js';

0 commit comments

Comments
 (0)