Merge branch 'main' into New_branch_for_corrections

.github/workflows/finalized-tag-updater-github-release.yml

@@ -1,11 +1,5 @@
 name: Github Release for Finalized-Tag-Updater Besu Plugin
 on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-
   workflow_dispatch:
     inputs:
       version:

.github/workflows/main.yml

@@ -19,7 +19,6 @@ jobs:
       prover: ${{ steps.filter.outputs.prover }}
       traces-api-facade: ${{ steps.filter.outputs.traces-api-facade }}
       transaction-exclusion-api: ${{ steps.filter.outputs.transaction-exclusion-api }}
-      finalized-tag-updater: ${{ steps.filter.outputs.finalized-tag-updater }}
       has-changes-requiring-build: ${{ steps.filter-out.outputs.has-changes-requiring-build }}
     steps:
       - name: Checkout
@@ -105,14 +104,6 @@ jobs:
               - 'build.gradle'
               - 'gradle.properties'
               - 'settings.gradle'
-            finalized-tag-updater:
-              - 'jvm-libs/linea/core/long-running-service/**'
-              - 'jvm-libs/linea/web3j-extensions/**'
-              - 'jvm-libs/extensions/kotlin/**'
-              - 'jvm-libs/extensions/futures/**'
-              - 'finalized-tag-updater/**'
-              - '.github/workflows/main.yml'
-              - '.github/workflows/finalized-tag-updater-github-release.yml'
       - name: Filter out commit changes
         uses: dorny/paths-filter@v3
         id: filter-out
@@ -174,15 +165,6 @@ jobs:
       transaction_exclusion_api_image_tagged: ${{ needs.check-and-tag-images.outputs.image_tagged_transaction_exclusion_api }}
     secrets: inherit
 
-  # Comment out the auto build and release step below as the plugin release should be
-  # by manual Github action for versioning control
-  # finalized-tag-updater-jar-build-release:
-  #   needs: [ filter-commit-changes ]
-  #   if: ${{ always() && needs.filter-commit-changes.outputs.finalized-tag-updater == 'true' }}
-  #   uses: ./.github/workflows/finalized-tag-updater-github-release.yml
-  #   with:
-  #     version: '0.0.1'
-
   testing:
     needs: [ store-image-name-and-tags, filter-commit-changes, check-and-tag-images ]
     if: ${{ always() && needs.filter-commit-changes.outputs.has-changes-requiring-build == 'true' }}

bridge-ui/package.json

