estimate gas for SubmitOriginalData (#63)

disperser/batcher/transactor/transactor.go

@@ -31,12 +31,19 @@ func (t *Transactor) SubmitLogEntry(daContract *contract.DAContract, dataRoots [
 	defer t.mu.Unlock()
 
 	// Append log on blockchain
-	var txHash eth_common.Hash
+	var tx *types.Transaction
 	var err error
-	if txHash, _, err = daContract.SubmitOriginalData(dataRoots, false); err != nil {
+	if tx, _, err = daContract.SubmitOriginalData(dataRoots, false, 0); err != nil {
+		t.logger.Debug("[transactor] estimate SubmitLogEntry tx failed")
+		return eth_common.Hash{}, errors.WithMessage(err, "Failed to estimate SubmitLogEntry tx")
+	}
+
+	gasLimit := tx.Gas() + tx.Gas()/20
+	if tx, _, err = daContract.SubmitOriginalData(dataRoots, false, gasLimit); err != nil {
 		return eth_common.Hash{}, errors.WithMessage(err, "Failed to submit log entry")
 	}
-	return txHash, nil
+
+	return tx.Hash(), nil
 }
 
 func (t *Transactor) BatchUpload(daContract *contract.DAContract, dataRoots []eth_common.Hash) (eth_common.Hash, error) {
@@ -67,7 +74,7 @@ func (t *Transactor) SubmitVerifiedCommitRoots(daContract *contract.DAContract,
 			return eth_common.Hash{}, errors.WithMessage(err, "Failed to estimate SubmitVerifiedCommitRoots")
 		}
 
-		gasLimit = tx.Gas()
+		gasLimit = tx.Gas() + tx.Gas()/20
 		t.logger.Info("[transactor] estimate gas", "gas limit", tx.Gas())
 	} else {
 		gasLimit = t.gasLimit

disperser/contract/contract.go

@@ -115,39 +115,45 @@ func (c *DAContract) SubmitVerifiedCommitRoots(submissions []da_entrance.IDAEntr
 	return tx, nil, nil
 }
 
-func (c *DAContract) SubmitOriginalData(dataRoots []eth_common.Hash, waitForReceipt bool) (eth_common.Hash, *types.Receipt, error) {
+func (c *DAContract) SubmitOriginalData(dataRoots []eth_common.Hash, waitForReceipt bool, gasLimit uint64) (*types.Transaction, *types.Receipt, error) {
 	params := make([][32]byte, len(dataRoots))
 	for i, dataRoot := range dataRoots {
 		params[i] = dataRoot
 	}
 
 	blobPrice, err := c.BlobPrice(nil)
 	if err != nil {
-		return eth_common.Hash{}, nil, errors.WithMessage(err, "Failed to get blob price")
+		return nil, nil, errors.WithMessage(err, "Failed to get blob price")
 	}
 
 	// Submit log entry to smart contract.
 	opts, err := c.CreateTransactOpts()
 	if err != nil {
-		return eth_common.Hash{}, nil, errors.WithMessage(err, "Failed to create opts to send transaction")
+		return nil, nil, errors.WithMessage(err, "Failed to create opts to send transaction")
 	}
 
 	opts.Value = new(big.Int)
 	txValue := new(big.Int).SetUint64(uint64(len(dataRoots)))
 	opts.Value.Mul(blobPrice, txValue)
 
+	if gasLimit == 0 {
+		opts.NoSend = true
+	} else {
+		opts.GasLimit = gasLimit
+	}
+
 	tx, err := c.DAEntrance.SubmitOriginalData(opts, params)
 
 	if err != nil {
-		return eth_common.Hash{}, nil, errors.WithMessage(err, "Failed to send transaction to submit original data")
+		return nil, nil, errors.WithMessage(err, "Failed to send transaction to submit original data")
 	}
 
 	if waitForReceipt {
 		// Wait for successful execution
 		receipt, err := c.WaitForReceipt(tx.Hash(), true)
-		return tx.Hash(), receipt, err
+		return tx, receipt, err
 	}
-	return tx.Hash(), nil, nil
+	return tx, nil, nil
 }
 
 func (c *DAContract) CreateTransactOpts() (*bind.TransactOpts, error) {