merge

packages/bridge-ui/config/schemas/configuredCustomTokens.schema.json

@@ -30,6 +30,9 @@
       },
       "mintable": {
         "type": "boolean"
+      },
+      "wrapped": {
+        "type": "boolean"
       }
     },
     "required": ["name", "addresses", "symbol", "decimals", "type", "logoURI"]

packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ReviewStep/ReviewStep.svelte

@@ -9,6 +9,7 @@
   import { destNetwork as destChain, enteredAmount, selectedToken } from '$components/Bridge/state';
   import { PUBLIC_SLOW_L1_BRIDGING_WARNING } from '$env/static/public';
   import { LayerType } from '$libs/chain';
+  import { isWrapped, type Token } from '$libs/token';
   import { connectedSourceChain } from '$stores/network';
 
   export let hasEnoughEth: boolean = false;
@@ -21,6 +22,10 @@
 
   $: displayL1Warning = slowL1Warning && $destChain?.id && chainConfig[$destChain.id].type === LayerType.L1;
 
+  $: wrapped = $selectedToken !== null && isWrapped($selectedToken as Token);
+
+  $: wrappedAssetWarning = $t('bridge.alerts.wrapped_eth');
+
   const dispatch = createEventDispatcher();
 
   const editTransactionDetails = () => {
@@ -64,6 +69,11 @@
   <Alert type="warning">{$t('bridge.alerts.slow_bridging')}</Alert>
 {/if}
 
+{#if wrapped}
+  <!-- eslint-disable-next-line svelte/no-at-html-tags -->
+  <Alert type="warning">{@html wrappedAssetWarning}</Alert>
+{/if}
+
 <div class="h-sep" />
 <!-- 
 Recipient & Processing Fee

packages/bridge-ui/src/i18n/en.json

@@ -38,7 +38,8 @@
       "nft_scan_again": "Scan again"
     },
     "alerts": {
-      "slow_bridging": "Please note: Bridging to L1 will take around 24hrs!"
+      "slow_bridging": "Please note: Bridging to L1 will take around 24hrs!",
+      "wrapped_eth": "You are bridging wrapped ETH. Please be aware that un-wrapping will only work on the original chain of the token, <span class=\"font-bold\">NOT</span> on the destination."
     },
     "button": {
       "approve": "Approve",
@@ -361,10 +362,10 @@
     "transactions": "Transactions"
   },
   "paginator": {
-    "of": "of",
-    "page": "Page",
+    "everything_loaded": "Everything loaded",
     "more": "Fetch more...",
-    "everything_loaded": "Everything loaded"
+    "of": "of",
+    "page": "Page"
   },
   "paused_modal": {
     "description": "The bridge is currently not available. Follow our official communication channels for more information. ",

packages/bridge-ui/src/libs/token/tokens.ts

@@ -24,3 +24,7 @@ export const testNFT: Token[] = customToken.filter(
 );
 
 export const tokens = [ETHToken, ...testERC20Tokens];
+
+export const getTokensByType = (type: TokenType): Token[] => tokens.filter((token) => token.type === type);
+
+export const isWrapped = (token: Token): boolean => tokens.find((token) => token.wrapped === true) === token;

packages/bridge-ui/src/libs/token/types.ts

@@ -23,6 +23,7 @@ export type Token = {
   imported?: boolean;
   mintable?: boolean;
   balance?: bigint;
+  wrapped?: boolean;
 };
 
 export type NFT = Token & {

packages/protocol/contracts/L1/TaikoData.sol

@@ -163,7 +163,7 @@ library TaikoData {
         mapping(
             uint64 blockId_mod_blockRingBufferSize
                 => mapping(uint32 transitionId => TransitionState ts)
-        ) transitions;
+            ) transitions;
         // Ring buffer for Ether deposits
         bytes32 __reserve1;
         SlotA slotA; // slot 5

packages/protocol/script/DeployERC20Airdrop.s.sol

@@ -37,7 +37,7 @@ contract DeployERC20Airdrop is DeployCapability {
                 impl: address(new ERC20Airdrop()),
                 data: abi.encodeCall(
                     ERC20Airdrop.init, (address(0), 0, 0, bytes32(0), bridgedTko, vaultAddress)
-                )
+                    )
             })
         );
 

packages/protocol/script/DeployOnL1.s.sol

@@ -34,8 +34,8 @@ import { P256Verifier } from "p256-verifier/src/P256Verifier.sol";
 /// @notice This script deploys the core Taiko protocol smart contract on L1,
 /// initializing the rollup.
 contract DeployOnL1 is DeployCapability {
-    uint256 public constant NUM_MIN_MAJORITY_GUARDIANS = 7;
-    uint256 public constant NUM_MIN_MINORITY_GUARDIANS = 2;
+    uint256 public NUM_MIN_MAJORITY_GUARDIANS = vm.envUint("NUM_MIN_MAJORITY_GUARDIANS");
+    uint256 public NUM_MIN_MINORITY_GUARDIANS = vm.envUint("NUM_MIN_MINORITY_GUARDIANS");
 
     address public constant MAINNET_CONTRACT_OWNER = 0x9CBeE534B5D8a6280e01a14844Ee8aF350399C7F; // admin.taiko.eth
 
@@ -152,7 +152,7 @@ contract DeployOnL1 is DeployCapability {
                 impl: address(new TaikoToken()),
                 data: abi.encodeCall(
                     TaikoToken.init, (owner, vm.envAddress("TAIKO_TOKEN_PREMINT_RECIPIENT"))
-                ),
+                    ),
                 registerTo: sharedAddressManager
             });
         }