@@ -22,10 +22,11 @@
   "dependencies": {
     "@consensys/linea-sdk": "0.3.0",
     "@headlessui/react": "2.1.9",
-    "@tanstack/react-query": "5.59.3",
+    "@tanstack/react-query": "5.62.16",
     "@wagmi/connectors": "5.1.15",
-    "@wagmi/core": "2.13.8",
-    "@web3modal/wagmi": "5.1.11",
+    "@wagmi/core": "2.16.3",
+    "@reown/appkit": "1.6.3",
+    "@reown/appkit-adapter-wagmi": "1.6.3",
     "clsx": "^2.1.1",
     "compare-versions": "6.1.1",
     "date-fns": "4.1.0",
@@ -44,8 +45,8 @@
     "sharp": "0.33.5",
     "swiper": "11.1.14",
     "tailwind-merge": "^2.5.3",
-    "viem": "2.21.19",
-    "wagmi": "2.12.17",
+    "viem": "2.22.4",
+    "wagmi": "2.14.6",
     "zustand": "4.5.4"
   },
   "devDependencies": {

bridge-ui/src/components/ConnectButton.tsx

@@ -1,4 +1,4 @@
-import { useWeb3Modal } from "@web3modal/wagmi/react";
+import { useAppKit } from "@reown/appkit/react";
 import { cn } from "@/utils/cn";
 import { Button } from "./ui";
 
@@ -7,7 +7,7 @@ type ConnectButtonProps = {
 };
 
 export default function ConnectButton({ fullWidth }: ConnectButtonProps) {
-  const { open } = useWeb3Modal();
+  const { open } = useAppKit();
   return (
     <Button
       id="wallet-connect-btn"

bridge-ui/src/config/wagmi.ts

@@ -1,45 +1,28 @@
-import { defaultWagmiConfig } from "@web3modal/wagmi/react/config";
-import { http, injected } from "@wagmi/core";
+import { http } from "@wagmi/core";
 import { mainnet, sepolia, linea, lineaSepolia } from "@wagmi/core/chains";
-import { walletConnect, coinbaseWallet } from "@wagmi/connectors";
 import { config } from "./config";
+import { WagmiAdapter } from "@reown/appkit-adapter-wagmi";
+import { AppKitNetwork } from "@reown/appkit/networks";
 
 if (!config.walletConnectId) throw new Error("Project ID is not defined");
 
-const metadata = {
-  name: "Linea Bridge",
-  description: `Linea Bridge is a bridge solution, providing secure and efficient cross-chain transactions between Layer 1 and Linea networks.
-  Discover the future of blockchain interaction with Linea Bridge.`,
-  url: "https://bridge.linea.build",
-  icons: [],
-};
+export const chains: [AppKitNetwork, ...AppKitNetwork[]] = [mainnet, sepolia, linea, lineaSepolia];
 
-const chains = [mainnet, sepolia, linea, lineaSepolia] as const;
-
-export const wagmiConfig = defaultWagmiConfig({
-  chains,
+export const wagmiAdapter = new WagmiAdapter({
+  networks: chains,
   projectId: config.walletConnectId,
-  metadata,
   multiInjectedProviderDiscovery: true,
   ssr: true,
-  enableEIP6963: true,
+
   batch: {
     multicall: true,
   },
-  connectors: [
-    walletConnect({
-      projectId: config.walletConnectId,
-      showQrModal: false,
-    }),
-    injected({ shimDisconnect: true }),
-    coinbaseWallet({
-      appName: "Linea Bridge",
-    }),
-  ],
   transports: {
     [mainnet.id]: http(`https://mainnet.infura.io/v3/${process.env.NEXT_PUBLIC_INFURA_ID}`, { batch: true }),
     [sepolia.id]: http(`https://sepolia.infura.io/v3/${process.env.NEXT_PUBLIC_INFURA_ID}`, { batch: true }),
     [linea.id]: http(`https://linea-mainnet.infura.io/v3/${process.env.NEXT_PUBLIC_INFURA_ID}`, { batch: true }),
     [lineaSepolia.id]: http(`https://linea-sepolia.infura.io/v3/${process.env.NEXT_PUBLIC_INFURA_ID}`, { batch: true }),
   },
 });
+
+export const wagmiConfig = wagmiAdapter.wagmiConfig;

bridge-ui/src/contexts/web3.context.tsx

@@ -2,15 +2,39 @@
 
 import { ReactNode } from "react";
 import { WagmiProvider } from "wagmi";
-import { createWeb3Modal } from "@web3modal/wagmi/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { config, wagmiConfig } from "@/config";
+import { createAppKit } from "@reown/appkit/react";
+import { chains, wagmiAdapter } from "@/config/wagmi";
 
 const queryClient = new QueryClient();
 
 if (!config.walletConnectId) throw new Error("Project ID is not defined");
 
-createWeb3Modal({ wagmiConfig, projectId: config.walletConnectId });
+const metadata = {
+  name: "Linea Bridge",
+  description: `The Linea Bridge is a bridge solution, providing secure and efficient cross-chain transactions between Ethereum Layer 1 and Linea networks.
+  Discover the future of blockchain interaction with Linea Bridge.`,
+  url: "https://bridge.linea.build",
+  icons: [],
+};
+
+createAppKit({
+  adapters: [wagmiAdapter],
+  networks: chains,
+  projectId: config.walletConnectId,
+  metadata,
+  features: {
+    analytics: true,
+    email: false,
+    socials: false,
+    swaps: false,
+    onramp: false,
+    history: false,
+  },
+  enableEIP6963: true,
+  coinbasePreference: "eoaOnly",
+});
 
 type Web3ProviderProps = {
   children: ReactNode;

contracts/.gitignore

@@ -5,6 +5,7 @@ coverage.json
 typechain
 typechain-types
 cache
+cache_forge
 build
 .openzeppelin
 

contracts/README.md

@@ -167,4 +167,4 @@ pnpm run test
 pnpm run test:reportgas
 
 pnpm run coverage
-```
+```

contracts/contracts/interfaces/l1/ILineaRollup.sol

@@ -67,7 +67,7 @@ interface ILineaRollup {
   }
 
   /**
-   * @notice Data stucture for compressed blob data submission.
+   * @notice Data structure for compressed blob data submission.
    * @dev submissionData The supporting data for blob data submission excluding the compressed data.
    * @dev dataEvaluationClaim The data evaluation claim.
    * @dev kzgCommitment The blob KZG commitment.

contracts/contracts/test-contracts/LineaRollupV5.sol

@@ -1404,7 +1404,7 @@ interface ILineaRollupV5 {
   }
 
   /**
-   * @notice Data stucture for compressed blob data submission.
+   * @notice Data structure for compressed blob data submission.
    * @dev submissionData The supporting data for blob data submission excluding the compressed data.
    * @dev dataEvaluationClaim The data evaluation claim.
    * @dev kzgCommitment The blob KZG commitment.

contracts/contracts/test-contracts/TestLineaRollup.sol

@@ -51,4 +51,8 @@ contract TestLineaRollup is LineaRollup {
   function setShnarfFinalBlockNumber(bytes32 _shnarf, uint256 _finalBlockNumber) external {
     blobShnarfExists[_shnarf] = _finalBlockNumber;
   }
+
+  function setLastFinalizedState(uint256 _messageNumber, bytes32 _rollingHash, uint256 _timestamp) external {
+    currentFinalizedState = _computeLastFinalizedState(_messageNumber, _rollingHash, _timestamp);
+  }
 }