Submit Fiat-Shamir (FE)

web/packages/api/src/toEthereumSnowbridgeV2.ts

@@ -240,19 +240,29 @@ export const estimateEthereumExecutionFee = async (
     options?: {
         contractCall?: ContractCall
         fillDeadlineBuffer?: bigint
+        accelerated?: boolean
     },
 ): Promise<bigint> => {
     const ethereum = await context.ethereum()
     const { tokenErcMetadata } = resolveInputs(registry, tokenAddress, sourceParaId)
 
-    // Calculate execution cost on ethereum
-    let ethereumChain = registry.ethereumChains[`ethereum_${registry.ethChainId}`]
-    let feeData = await ethereum.getFeeData()
-    let ethereumExecutionFee =
-        (feeData.gasPrice ?? 2_000_000_000n) *
-        ((tokenErcMetadata.deliveryGas ?? 80_000n) +
-            (ethereumChain.baseDeliveryGas ?? 120_000n) +
-            (options?.contractCall?.gas ?? 0n))
+    // Calculate execution cost on ethereum including:
+    // 1. the consensus update, which is the fiat-shamir submit (if accelerated) or two phase submit if not.
+    // 2. message verification, token delivery and the optional contract call.
+    const ethereumChain = registry.ethereumChains[`ethereum_${registry.ethChainId}`]
+    const feeData = await ethereum.getFeeData()
+    const gasPrice = feeData.gasPrice ?? 2_000_000_000n
+    const twoPhaseSubmitGas = ethereumChain.twoPhaseSubmitGas ?? 1_000_000n
+    const submitFiatShamirGas = options?.accelerated
+        ? (ethereumChain.submitFiatShamirGas ?? 2_200_000n)
+        : 0n
+    const consensusUpdateGas = options?.accelerated ? submitFiatShamirGas : twoPhaseSubmitGas
+    const messageVerificationGas = ethereumChain.baseDeliveryGas ?? 120_000n
+    const tokenDeliveryGas = tokenErcMetadata.deliveryGas ?? 200_000n
+    const contractCallGas = options?.contractCall?.gas ?? 0n
+    const totalGas =
+        consensusUpdateGas + messageVerificationGas + tokenDeliveryGas + contractCallGas
+    const ethereumExecutionFee = gasPrice * totalGas
     return ethereumExecutionFee
 }
 
@@ -270,6 +280,7 @@ export const estimateFeesFromAssetHub = async (
         l2PadFeeByPercentage?: bigint
         l2TransferGasLimit?: bigint
         fillDeadlineBuffer?: bigint
+        accelerated?: boolean
     },
     l2ChainId?: number,
     tokenAmount?: bigint,
@@ -391,6 +402,7 @@ export const estimateFeesFromParachains = async (
         defaultFee?: bigint
         feeTokenLocation?: any
         contractCall?: ContractCall
+        accelerated?: boolean
     },
 ): Promise<DeliveryFee> => {
     const sourceParachain = registry.parachains[`polkadot_${sourceParaId}`]

web/packages/api/src/transfers/toEthereum/erc20FromParachain.ts

@@ -42,6 +42,7 @@ export class ERC20FromParachain implements TransferInterface {
             feeTokenLocation?: any
             claimerLocation?: any
             contractCall?: ContractCall
+            accelerated?: boolean
         },
     ): Promise<DeliveryFee> {
         const { assetHub, parachain } =

web/packages/api/src/transfers/toEthereum/transferInterface.ts

@@ -14,6 +14,7 @@ export interface TransferInterface {
             feeTokenLocation?: any
             claimerLocation?: any
             contractCall?: ContractCall
+            accelerated?: boolean
         },
     ): Promise<DeliveryFee>
 

web/packages/base-types/src/index.ts

@@ -41,6 +41,10 @@ export type EthereumChain = ChainId & {
   xcTokenMap?: XC20TokenMap;
   // The gas cost of v2_submit excludes command execution, mainly covers the verification.
   baseDeliveryGas?: bigint;
+  // The gas cost of the two phase submit (submitInitial + commitPrevRandao + submitFinal)
+  twoPhaseSubmitGas?: bigint;
+  // The gas cost of submitFiatShamir
+  submitFiatShamirGas?: bigint;
 };
 
 export type ChainProperties = {

web/packages/registry/scripts/buildRegistry.ts

@@ -114,8 +114,7 @@ const SNOWBRIDGE_ENV: { [env: string]: Environment } = {
         assetHubParaId: 1000,
         bridgeHubParaId: 1002,
         v2_parachains: [1000],
-        indexerGraphQlUrl:
-            "https://subsquid.snowbridge.network/graphql",
+        indexerGraphQlUrl: "https://subsquid.snowbridge.network/graphql",
         kusama: {
             assetHubParaId: 1000,
             bridgeHubParaId: 1002,
@@ -972,8 +971,8 @@ async function indexEthChain(
                             ? foreignId
                             : undefined,
                     // LDO gas from https://etherscan.io/tx/0x4e984250beacf693e7407c6cfdcb51229f6a549aa857d601db868b572ee2364b
-                    // Other ERC20 token transfer on Ethereum typically ranges from 45,000 to 65,000 gas units; use 80_000 to leave a margin
-                    deliveryGas: asset.symbol == "LDO" ? 150_000n : 80_000n,
+                    // Other ERC20 token transfer on Ethereum typically ranges from 45,000 to 65,000 gas units; use 120_000 to leave a margin
+                    deliveryGas: asset.symbol == "LDO" ? 200_000n : 120_000n,
                 }
             }
             if (token in metadataOverrides) {
@@ -1002,6 +1001,8 @@ async function indexEthChain(
             assets,
             key: `ethereum_${networkChainId}`,
             baseDeliveryGas: 120_000n,
+            twoPhaseSubmitGas: 1_000_000n,
+            submitFiatShamirGas: 2_200_000n,
         }
     } else if (networkChainId in l2Chains) {
         const assets: ERC20MetadataMap = {}
@@ -1175,7 +1176,7 @@ async function getRegisteredPnas(
 }
 
 ;(async () => {
-    let env = "local_e2e"
+    let env = "polkadot_mainnet"
     if (process.env.NODE_ENV !== undefined) {
         env = process.env.NODE_ENV
     }