using signProveAndSendTransaction in place of proveAndSendTransaction

Author: Raunaque97

packages/sequencer/src/protocol/baselayer/network-utils/LightnetUtils.ts

@@ -105,7 +105,11 @@ export class LightnetUtils implements MinaNetworkUtils {
 
     tx.sign([faucetDonor]);
 
-    await this.transactionSender.proveAndSendTransaction(tx, "included");
+    await this.transactionSender.signProveAndSendTransaction(
+      tx,
+      [faucetDonorPublicKey],
+      "included"
+    );
 
     log.provable.info(
       `Funded account ${receiver.toBase58()} with ${fundingAmount / 1e9} MINA`

packages/sequencer/src/protocol/baselayer/network-utils/LocalBlockchainUtils.ts

@@ -87,7 +87,11 @@ export class LocalBlockchainUtils implements MinaNetworkUtils {
 
     tx.sign([faucetDonor]);
 
-    await this.transactionSender.proveAndSendTransaction(tx, "included");
+    await this.transactionSender.signProveAndSendTransaction(
+      tx,
+      [faucetDonorPublicKey],
+      "included"
+    );
 
     log.provable.info(
       `Funded account ${receiver.toBase58()} with ${fundingAmount / 1e9} MINA`

packages/sequencer/src/settlement/BridgingModule.ts

@@ -268,7 +268,14 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
       signingPublicKeys: [contractKey],
     });
 
-    await this.transactionSender.proveAndSendTransaction(txSigned, "included");
+    await this.transactionSender.signProveAndSendTransaction(
+      txSigned,
+      [
+        ...this.signer.getContractAddresses(),
+        ...(owner ? [owner.address] : []),
+      ],
+      "included"
+    );
   }
 
   public async getBridgeAddress(
@@ -520,8 +527,9 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
         signingWithSignatureCheck: options.contractKeys,
       });
 
-      await this.transactionSender.proveAndSendTransaction(
+      await this.transactionSender.signProveAndSendTransaction(
         signedTx,
+        options.contractKeys,
         "included"
       );
 
@@ -654,8 +662,9 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
         signingWithSignatureCheck: [...options.contractKeys],
       });
 
-      await this.transactionSender.proveAndSendTransaction(
+      await this.transactionSender.signProveAndSendTransaction(
         signedTx,
+        options.contractKeys,
         "included"
       );
 

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

@@ -118,7 +118,11 @@ export class BridgingDeployInteraction implements DeployInteraction {
       signingWithSignatureCheck: [...this.signer.getContractAddresses()],
     });
 
-    await this.transactionSender.proveAndSendTransaction(tx, "included");
+    await this.transactionSender.signProveAndSendTransaction(
+      tx,
+      [...this.signer.getContractAddresses()],
+      "included"
+    );
 
     this.addressRegistry.addContractAddress(
       "SettlementContract",

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

@@ -113,7 +113,11 @@ export class BridgingSettlementInteraction implements SettleInteraction {
     });
 
     const { transactionId } =
-      await this.transactionSender.proveAndSendTransaction(tx, "included");
+      await this.transactionSender.signProveAndSendTransaction(
+        tx,
+        this.signer.getContractAddresses(),
+        "included"
+      );
 
     log.info("Settlement transaction sent and included");
 

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

@@ -107,7 +107,11 @@ export class VanillaDeployInteraction implements DeployInteraction {
       signingWithSignatureCheck: [...this.signer.getContractAddresses()],
     });
 
-    await this.transactionSender.proveAndSendTransaction(tx, "included");
+    await this.transactionSender.signProveAndSendTransaction(
+      tx,
+      this.signer.getContractAddresses(),
+      "included"
+    );
 
     this.addressRegistry.addContractAddress(
       "SettlementContract",

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

@@ -105,7 +105,11 @@ export class VanillaSettlementInteraction implements SettleInteraction {
     });
 
     const { transactionId } =
-      await this.transactionSender.proveAndSendTransaction(tx, "included");
+      await this.transactionSender.signProveAndSendTransaction(
+        tx,
+        this.signer.getContractAddresses(),
+        "included"
+      );
 
     log.info("Settlement transaction sent and included");
 

packages/sequencer/src/settlement/transactions/L1TransactionDispatcher.ts

@@ -7,11 +7,11 @@ import {
   PendingL1TransactionStorage,
 } from "../../storage/repositories/PendingL1TransactionStorage";
 import { MinaSigner } from "../MinaSigner";
+import type { MinaBaseLayer } from "../../protocol/baselayer/MinaBaseLayer";
 
 import { L1TransactionRetryStrategy } from "./L1TransactionRetryStrategy";
 import { TxStatusWaiter } from "./TxStatusWaiter";
 import { checkZkappTransactionStatus } from "./ZkappTransactionStatus";
-import { MinaBaseLayer } from "../../protocol/baselayer/MinaBaseLayer";
 
 export interface DispatcherConfig {
   pollIntervalMs?: number;
@@ -38,7 +38,7 @@ export class L1TransactionDispatcher {
     private readonly waiter: TxStatusWaiter,
     @inject("L1TransactionDispatcherConfig")
     private readonly config: Required<DispatcherConfig>,
-    @inject("MinaBaseLayer")
+    @inject("BaseLayer")
     private readonly baseLayer: MinaBaseLayer
   ) {}
 
@@ -184,7 +184,7 @@ export class L1TransactionDispatcher {
     }
 
     // don't check status on local chain
-    if (!this.baseLayer.isLocalBlockChain()) {
+    if (this.baseLayer.isLocalBlockChain()) {
       await this.pendingStorage.update(record.id, {
         status: "included",
       });