From e1edccb342a087420ba263a374e9559fd7b0afa6 Mon Sep 17 00:00:00 2001 From: Harry Kalodner Date: Mon, 8 Apr 2024 12:05:04 -0400 Subject: [PATCH 1/2] Fix license link in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a522be82f..a07772628b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Arbitrum One successfully migrated from the Classic Arbitrum stack onto Nitro on ## License -Nitro is currently licensed under a [Business Source License](./LICENSE), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains. +Nitro is currently licensed under a [Business Source License](./LICENSE.md), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains. The Additional Use Grant also permits the deployment of the Nitro software, in a permissionless fashion and without cost, as a new blockchain provided that the chain settles to either Arbitrum One or Arbitrum Nova. From 3abce8775b1862abadca076d9c4b3f1b9d83abca Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Tue, 9 Apr 2024 10:44:07 -0500 Subject: [PATCH 2/2] Fix data poster noop storage check in batch poster --- arbnode/batch_poster.go | 2 +- arbnode/dataposter/data_poster.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arbnode/batch_poster.go b/arbnode/batch_poster.go index 32b6175108..ec4907688d 100644 --- a/arbnode/batch_poster.go +++ b/arbnode/batch_poster.go @@ -491,7 +491,7 @@ func (b *BatchPoster) checkReverts(ctx context.Context, to int64) (bool, error) return false, fmt.Errorf("getting a receipt for transaction: %v, %w", tx.Hash, err) } if r.Status == types.ReceiptStatusFailed { - shouldHalt := !b.config().DataPoster.UseNoOpStorage + shouldHalt := !b.dataPoster.UsingNoOpStorage() logLevel := log.Warn if shouldHalt { logLevel = log.Error diff --git a/arbnode/dataposter/data_poster.go b/arbnode/dataposter/data_poster.go index 416ebf7253..96fbe96275 100644 --- a/arbnode/dataposter/data_poster.go +++ b/arbnode/dataposter/data_poster.go @@ -304,6 +304,10 @@ func (p *DataPoster) MaxMempoolTransactions() uint64 { return arbmath.MinInt(config.MaxMempoolTransactions, config.MaxMempoolWeight) } +func (p *DataPoster) UsingNoOpStorage() bool { + return p.usingNoOpStorage +} + var ErrExceedsMaxMempoolSize = errors.New("posting this transaction will exceed max mempool size") // Does basic check whether posting transaction with specified nonce would