@@ -263,7 +263,7 @@ contract DeployOnL1 is DeployCapability {
                     vm.envBytes32("L2_GENESIS_HASH"),
                     vm.envBool("PAUSE_TAIKO_L1")
                 )
-            ),
+                ),
             registerTo: rollupAddressManager
         });
 
@@ -330,7 +330,7 @@ contract DeployOnL1 is DeployCapability {
             impl: automateDcapV3AttestationImpl,
             data: abi.encodeCall(
                 AutomataDcapV3Attestation.init, (owner, address(sigVerifyLib), address(pemCertChainLib))
-            ),
+                ),
             registerTo: rollupAddressManager
         });
 

packages/protocol/script/test_deploy_on_l1.sh

@@ -18,6 +18,8 @@ SHARED_ADDRESS_MANAGER=0x0000000000000000000000000000000000000000 \
 L2_GENESIS_HASH=0xee1950562d42f0da28bd4550d88886bc90894c77c9c9eaefef775d4c8223f259 \
 PAUSE_TAIKO_L1=true \
 PAUSE_BRIDGE=true \
+NUM_MIN_MAJORITY_GUARDIANS=7 \
+NUM_MIN_MINORITY_GUARDIANS=2 \
 TIER_PROVIDER="devnet" \
 forge script script/DeployOnL1.s.sol:DeployOnL1 \
     --fork-url http://localhost:8545 \

packages/protocol/test/L2/DelegateOwner.t.sol

@@ -46,7 +46,7 @@ contract TestDelegateOwner is TaikoTest {
                 impl: address(new DelegateOwner()),
                 data: abi.encodeCall(
                     DelegateOwner.init, (remoteOwner, address(addressManager), remoteChainId)
-                ),
+                    ),
                 registerTo: address(addressManager)
             })
         );

packages/protocol/test/L2/TaikoL2.t.sol

@@ -49,7 +49,7 @@ contract TestTaikoL2 is TaikoTest {
                     impl: address(new TaikoL2EIP1559Configurable()),
                     data: abi.encodeCall(
                         TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess)
-                    ),
+                        ),
                     registerTo: addressManager
                 })
             )

packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol

@@ -49,7 +49,7 @@ contract TestTaikoL2NoFeeCheck is TaikoTest {
                     impl: address(new SkipBasefeeCheckL2()),
                     data: abi.encodeCall(
                         TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess)
-                    ),
+                        ),
                     registerTo: addressManager
                 })
             )

packages/protocol/test/automata-attestation/common/AttestationBase.t.sol

@@ -61,7 +61,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils {
                 data: abi.encodeCall(
                     AutomataDcapV3Attestation.init,
                     (admin, address(sigVerifyLib), address(pemCertChainLib))
-                )
+                    )
             })
         );
 

packages/protocol/test/bridge/Bridge.t.sol

@@ -93,7 +93,7 @@ contract BridgeTest is TaikoTest {
                     impl: address(new DelegateOwner()),
                     data: abi.encodeCall(
                         DelegateOwner.init, (mockDAO, address(addressManager), l1ChainId)
-                    )
+                        )
                 })
             )
         );

packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol

@@ -102,7 +102,7 @@ contract TestERC20Airdrop is TaikoTest {
                 data: abi.encodeCall(
                     BridgedERC20.init,
                     (address(0), address(addressManager), randAddress(), 100, 18, "TKO", "Taiko Token")
-                )
+                    )
             })
         );
 
@@ -129,7 +129,7 @@ contract TestERC20Airdrop is TaikoTest {
                 data: abi.encodeCall(
                     ERC20Airdrop.init,
                     (address(0), claimStart, claimEnd, merkleRoot, address(token), address(vault))
-                )
+                    )
             })
         );
 

packages/protocol/test/tokenvault/BridgedERC20.t.sol

@@ -131,7 +131,7 @@ contract TestBridgedERC20 is TaikoTest {
                 data: abi.encodeCall(
                     BridgedERC20.init,
                     (owner, address(manager), srcToken, srcChainId, srcDecimals, name, name)
-                ),
+                    ),
                 registerTo: manager
             })
         );

packages/protocol/test/tokenvault/ERC20Vault.t.sol

@@ -177,7 +177,7 @@ contract TestERC20Vault is TaikoTest {
                 data: abi.encodeCall(
                     BridgedERC20.init,
                     (address(0), address(addressManager), randAddress(), 100, 18, "USDC", "USDC coin")
-                )
+                    )
             })
         );
 
@@ -188,7 +188,7 @@ contract TestERC20Vault is TaikoTest {
                 data: abi.encodeCall(
                     BridgedERC20.init,
                     (address(0), address(addressManager), randAddress(), 100, 18, "USDT", "USDT coin")
-                )
+                    )
             })
         );
 
@@ -207,7 +207,7 @@ contract TestERC20Vault is TaikoTest {
                         "stETH",
                         "Lido Staked ETH"
                     )
-                )
+                    )
             })
         );
         vm.stopPrank();

packages/protocol/test/verifiers/RiscZeroVerifier.t.sol

@@ -48,7 +48,7 @@ contract TestRiscZeroVerifier is TaikoL1TestBase {
                 data: abi.encodeCall(
                     RiscZeroVerifier.init,
                     (address(0), address(addressManager), address(riscZeroRemoteVerifier))
-                )
+                    )
             })
         );