retry submission forever for valid messages

Author: joshklop

op-acceptance-tests/tests/interop/loadtest/helpers.go

@@ -21,6 +21,10 @@ func (n *nonceCounter) Next() uint64 {
 	return nonce
 }
 
-func retryForever(g txplan.ReceiptGetter) txplan.Option {
+func retryInclusionForever(g txplan.ReceiptGetter) txplan.Option {
 	return txplan.WithRetryInclusion(g, math.MaxInt, retry.Exponential())
 }
+
+func retrySubmissionForever(s txplan.TransactionSubmitter) txplan.Option {
+	return txplan.WithRetrySubmission(s, math.MaxInt, retry.Exponential())
+}

op-acceptance-tests/tests/interop/loadtest/initiator.go

@@ -87,7 +87,12 @@ func (lin *LargeMsgInitiator) Initiate(t devtest.T) []types.Message {
 }
 
 func buildAndSendInitTx(t devtest.T, eoa *dsl.EOA, el *dsl.L2ELNode, initCall txintent.Call, opts ...txplan.Option) []types.Message {
-	initMsgsTx := txintent.NewIntent[txintent.Call, *txintent.InteropOutput](eoa.Plan(), retryForever(el.Escape().EthClient()), txplan.Combine(opts...))
+	initMsgsTx := txintent.NewIntent[txintent.Call, *txintent.InteropOutput](
+		eoa.Plan(),
+		retrySubmissionForever(el.Escape().EthClient()),
+		retryInclusionForever(el.Escape().EthClient()),
+		txplan.Combine(opts...),
+	)
 	initMsgsTx.Content.Set(initCall)
 	_, err := initMsgsTx.PlannedTx.Success.Eval(t.Ctx())
 	t.Require().NoError(err)

op-acceptance-tests/tests/interop/loadtest/relayer.go

@@ -40,7 +40,14 @@ func NewValidRelayer(funder *dsl.Funder, el *dsl.L2ELNode, supervisor *dsl.Super
 }
 
 func (e *ValidRelayer) Relay(t devtest.T, msgs []types.Message) {
-	tx := buildRelayTx(e.eoa, e.el, msgs, retryForever(e.el.Escape().EthClient()), txplan.WithStaticNonce(e.counter.Next()))
+	tx := buildRelayTx(
+		e.eoa,
+		e.el,
+		msgs,
+		retrySubmissionForever(e.el.Escape().EthClient()),
+		retryInclusionForever(e.el.Escape().EthClient()),
+		txplan.WithStaticNonce(e.counter.Next()),
+	)
 	receipt, err := tx.Included.Eval(t.Ctx())
 	t.Require().NoError(err)
 	_, err = tx.Success.Eval(t.Ctx())

op-service/txplan/txplan.go

@@ -225,6 +225,17 @@ func WithTransactionSubmitter(cl TransactionSubmitter) Option {
 	}
 }
 
+func WithRetrySubmission(cl TransactionSubmitter, maxAttempts int, strategy retry.Strategy) Option {
+	return func(tx *PlannedTx) {
+		tx.Submitted.DependOn(&tx.Signed)
+		tx.Submitted.Fn(func(ctx context.Context) (struct{}, error) {
+			return struct{}{}, retry.Do0(ctx, maxAttempts, strategy, func() error {
+				return cl.SendTransaction(ctx, tx.Signed.Value())
+			})
+		})
+	}
+}
+
 type ReceiptGetter interface {
 	TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
 }