Fixes for empty messages - Work in progress.

go/enclave/nodetype/sequencer.go

@@ -190,12 +190,12 @@ func (s *sequencer) createGenesisBatch(ctx context.Context, block *common.L1Bloc
 	}
 
 	if len(cb.Receipts) == 0 || cb.Receipts[0].TxHash.Hex() != msgBusTx.Hash().Hex() {
-		err = fmt.Errorf("message Bus contract not minted - no receipts in batch")
+		err = fmt.Errorf("MessageBus contract not created - no receipts in batch")
 		s.logger.Error(err.Error())
 		return err
 	}
 
-	s.logger.Info("Message Bus Contract minted successfully", "address", cb.Receipts[0].ContractAddress.Hex())
+	s.logger.Info("MessageBus Contract created successfully", "address", cb.Receipts[0].ContractAddress.Hex())
 
 	return nil
 }

integration/erc20contract/ObsERC20.sol

@@ -27,7 +27,7 @@ interface IMessageBus {
 // where access to data has to be restricted.
 contract ObsERC20 is ERC20 {
 
-    address bridge = 0xdeB34A740ECa1eC42C8b8204CBEC0bA34FDD27f3;
+    address bridge = 0x0a0Aaf0A52a9FDD0b034fe9031A4880dBDC1c480;
 
     IMessageBus bus;
 

integration/simulation/transaction_injector.go

@@ -149,6 +149,11 @@ func (ti *TransactionInjector) Start() {
 		return nil
 	})
 
+	wg.Go(func() error {
+		ti.issueRandomL2toL1Messages()
+		return nil
+	})
+
 	wg.Go(func() error {
 		ti.issueRandomValueTransfers()
 		return nil
@@ -236,14 +241,35 @@ func (ti *TransactionInjector) issueRandomTransfers() {
 		if err != nil {
 			ti.logger.Info("Failed to issue transfer via RPC.", log.ErrKey, err)
 		}
-
 		// todo (@pedro) - retrieve receipt
 
 		go ti.TxTracker.trackTransferL2Tx(signedTx)
 		sleepRndBtw(ti.avgBlockDuration/100, ti.avgBlockDuration/20)
 	}
 }
 
+func (ti *TransactionInjector) issueRandomL2toL1Messages() {
+	for txCounter := 0; ti.shouldKeepIssuing(txCounter); txCounter++ {
+		fromWallet := ti.rndObsWallet()
+		toWallet := gethcommon.HexToAddress("0x0a0Aaf0A52a9FDD0b034fe9031A4880dBDC1c480")
+		obscuroClient := ti.rpcHandles.ObscuroWalletRndClient(fromWallet)
+
+		tx := ti.newObscuroTransferTx(fromWallet, toWallet, testcommon.RndBtw(1, 500), testcommon.HOC)
+		tx = obscuroClient.EstimateGasAndGasPrice(tx)
+		signedTx, err := fromWallet.SignTransaction(tx)
+		if err != nil {
+			panic(err)
+		}
+
+		err = obscuroClient.SendTransaction(ti.ctx, signedTx)
+		if err != nil {
+			ti.logger.Info("Failed to issue transfer via RPC.", log.ErrKey, err)
+		}
+
+		sleepRndBtw(ti.avgBlockDuration/100, ti.avgBlockDuration/20)
+	}
+}
+
 func (ti *TransactionInjector) bridgeRandomGasTransfers() {
 	gasWallet := ti.wallets.GasBridgeWallet
 
@@ -315,6 +341,7 @@ func (ti *TransactionInjector) issueRandomDeposits() {
 		} else {
 			go ti.TxTracker.trackTransferL2Tx(signedTx)
 		}
+
 		// todo (@pedro) - retrieve receipt
 
 		sleepRndBtw(ti.avgBlockDuration/3, ti.avgBlockDuration)

integration/simulation/validate_chain.go

@@ -384,10 +384,11 @@
 
 	totalSuccessfullyWithdrawn := extractWithdrawals(t, obscuroClient, nodeIdx)
 
+	/* -- this doesn't work anymore; gas bridging has replaced it.
 	totalAmountLogged := getLoggedWithdrawals(minObscuroHeight, obscuroClient, headBatchHeader)
 	if totalAmountLogged.Cmp(totalSuccessfullyWithdrawn) != 0 {
 		t.Errorf("Node %d: Logged withdrawals do not match!", nodeIdx)
-	}
+	} */
 
 	injectorDepositedAmt := big.NewInt(0)
 	for _, tx := range s.TxInjector.TxTracker.GetL1Transactions() {
@@ -440,7 +441,7 @@
 	}
 }
 
 func getLoggedWithdrawals(minObscuroHeight uint64, obscuroClient *obsclient.ObsClient, currentHeader *common.BatchHeader) *big.Int {
 	totalAmountLogged := big.NewInt(0)
 	for i := minObscuroHeight; i < currentHeader.Number.Uint64(); i++ {
 		header, err := obscuroClient.GetBatchHeaderByNumber(big.NewInt(int64(i)))