Skip to content

fix: update fallback transport #12470

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

Merged
spypsy merged 19 commits into from
Mar 10, 2025
Merged

fix: update fallback transport #12470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f2f3f91
feat: custom viem fallback transport
spypsy Mar 5, 2025
38a3c66
Merge branch 'master' into spy/fallback-transport
spypsy Mar 5, 2025
077b1d3
add @aztec/ethereum dep
spypsy Mar 5, 2025
01f5af4
add fallback transport test
spypsy Mar 5, 2025
02aa26b
rm unused
spypsy Mar 5, 2025
ed09399
Merge branch 'master' into spy/fallback-transport
spypsy Mar 5, 2025
954db91
PR fixes
spypsy Mar 6, 2025
61abdce
update viem, remove custom fallback
spypsy Mar 7, 2025
d7cc79d
Merge branch 'master' into spy/fallback-transport
spypsy Mar 7, 2025
26c837d
update cli
spypsy Mar 7, 2025
bfcc0ac
remove aztec/ethereum from blob-sink
spypsy Mar 7, 2025
c656d6f
update viem in cli
spypsy Mar 7, 2025
f8cb869
update yarn.lock
spypsy Mar 7, 2025
64e1d0e
rm async
spypsy Mar 7, 2025
6128256
increase playground bundle size
spypsy Mar 10, 2025
0ce2893
update viem in stdlib
spypsy Mar 10, 2025
84fb7f4
Merge branch 'master' into spy/fallback-transport
spypsy Mar 10, 2025
f3d7a2b
fix yarn.lock
spypsy Mar 10, 2025
98a4fdf
update yarn.lock again
spypsy Mar 10, 2025
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 playground/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default defineConfig(({ mode }) => {
// ],
// }),
bundlesize({
limits: [{ name: "assets/index-*", limit: "1900kB" }],
Copy link
Contributor

@spalladino spalladino Mar 10, 2025

Choose a reason for hiding this comment

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

Shame on you, new viem

limits: [{ name: "assets/index-*", limit: "1950kB" }],
}),
],
define: {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/archiver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"lodash.omit": "^4.5.0",
"tsc-watch": "^6.0.0",
"tslib": "^2.5.0",
"viem": "2.22.8",
"viem": "2.23.7",
"ws": "^8.13.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/aztec-faucet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"koa": "^2.14.2",
"koa-bodyparser": "^4.4.1",
"koa-router": "^12.0.0",
"viem": "2.22.8",
"viem": "2.23.7",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/aztec.js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@aztec/stdlib": "workspace:^",
"axios": "^1.7.2",
"tslib": "^2.4.0",
"viem": "2.22.8"
"viem": "2.23.7"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/aztec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"commander": "^12.1.0",
"koa": "^2.14.2",
"koa-router": "^12.0.0",
"viem": "2.22.8"
"viem": "2.23.7"
},
"files": [
"dest",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/bb-prover/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"jest-mock-extended": "^3.0.3",
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
"viem": "2.22.8"
"viem": "2.23.7"
},
"files": [
"dest",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/blob-sink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"snappy": "^7.2.2",
"source-map-support": "^0.5.21",
"tslib": "^2.4.0",
"viem": "2.22.8",
"viem": "2.23.7",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"semver": "^7.5.4",
"source-map-support": "^0.5.21",
"tslib": "^2.4.0",
"viem": "2.22.8"
"viem": "2.23.7"
},
"devDependencies": {
"@aztec/accounts": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"tslib": "^2.4.0",
"typescript": "^5.0.4",
"util": "^0.12.5",
"viem": "2.22.8",
"viem": "2.23.7",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions yarn-project/end-to-end/src/spartan/4epochs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('token transfer test', () => {

let testWallets: TestWallets;
let PXE_URL: string;
let ETHEREUM_HOSTS: string;
let ETHEREUM_HOSTS: string[];
const forwardProcesses: ChildProcess[] = [];

beforeAll(async () => {
Expand All @@ -47,12 +47,12 @@ describe('token transfer test', () => {
containerPort: config.CONTAINER_ETHEREUM_PORT,
});
forwardProcesses.push(ethProcess);
ETHEREUM_HOSTS = `http://127.0.0.1:${ethPort}`;
ETHEREUM_HOSTS = [`http://127.0.0.1:${ethPort}`];
} else {
if (!config.ETHEREUM_HOSTS) {
throw new Error('ETHEREUM_HOSTS must be set for sepolia runs');
}
ETHEREUM_HOSTS = config.ETHEREUM_HOSTS;
ETHEREUM_HOSTS = config.ETHEREUM_HOSTS.split(',');
}

const { process: sequencerProcess, port: sequencerPort } = await startPortForward({
Expand All @@ -75,7 +75,7 @@ describe('token transfer test', () => {
);
} else {
PXE_URL = config.PXE_URL;
ETHEREUM_HOSTS = config.ETHEREUM_HOSTS;
ETHEREUM_HOSTS = config.ETHEREUM_HOSTS.split(',');
testWallets = await setupTestWalletsWithTokens(PXE_URL, MINT_AMOUNT, logger);
}

Expand All @@ -94,7 +94,7 @@ describe('token transfer test', () => {
});

it('transfer tokens for 4 epochs', async () => {
const ethCheatCodes = new EthCheatCodesWithState([ETHEREUM_HOSTS]);
const ethCheatCodes = new EthCheatCodesWithState(ETHEREUM_HOSTS);
const l1ContractAddresses = await testWallets.pxe.getNodeInfo().then(n => n.l1ContractAddresses);
// Get 4 epochs
const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, l1ContractAddresses);
Expand Down
8 changes: 4 additions & 4 deletions yarn-project/end-to-end/src/spartan/setup_test_wallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export async function setupTestWalletsWithTokens(
export async function deployTestWalletWithTokens(
pxeUrl: string,
nodeUrl: string,
l1RpcUrl: string,
l1RpcUrls: string[],
mnemonicOrPrivateKey: string,
mintAmount: bigint,
logger: Logger,
Expand All @@ -71,7 +71,7 @@ export async function deployTestWalletWithTokens(

const claims = await Promise.all(
fundedAccounts.map(a =>
bridgeL1FeeJuice(l1RpcUrl, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
),
);

Expand All @@ -97,15 +97,15 @@ export async function deployTestWalletWithTokens(
}

async function bridgeL1FeeJuice(
l1RpcUrl: string,
l1RpcUrls: string[],
mnemonicOrPrivateKey: string,
pxe: PXE,
recipient: AztecAddress,
amount: bigint,
log: Logger,
) {
const { l1ChainId } = await pxe.getNodeInfo();
const chain = createEthereumChain([l1RpcUrl], l1ChainId);
const chain = createEthereumChain(l1RpcUrls, l1ChainId);
const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);

const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/end-to-end/src/spartan/transfer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('token transfer test', () => {

let testWallets: TestWallets;
let PXE_URL: string;
let ETHEREUM_HOSTS: string;
let ETHEREUM_HOSTS: string[];
const forwardProcesses: ChildProcess[] = [];

afterAll(() => {
Expand All @@ -43,7 +43,7 @@ describe('token transfer test', () => {
containerPort: config.CONTAINER_ETHEREUM_PORT,
});
forwardProcesses.push(ethProcess);
ETHEREUM_HOSTS = `http://127.0.0.1:${ethPort}`;
ETHEREUM_HOSTS = [`http://127.0.0.1:${ethPort}`];

const { process: sequencerProcess, port: sequencerPort } = await startPortForward({
resource: `svc/${config.INSTANCE_NAME}-aztec-network-validator`,
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/epoch-cache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"get-port": "^7.1.0",
"jest-mock-extended": "^3.0.7",
"tslib": "^2.4.0",
"viem": "2.22.8",
"viem": "2.23.7",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/ethereum/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@viem/anvil": "^0.0.10",
"dotenv": "^16.0.3",
"tslib": "^2.4.0",
"viem": "2.22.8",
"viem": "2.23.7",
"zod": "^3.23.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/ethereum/src/l1_tx_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ describe('GasUtils', () => {
const account = privateKeyToAccount(`0x${privKey}`);

publicClient = createPublicClient({
transport: fallback([http(rpcUrl)]),
transport: fallback([...Array(1)].map(() => http(rpcUrl))),
chain: foundry,
});

walletClient = createWalletClient({
transport: fallback([http(rpcUrl)]),
transport: fallback([...Array(1)].map(() => http(rpcUrl))),
chain: foundry,
account,
});
Expand Down
Loading