fixing build errors after rebase

Author: Raunaque97

packages/sequencer/src/settlement/BridgingModule.ts

@@ -246,7 +246,6 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
         sender: feepayer,
         nonce: nonce,
         memo: `Deploy token bridge for ${truncate(tokenId.toString(), { length: 6 })}`,
-        fee: this.feeStrategy.getFee(),
       },
       async () => {
         AccountUpdate.fundNewAccount(feepayer, 1);

packages/sequencer/src/settlement/SettlementModule.ts

@@ -7,16 +7,7 @@ import {
   ContractArgsRegistry,
   SettlementContractArgs,
 } from "@proto-kit/protocol";
-import {
-  AccountUpdate,
-  fetchAccount,
-  Field,
-  Mina,
-  PublicKey,
-  SmartContract,
-  TokenContract,
-  TokenId,
-} from "o1js";
+import { fetchAccount, Field, Mina, PublicKey, SmartContract } from "o1js";
 import { inject } from "tsyringe";
 import {
   EventEmitter,
@@ -35,6 +26,7 @@ import type { MinaBaseLayer } from "../protocol/baselayer/MinaBaseLayer";
 import { Batch, SettleableBatch } from "../storage/model/Batch";
 import { Settlement } from "../storage/model/Settlement";
 import { SettlementStorage } from "../storage/repositories/SettlementStorage";
+import { FeeStrategy } from "../protocol/baselayer/fees/FeeStrategy";
 
 import { SettlementUtils } from "./utils/SettlementUtils";
 import type { BridgingModule } from "./BridgingModule";
@@ -47,7 +39,7 @@ import {
   AddressRegistry,
   InMemoryAddressRegistry,
 } from "./interactions/AddressRegistry";
-import { FeeStrategy } from "../protocol/baselayer/fees/FeeStrategy";
+import { DefaultL1TransactionRetryStrategy } from "./transactions/DefaultL1TransactionRetryStrategy";
 
 export type SettlementModuleConfig = {
   addresses?: {

packages/sequencer/src/settlement/interactions/bridging/BridgingSettlementInteraction.ts

@@ -112,15 +112,15 @@ export class BridgingSettlementInteraction implements SettleInteraction {
       signingWithSignatureCheck: this.signer.getContractAddresses(),
     });
 
-    const { hash: transactionHash } =
+    const { transactionId } =
       await this.transactionSender.proveAndSendTransaction(tx, "included");
 
     log.info("Settlement transaction sent and included");
 
     return {
       batches: [batch.height],
       promisedMessagesHash: latestSequenceStateHash.toString(),
-      transactionHash,
+      transactionId,
     };
   }
 }

packages/sequencer/src/settlement/interactions/vanilla/VanillaSettlementInteraction.ts

@@ -104,15 +104,15 @@ export class VanillaSettlementInteraction implements SettleInteraction {
       signingWithSignatureCheck: this.signer.getContractAddresses(),
     });
 
-    const { hash: transactionHash } =
+    const { transactionId } =
       await this.transactionSender.proveAndSendTransaction(tx, "included");
 
     log.info("Settlement transaction sent and included");
 
     return {
       batches: [batch.height],
       promisedMessagesHash: latestSequenceStateHash.toString(),
-      transactionHash,
+      transactionId,
     };
   }
 }