Skip to content

Commit 96f4544

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/e2e-switch-from-london-to-cancun
2 parents 0a5ed66 + 3b9c1ff commit 96f4544

File tree

4 files changed

+29
-15
lines changed

4 files changed

+29
-15
lines changed

bridge-ui/src/components/header/header.module.scss

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22
margin-bottom: 0.625rem;
33
position: sticky;
44
top: 0.625rem;
5-
z-index: 2;
5+
z-index: 20;
66

77
&::before {
88
content: "";
99
background-color: var(--color-white);
1010
height: 100%;
1111
display: block;
1212
position: absolute;
13-
width: calc(100% + 2.125rem);
14-
left: -1.0625rem;
1513
bottom: 0;
1614
border-radius: 1.25rem;
1715
}
1816

1917
@include bp-max("tablet") {
2018
&::before {
2119
height: calc(100% + (0.625rem * var(--scroll-progress)));
22-
width: calc(100% + (2.125rem + 0.875rem * var(--scroll-progress)));
23-
left: calc(-1.0625rem - (var(--scroll-progress) * 0.4375rem));
20+
width: calc(100% + (1rem * var(--scroll-progress)));
21+
left: calc(var(--scroll-progress) * -0.5rem);
2422
border-radius: calc(1.25rem - (var(--scroll-progress) * 1.25rem));
2523
box-shadow: 0 calc(0.375rem * var(--scroll-progress)) calc(1rem * var(--scroll-progress))
2624
rgba(0, 0, 0, calc(0.1 * var(--scroll-progress)));
@@ -55,12 +53,7 @@
5553
background-color: var(--color-white);
5654
gap: 1.5rem;
5755

58-
width: calc(100% + 2.125rem);
59-
left: -1.0625rem;
60-
6156
@include bp("tablet") {
62-
width: unset;
63-
left: unset;
6457
padding: 1rem 1.875rem;
6558
}
6659
}

bridge-ui/src/components/layouts/layout.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.layout {
2-
padding: 0.625rem 1.5rem 0 1.5rem;
2+
padding: 0.625rem 0.5rem 0 0.5rem;
33

44
@include bp("tablet") {
55
padding: 1.5rem 1.5rem 0 1.5rem;

contracts/scripts/testEIP7702/sendType4Tx.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ class EIP7702TransactionSender {
2121
this.lineaEstimateGasClient = new LineaEstimateGasClient(new URL(rpcUrl), this.signer.address);
2222
}
2323

24-
async createAuthorization(targetContractAddress: string): Promise<Authorization> {
24+
// Create Authorization for process.env.PRIVATE_KEY
25+
async createAuthorizationForSelf(targetContractAddress: string): Promise<Authorization> {
2526
const network = await this.provider.getNetwork();
2627
const currentChainId = network.chainId;
2728

2829
const currentNonce = await this.provider.getTransactionCount(this.signer.address);
30+
// +1 required when same account is `to` and is an authorization signer
31+
// https://eips.ethereum.org/EIPS/eip-7702 - "The authorization list is processed before the execution portion of the transaction begins, but after the sender’s nonce is incremented."
2932
const authNonce = currentNonce + 1;
3033

3134
const authorization = await this.signer.authorize({
@@ -37,11 +40,29 @@ class EIP7702TransactionSender {
3740
return authorization;
3841
}
3942

40-
async sendNonSponsoredTransaction(targetERC20Address: string) {
43+
// Create Authorization for another private key
44+
async createAuthorizationForPrivateKey(targetContractAddress: string, privateKey: string): Promise<Authorization> {
45+
const network = await this.provider.getNetwork();
46+
const currentChainId = network.chainId;
47+
48+
const signer = new ethers.Wallet(privateKey, this.provider);
49+
const currentNonce = await this.provider.getTransactionCount(signer.address);
50+
const authNonce = currentNonce;
51+
52+
const authorization = await signer.authorize({
53+
address: targetContractAddress,
54+
nonce: authNonce,
55+
chainId: currentChainId,
56+
});
57+
console.log("Authorization created with nonce:", authorization.nonce);
58+
return authorization;
59+
}
60+
61+
async sendNonSponsoredTransaction(targetAddress: string) {
4162
console.log("\n=== TRANSACTION 1: NON-SPONSORED (ETH TRANSFERS) ===");
4263

4364
// Create authorization with incremented nonce for same-wallet transactions
44-
const authorization = await this.createAuthorization(targetERC20Address);
65+
const authorization = await this.createAuthorization(targetAddress);
4566

4667
const ABI = ["function initialize() external"];
4768

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ wiremock = "3.13.0"
2727
logcaptor = "2.11.0"
2828

2929
# Runtime
30-
arithmetization="beta-v4.0-rc6-CANCUN"
30+
arithmetization="beta-v4.0-rc7-CANCUN"
3131
besu = "25.8.0-linea1"
3232
blobCompressor = "2.0.0"
3333
blobShnarfCalculator = "1.2.0"

0 commit comments

Comments
 (0)