Skip to content

Commit 7ac666a

Browse files
Tristan-WilsonTristan-Wilson
committed
Merge remote-tracking branch 'origin/master' into customda-daprovider-interface
2 parents 3a79a18 + 72870a9 commit 7ac666a

File tree

216 files changed

+1483
-1161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+1483
-1161
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,11 @@ RUN ./download-machine.sh consensus-v32 0x184884e1eb9fefdc158f6c8ac912bb183bf3cf
238238
#RUN ./download-machine.sh consensus-v40-rc.1 0x6dae396b0b7644a2d63b4b22e6452b767aa6a04b6778dadebdd74aa40f40a5c5
239239
#RUN ./download-machine.sh consensus-v40-rc.2 0xa8206be13d53e456c7ab061d94bab5b229d674ac57ffe7281216479a8820fcc0
240240
RUN ./download-machine.sh consensus-v41 0xa18d6266cef250802c3cb2bfefe947ea1aa9a32dd30a8d1dfc4568a8714d3a7a
241-
RUN ./download-machine.sh consensus-v50-alpha.1 0x28cfd8d81613ce4ebe750e77bfd95d6d95d4f53240488095a11c1ad3a494fa82
242-
RUN ./download-machine.sh consensus-v50-rc.1 0x8fd725477d8ef58183a1a943c375a8495a22cd2d7d701ac917fe20d69993e88e
243-
RUN ./download-machine.sh consensus-v50-rc.2 0xc1ea4d6d2791bf5bdf6de3c2166ce4aab8fe16ca4ad5c226e8ae31a8b77f1a08
241+
#RUN ./download-machine.sh consensus-v50-alpha.1 0x28cfd8d81613ce4ebe750e77bfd95d6d95d4f53240488095a11c1ad3a494fa82
242+
#RUN ./download-machine.sh consensus-v50-rc.1 0x8fd725477d8ef58183a1a943c375a8495a22cd2d7d701ac917fe20d69993e88e
243+
#RUN ./download-machine.sh consensus-v50-rc.2 0xc1ea4d6d2791bf5bdf6de3c2166ce4aab8fe16ca4ad5c226e8ae31a8b77f1a08
244244
RUN ./download-machine.sh consensus-v50-rc.3 0x385fa2524d86d4ebc340988224f8686b3f485c7c9f7bc1015a64c85a9c76a6b0
245+
RUN ./download-machine.sh consensus-v50-rc.4 0x393be710f252e8217d66fe179739eba1ed471f0d5a847b5905c30926d853241a
245246
RUN ./download-machine.sh consensus-v40 0xdb698a2576298f25448bc092e52cf13b1e24141c997135d70f217d674bbeb69a
246247

247248
FROM golang:1.24.5-bookworm AS node-builder

‎arbitrator/stylus/src/target_cache.rs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,24 @@ fn target_from_string(input: String) -> Result<Target> {
3131
for flag in parts {
3232
features.insert(CpuFeature::from_str(flag)?);
3333
}
34-
34+
if features.contains(CpuFeature::AVX2) {
35+
features.insert(CpuFeature::AVX);
36+
}
37+
if features.contains(CpuFeature::AVX) {
38+
features.insert(CpuFeature::SSE42);
39+
}
40+
if features.contains(CpuFeature::SSE42) {
41+
features.insert(CpuFeature::SSE41);
42+
}
43+
if features.contains(CpuFeature::SSE41) {
44+
features.insert(CpuFeature::SSSE3);
45+
}
46+
if features.contains(CpuFeature::SSSE3) {
47+
features.insert(CpuFeature::SSE3);
48+
}
49+
if features.contains(CpuFeature::SSE3) {
50+
features.insert(CpuFeature::SSE2);
51+
}
3552
Ok(Target::new(triple, features))
3653
}
3754

‎arbnode/consensus_execution_syncer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"errors"
99
"time"
1010

11-
flag "github.com/spf13/pflag"
11+
"github.com/spf13/pflag"
1212

1313
"github.com/ethereum/go-ethereum/log"
1414

