Merge pull request #10 from xdecentralix/merge/upstream-main-2025-08-18

Merge/upstream main 2025 08 18

Author: xdecentralix

Cargo.lock

@@ -3,7 +3,9 @@ use {crate::domain, chain::Chain, ethcontract::dyns::DynWeb3, primitive_types::H
 #[derive(Debug, Clone)]
 pub struct Contracts {
     settlement: contracts::GPv2Settlement,
+    signatures: contracts::support::Signatures,
     weth: contracts::WETH9,
+    balances: contracts::support::Balances,
     chainalysis_oracle: Option<contracts::ChainalysisOracle>,
     trampoline: contracts::HooksTrampoline,
 
@@ -17,7 +19,9 @@ pub struct Contracts {
 #[derive(Debug, Clone)]
 pub struct Addresses {
     pub settlement: Option<H160>,
+    pub signatures: Option<H160>,
     pub weth: Option<H160>,
+    pub balances: Option<H160>,
     pub trampoline: Option<H160>,
 }
 
@@ -37,11 +41,27 @@ impl Contracts {
             ),
         );
 
+        let signatures = contracts::support::Signatures::at(
+            web3,
+            address_for(
+                contracts::support::Signatures::raw_contract(),
+                addresses.signatures,
+            ),
+        );
+
         let weth = contracts::WETH9::at(
             web3,
             address_for(contracts::WETH9::raw_contract(), addresses.weth),
         );
 
+        let balances = contracts::support::Balances::at(
+            web3,
+            address_for(
+                contracts::support::Balances::raw_contract(),
+                addresses.balances,
+            ),
+        );
+
         let trampoline = contracts::HooksTrampoline::at(
             web3,
             address_for(
@@ -72,7 +92,9 @@ impl Contracts {
 
         Self {
             settlement,
+            signatures,
             weth,
+            balances,
             chainalysis_oracle,
             settlement_domain_separator,
             authenticator,
@@ -84,6 +106,14 @@ impl Contracts {
         &self.settlement
     }
 
+    pub fn balances(&self) -> &contracts::support::Balances {
+        &self.balances
+    }
+
+    pub fn signatures(&self) -> &contracts::support::Signatures {
+        &self.signatures
+    }
+
     pub fn trampoline(&self) -> &contracts::HooksTrampoline {
         &self.trampoline
     }

crates/autopilot/src/infra/blockchain/contracts.rs

@@ -194,7 +194,9 @@ pub async fn run(args: Arguments) {
     let url = ethrpc.url().clone();
     let contracts = infra::blockchain::contracts::Addresses {
         settlement: args.shared.settlement_contract_address,
+        signatures: args.shared.signatures_contract_address,
         weth: args.shared.native_token_address,
+        balances: args.shared.balances_contract_address,
         trampoline: args.shared.hooks_contract_address,
     };
     let eth = ethereum(
@@ -244,15 +246,17 @@ pub async fn run(args: Arguments) {
     let signature_validator = signature_validator::validator(
         &web3,
         signature_validator::Contracts {
-            settlement: eth.contracts().settlement().address(),
+            settlement: eth.contracts().settlement().clone(),
+            signatures: eth.contracts().signatures().clone(),
             vault_relayer,
         },
     );
 
     let balance_fetcher = account_balances::cached(
         &web3,
         account_balances::Contracts {
-            settlement: eth.contracts().settlement().address(),
+            settlement: eth.contracts().settlement().clone(),
+            balances: eth.contracts().balances().clone(),
             vault_relayer,
             vault: vault.as_ref().map(|contract| contract.address()),
         },

crates/autopilot/src/run.rs

@@ -23,6 +23,7 @@ pub enum Chain {
     Avalanche = 43114,
     Optimism = 10,
     Polygon = 137,
+    Lens = 232,
 }
 
 impl Chain {
@@ -47,6 +48,7 @@ impl Chain {
             Self::Avalanche => "Avalanche",
             Self::Optimism => "Optimism",
             Self::Polygon => "Polygon",
+            Self::Lens => "Lens",
         }
     }
 
@@ -60,7 +62,7 @@ impl Chain {
             | Self::Base
             | Self::Bnb
             | Self::Optimism => 10u128.pow(17).into(),
-            Self::Gnosis | Self::Avalanche => 10u128.pow(18).into(),
+            Self::Gnosis | Self::Avalanche | Self::Lens => 10u128.pow(18).into(),
             Self::Polygon => 10u128.pow(20).into(),
             Self::Hardhat => {
                 panic!("unsupported chain for default amount to estimate native prices with")
@@ -82,6 +84,7 @@ impl Chain {
             Self::Avalanche => Duration::from_millis(2_000),
             Self::Optimism => Duration::from_millis(2_000),
             Self::Polygon => Duration::from_millis(2_000),
+            Self::Lens => Duration::from_millis(2_000),
         }
     }
 
@@ -110,6 +113,7 @@ impl TryFrom<u64> for Chain {
             x if x == Self::Avalanche as u64 => Self::Avalanche,
             x if x == Self::Optimism as u64 => Self::Optimism,
             x if x == Self::Polygon as u64 => Self::Polygon,
+            x if x == Self::Lens as u64 => Self::Lens,
             _ => Err(ChainIdNotSupported)?,
         };
         Ok(network)

crates/chain/src/lib.rs

@@ -0,0 +1 @@
+{"abi":[{"inputs":[{"components":[{"internalType":"address","name":"tokenIn","type":"address"},{"internalType":"address","name":"tokenOut","type":"address"},{"internalType":"uint24","name":"fee","type":"uint24"},{"internalType":"address","name":"recipient","type":"address"},{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"uint256","name":"amountInMaximum","type":"uint256"},{"internalType":"uint160","name":"sqrtPriceLimitX96","type":"uint160"}],"internalType":"struct IV3SwapRouter.ExactOutputSingleParams","name":"params","type":"tuple"}],"name":"exactOutputSingle","outputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"}],"stateMutability":"payable","type":"function"}]}