change mempool validation function

go/enclave/nodetype/validator.go

@@ -109,6 +109,10 @@ func (val *obsValidator) ExecuteStoredBatches() error {
 				return fmt.Errorf("could not store executed batch %s. Cause: %w", batch.Hash(), err)
 			}
 			val.batchRegistry.OnBatchExecuted(batch, receipts)
+			err = val.mempool.Chain.IngestNewBlock(batch)
+			if err != nil {
+				return fmt.Errorf("unable to remove ingest new block into eth blockchain - %w", err)
+			}
 		}
 	}
 	return nil

go/enclave/txpool/txpool.go

@@ -25,7 +25,7 @@ type TxPool struct {
 	txPoolConfig legacypool.Config
 	legacyPool   *legacypool.LegacyPool
 	pool         *gethtxpool.TxPool
-	blockchain   *ethchainadapter.EthChainAdapter
+	Chain        *ethchainadapter.EthChainAdapter
 	gasTip       *big.Int
 	running      bool
 	logger       gethlog.Logger
@@ -37,7 +37,7 @@ func NewTxPool(blockchain *ethchainadapter.EthChainAdapter, gasTip *big.Int, log
 	legacyPool := legacypool.New(txPoolConfig, blockchain)
 
 	return &TxPool{
-		blockchain:   blockchain,
+		Chain:        blockchain,
 		txPoolConfig: txPoolConfig,
 		legacyPool:   legacyPool,
 		gasTip:       gasTip,
@@ -52,7 +52,7 @@ func (t *TxPool) Start() error {
 		return fmt.Errorf("tx pool already started")
 	}
 
-	memp, err := gethtxpool.New(t.gasTip, t.blockchain, []gethtxpool.SubPool{t.legacyPool})
+	memp, err := gethtxpool.New(t.gasTip, t.Chain, []gethtxpool.SubPool{t.legacyPool})
 	if err != nil {
 		return fmt.Errorf("unable to init geth tx pool - %w", err)
 	}
@@ -85,9 +85,19 @@ func (t *TxPool) Add(transaction *common.L2Tx) error {
 //go:linkname validateTxBasics github.com/ethereum/go-ethereum/core/txpool/legacypool.(*LegacyPool).validateTxBasics
 func validateTxBasics(_ *legacypool.LegacyPool, _ *types.Transaction, _ bool) error
 
+//go:linkname validateTx github.com/ethereum/go-ethereum/core/txpool/legacypool.(*LegacyPool).validateTx
+func validateTx(_ *legacypool.LegacyPool, _ *types.Transaction, _ bool) error
+
 // Validate - run the underlying tx pool validation logic
 func (t *TxPool) Validate(tx *common.L2Tx) error {
-	return validateTxBasics(t.legacyPool, tx, false)
+	// validate against the consensus rules
+	err := validateTxBasics(t.legacyPool, tx, false)
+	if err != nil {
+		return err
+	}
+
+	// validate against the state. Things like nonce, balance, etc
+	return validateTx(t.legacyPool, tx, false)
 }
 
 func (t *TxPool) Running() bool {

integration/common/utils.go

@@ -99,6 +99,7 @@ func PrefundWallets(ctx context.Context, faucetWallet wallet.Wallet, faucetClien
 	txHashes := make([]gethcommon.Hash, len(wallets))
 	for idx, w := range wallets {
 		destAddr := w.Address()
+		fmt.Printf("L2 prefund: %s\n", destAddr.Hex())
 		txData := &types.LegacyTx{
 			Nonce:    startingNonce + uint64(idx),
 			Value:    alloc,

integration/constants.go

@@ -13,8 +13,8 @@ const (
 	StartPortWalletExtensionUnitTest = 38000
 	StartPortFaucetUnitTest          = 42000
 	StartPortFaucetHTTPUnitTest      = 48000
-	StartPortTenscanUnitTest         = 52000
-	StartPortTenGatewayUnitTest      = 56000
+	StartPortTenscanUnitTest         = 12000
+	StartPortTenGatewayUnitTest      = 16000
 
 	DefaultGethWSPortOffset         = 100
 	DefaultGethAUTHPortOffset       = 200

integration/simulation/simulation.go

@@ -61,9 +61,12 @@ func (s *Simulation) Start() {
 	s.bridgeFundingToObscuro()
 	s.trackLogs()              // Create log subscriptions, to validate that they're working correctly later.
 	s.prefundObscuroAccounts() // Prefund every L2 wallet
-	s.deployObscuroERC20s()    // Deploy the Obscuro HOC and POC ERC20 contracts
-	s.prefundL1Accounts()      // Prefund every L1 wallet
-	s.checkHealthStatus()      // Checks the nodes health status
+
+	// wait for the validator to become up to date
+	time.Sleep(1 * time.Second)
+	s.deployObscuroERC20s() // Deploy the Obscuro HOC and POC ERC20 contracts
+	s.prefundL1Accounts()   // Prefund every L1 wallet
+	s.checkHealthStatus()   // Checks the nodes health status
 
 	timer := time.Now()
 	fmt.Printf("Starting injection\n")
@@ -229,6 +232,7 @@ func (s *Simulation) deployObscuroERC20s() {
 			// 0x526c84529b2b8c11f57d93d3f5537aca3aecef9b - this is the address of the L2 contract which is currently hardcoded.
 			contractBytes := erc20contract.L2BytecodeWithDefaultSupply(string(token), gethcommon.HexToAddress("0x526c84529b2b8c11f57d93d3f5537aca3aecef9b"))
 
+			fmt.Printf("Deploy contract from: %s\n", owner.Address().Hex())
 			deployContractTxData := types.DynamicFeeTx{
 				Nonce:     NextNonce(s.ctx, s.RPCHandles, owner),
 				Gas:       5_000_000,
@@ -243,12 +247,13 @@ func (s *Simulation) deployObscuroERC20s() {
 				panic(err)
 			}
 
-			err = s.RPCHandles.ObscuroWalletRndClient(owner).SendTransaction(s.ctx, signedTx)
+			rpc := s.RPCHandles.ObscuroWalletClient(owner.Address(), 1)
+			err = rpc.SendTransaction(s.ctx, signedTx)
 			if err != nil {
 				panic(err)
 			}
 
-			err = testcommon.AwaitReceipt(s.ctx, s.RPCHandles.ObscuroWalletRndClient(owner), signedTx.Hash(), s.Params.ReceiptTimeout)
+			err = testcommon.AwaitReceipt(s.ctx, rpc, signedTx.Hash(), s.Params.ReceiptTimeout)
 			if err != nil {
 				panic(fmt.Sprintf("ERC20 deployment transaction unsuccessful. Cause: %s", err))
 			}