@@ -28,7 +28,7 @@ var DefaultConsensusExecutionSyncerConfig = ConsensusExecutionSyncerConfig{
2828
SyncInterval: 1 * time.Second,
2929
}
3030

31-
func ConsensusExecutionSyncerConfigAddOptions(prefix string, f *flag.FlagSet) {
31+
func ConsensusExecutionSyncerConfigAddOptions(prefix string, f *pflag.FlagSet) {
3232
f.Duration(prefix+".sync-interval", DefaultConsensusExecutionSyncerConfig.SyncInterval, "Interval in which finality data is pushed from consensus to execution")
3333
}
3434

‎arbnode/delayed.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func (b *DelayedBridge) logsToDeliveredMessages(ctx context.Context, logs []type
258258
},
259259
ParentChainBlockNumber: parsedLog.Raw.BlockNumber,
260260
}
261-
err := msg.Message.FillInBatchGasCost(batchFetcher)
261+
err := msg.Message.FillInBatchGasFields(batchFetcher)
262262
if err != nil {
263263
return nil, err
264264
}

‎arbnode/delayed_sequencer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sync"
1212
"time"
1313

14-
flag "github.com/spf13/pflag"
14+
"github.com/spf13/pflag"
1515

1616
"github.com/ethereum/go-ethereum/common"
1717
"github.com/ethereum/go-ethereum/core/types"
@@ -47,7 +47,7 @@ type DelayedSequencerConfig struct {
4747

4848
type DelayedSequencerConfigFetcher func() *DelayedSequencerConfig
4949

50-
func DelayedSequencerConfigAddOptions(prefix string, f *flag.FlagSet) {
50+
func DelayedSequencerConfigAddOptions(prefix string, f *pflag.FlagSet) {
5151
f.Bool(prefix+".enable", DefaultDelayedSequencerConfig.Enable, "enable delayed sequencer")
5252
f.Int64(prefix+".finalize-distance", DefaultDelayedSequencerConfig.FinalizeDistance, "how many blocks in the past L1 block is considered final (ignored when using Merge finality)")
5353
f.Bool(prefix+".require-full-finality", DefaultDelayedSequencerConfig.RequireFullFinality, "whether to wait for full finality before sequencing delayed messages")
@@ -174,7 +174,7 @@ func (d *DelayedSequencer) sequenceWithoutLockout(ctx context.Context, lastBlock
174174
}
175175
}
176176
lastDelayedAcc = acc
177-
err = msg.FillInBatchGasCost(func(batchNum uint64) ([]byte, error) {
177+
err = msg.FillInBatchGasFields(func(batchNum uint64) ([]byte, error) {
178178
data, _, err := d.reader.GetSequencerMessageBytes(ctx, batchNum)
179179
return data, err
180180
})

‎arbnode/inbox_reader.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
flag "github.com/spf13/pflag"
16+
"github.com/spf13/pflag"
1717

1818
"github.com/ethereum/go-ethereum/common"
1919
"github.com/ethereum/go-ethereum/ethclient"
@@ -49,7 +49,7 @@ func (c *InboxReaderConfig) Validate() error {
4949
return nil
5050
}
5151

52-
func InboxReaderConfigAddOptions(prefix string, f *flag.FlagSet) {
52+
func InboxReaderConfigAddOptions(prefix string, f *pflag.FlagSet) {
5353
f.Uint64(prefix+".delay-blocks", DefaultInboxReaderConfig.DelayBlocks, "number of latest blocks to ignore to reduce reorgs")
5454
f.Duration(prefix+".check-delay", DefaultInboxReaderConfig.CheckDelay, "the maximum time to wait between inbox checks (if not enough new blocks are found)")
5555
f.Uint64(prefix+".min-blocks-to-read", DefaultInboxReaderConfig.MinBlocksToRead, "the minimum number of blocks to read at once (when caught up lowers load on L1)")

‎arbnode/inbox_tracker.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/offchainlabs/nitro/arbstate"
2424
"github.com/offchainlabs/nitro/arbutil"
2525
"github.com/offchainlabs/nitro/broadcaster"
26-
m "github.com/offchainlabs/nitro/broadcaster/message"
26+
"github.com/offchainlabs/nitro/broadcaster/message"
2727
"github.com/offchainlabs/nitro/daprovider"
2828
"github.com/offchainlabs/nitro/staker"
2929
"github.com/offchainlabs/nitro/util/containers"
@@ -294,7 +294,7 @@ func (t *InboxTracker) PopulateFeedBacklog(broadcastServer *broadcaster.Broadcas
294294
if err != nil {
295295
return fmt.Errorf("error getting tx streamer message count: %w", err)
296296
}
297-
var feedMessages []*m.BroadcastFeedMessage
297+
var feedMessages []*message.BroadcastFeedMessage
298298
for seqNum := startMessage; seqNum < messageCount; seqNum++ {
299299
message, err := t.txStreamer.GetMessage(seqNum)
300300
if err != nil {
@@ -338,7 +338,7 @@ func (t *InboxTracker) legacyGetDelayedMessageAndAccumulator(ctx context.Context
338338
return nil, common.Hash{}, err
339339
}
340340

341-
err = msg.FillInBatchGasCost(func(batchNum uint64) ([]byte, error) {
341+
err = msg.FillInBatchGasFields(func(batchNum uint64) ([]byte, error) {
342342
data, _, err := t.txStreamer.inboxReader.GetSequencerMessageBytes(ctx, batchNum)
343343
return data, err
344344
})
@@ -371,7 +371,7 @@ func (t *InboxTracker) GetDelayedMessageAccumulatorAndParentChainBlockNumber(ctx
371371
return msg, acc, 0, err
372372
}
373373

374-
err = msg.FillInBatchGasCost(func(batchNum uint64) ([]byte, error) {
374+
err = msg.FillInBatchGasFields(func(batchNum uint64) ([]byte, error) {
375375
data, _, err := t.txStreamer.inboxReader.GetSequencerMessageBytes(ctx, batchNum)
376376
return data, err
377377
})

‎arbnode/maintenance.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"time"
1010

11-
flag "github.com/spf13/pflag"
11+
"github.com/spf13/pflag"
1212

1313
"github.com/ethereum/go-ethereum/log"
1414

@@ -35,7 +35,7 @@ type MaintenanceConfig struct {
3535
Lock redislock.SimpleCfg `koanf:"lock" reload:"hot"`
3636
}
3737

38-
func MaintenanceConfigAddOptions(prefix string, f *flag.FlagSet) {
38+
func MaintenanceConfigAddOptions(prefix string, f *pflag.FlagSet) {
3939
f.Bool(prefix+".enable", DefaultMaintenanceConfig.Enable, "enable maintenance runner")
4040
f.Duration(prefix+".check-interval", DefaultMaintenanceConfig.CheckInterval, "how often to check if maintenance should be run")
4141
redislock.AddConfigOptions(prefix+".lock", f)

‎arbnode/mel/extraction/message_extraction_function.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,8 @@ func extractMessagesImpl(
187187
batch.SequenceNumber,
188188
)
189189
}
190-
gas := arbostypes.ComputeBatchGasCost(serialized)
191-
192-
// Fill in the batch gas cost into the batch posting report.
193-
batchPostReport.Message.BatchGasCost = &gas
190+
// Fill in the batch gas stats into the batch posting report.
191+
batchPostReport.Message.BatchDataStats = arbostypes.GetDataStats(serialized)
194192
} else if !(inputState.DelayedMessagedSeen == 0 && i == 0 && delayedMessages[i] == batchPostReport) {
195193
return nil, nil, nil, errors.New("encountered initialize message that is not the first delayed message and the first batch ")
196194
}

‎arbnode/mel/runner/database.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/ethereum/go-ethereum/ethdb"
1010
"github.com/ethereum/go-ethereum/rlp"
1111

12-
dbschema "github.com/offchainlabs/nitro/arbnode/db-schema"
12+
"github.com/offchainlabs/nitro/arbnode/db-schema"
1313
"github.com/offchainlabs/nitro/arbnode/mel"
1414
)
1515

0 commit comments

Comments
 (0)