Skip to content

Commit c840a64

Browse files
KolbyMLKolbyML
committed
fix conflicts 1
1 parent 1e7bfa0 commit c840a64

File tree

3 files changed

+19
-89
lines changed

3 files changed

+19
-89
lines changed

‎Makefile‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,7 @@ all: build build-replay-env test-gen-proofs
166166
@touch .make/all
167167

168168
.PHONY: build
169-
<<<<<<< HEAD
170-
build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daprovider daserver autonomous-auctioneer bidder-client datool blobtool el-proxy mockexternalsigner seq-coordinator-invalidate nitro-val seq-coordinator-manager dbconv genesis-generator nitro-experimental)
171-
=======
172-
build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daprovider anytrustserver autonomous-auctioneer bidder-client anytrusttool blobtool el-proxy mockexternalsigner seq-coordinator-invalidate nitro-val seq-coordinator-manager dbconv genesis-generator transaction-filterer)
173-
>>>>>>> origin/master
169+
build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daprovider anytrustserver autonomous-auctioneer bidder-client anytrusttool blobtool el-proxy mockexternalsigner seq-coordinator-invalidate nitro-val seq-coordinator-manager dbconv genesis-generator transaction-filterer nitro-experimental)
174170
@printf $(done)
175171

176172
.PHONY: build-node-deps
@@ -247,19 +243,11 @@ test-go-redis: test-go-deps
247243
.github/workflows/gotestsum.sh --timeout 120m --run TestRedis --nolog -- --test_redis=redis://localhost:6379/0
248244
@printf $(done)
249245

250-
<<<<<<< HEAD
251-
.PHONY: test-go-gas-dimensions
252-
test-go-gas-dimensions: test-go-deps
253-
.github/workflows/gotestsum.sh --timeout 120m --run "TestDim(Log|TxOp)" --tags gasdimensionstest --nolog
254-
@printf $(done)
255-
256246
.PHONY: test-go-experimental
257247
test-go-experimental: test-go-deps
258248
.github/workflows/gotestsum.sh --timeout 120m --run TestExperimental --tags debugblock,benchsequencer --nolog
259249
@printf $(done)
260250

261-
=======
262-
>>>>>>> origin/master
263251
.PHONY: test-gen-proofs
264252
test-gen-proofs: \
265253
$(arbitrator_test_wasms) \
@@ -369,14 +357,12 @@ $(output_root)/bin/seq-coordinator-manager: $(DEP_PREDICATE) build-node-deps
369357
$(output_root)/bin/dbconv: $(DEP_PREDICATE) build-node-deps
370358
go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/dbconv"
371359

372-
<<<<<<< HEAD
360+
$(output_root)/bin/transaction-filterer: $(DEP_PREDICATE) build-node-deps
361+
go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/transaction-filterer"
362+
373363
# nitro built with experimental tooling enabled
374364
$(output_root)/bin/nitro-experimental: $(DEP_PREDICATE) build-node-deps
375365
go build $(GOLANG_PARAMS) --tags debugblock,benchsequencer -o $@ "$(CURDIR)/cmd/nitro"
376-
=======
377-
$(output_root)/bin/transaction-filterer: $(DEP_PREDICATE) build-node-deps
378-
go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/transaction-filterer"
379-
>>>>>>> origin/master
380366

381367
# recompile wasm, but don't change timestamp unless files differ
382368
$(replay_wasm): $(DEP_PREDICATE) $(go_source) .make/solgen

‎execution/gethexec/node.go‎

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ import (
3535
"github.com/offchainlabs/nitro/consensus"
3636
"github.com/offchainlabs/nitro/consensus/consensusrpcclient"
3737
"github.com/offchainlabs/nitro/execution"
38-
<<<<<<< HEAD
39-
"github.com/offchainlabs/nitro/experimental/debugblock"
40-
=======
4138
executionrpcserver "github.com/offchainlabs/nitro/execution/rpcserver"
42-
>>>>>>> origin/master
39+
"github.com/offchainlabs/nitro/experimental/debugblock"
4340
"github.com/offchainlabs/nitro/solgen/go/precompilesgen"
4441
"github.com/offchainlabs/nitro/util"
4542
"github.com/offchainlabs/nitro/util/arbmath"
@@ -123,26 +120,6 @@ func TxIndexerConfigAddOptions(prefix string, f *pflag.FlagSet) {
123120
}
124121

125122
type Config struct {
126-
<<<<<<< HEAD
127-
ParentChainReader headerreader.Config `koanf:"parent-chain-reader" reload:"hot"`
128-
Sequencer SequencerConfig `koanf:"sequencer" reload:"hot"`
129-
RecordingDatabase BlockRecorderConfig `koanf:"recording-database"`
130-
TxPreChecker TxPreCheckerConfig `koanf:"tx-pre-checker" reload:"hot"`
131-
Forwarder ForwarderConfig `koanf:"forwarder"`
132-
ForwardingTarget string `koanf:"forwarding-target"`
133-
SecondaryForwardingTarget []string `koanf:"secondary-forwarding-target"`
134-
Caching CachingConfig `koanf:"caching"`
135-
RPC arbitrum.Config `koanf:"rpc"`
136-
TxIndexer TxIndexerConfig `koanf:"tx-indexer"`
137-
EnablePrefetchBlock bool `koanf:"enable-prefetch-block"`
138-
SyncMonitor SyncMonitorConfig `koanf:"sync-monitor"`
139-
StylusTarget StylusTargetConfig `koanf:"stylus-target"`
140-
BlockMetadataApiCacheSize uint64 `koanf:"block-metadata-api-cache-size"`
141-
BlockMetadataApiBlocksLimit uint64 `koanf:"block-metadata-api-blocks-limit"`
142-
VmTrace LiveTracingConfig `koanf:"vmtrace"`
143-
ExposeMultiGas bool `koanf:"expose-multi-gas"`
144-
Dangerous DangerousConfig `koanf:"dangerous"`
145-
=======
146123
ParentChainReader headerreader.Config `koanf:"parent-chain-reader" reload:"hot"`
147124
Sequencer SequencerConfig `koanf:"sequencer" reload:"hot"`
148125
RecordingDatabase BlockRecorderConfig `koanf:"recording-database"`
@@ -163,7 +140,7 @@ type Config struct {
163140
RPCServer rpcserver.Config `koanf:"rpc-server"`
164141
ConsensusRPCClient rpcclient.ClientConfig `koanf:"consensus-rpc-client" reload:"hot"`
165142
AddressFilter addressfilter.Config `koanf:"address-filter" reload:"hot"`
166-
>>>>>>> origin/master
143+
Dangerous DangerousConfig `koanf:"dangerous"`
167144

168145
forwardingTarget string
169146
}
@@ -192,16 +169,14 @@ func (c *Config) Validate() error {
192169
if err := c.RPC.Validate(); err != nil {
193170
return err
194171
}
195-
<<<<<<< HEAD
196-
if err := c.Dangerous.Validate(); err != nil {
197-
return err
198-
=======
199172
if err := c.ConsensusRPCClient.Validate(); err != nil {
200173
return fmt.Errorf("error validating ConsensusRPCClient config: %w", err)
201174
}
202175
if err := c.AddressFilter.Validate(); err != nil {
203176
return fmt.Errorf("error validating addressfilter config: %w", err)
204-
>>>>>>> origin/master
177+
}
178+
if err := c.Dangerous.Validate(); err != nil {
179+
return err
205180
}
206181
return nil
207182
}
@@ -224,13 +199,10 @@ func ConfigAddOptions(prefix string, f *pflag.FlagSet) {
224199
f.Uint64(prefix+".block-metadata-api-blocks-limit", ConfigDefault.BlockMetadataApiBlocksLimit, "maximum number of blocks allowed to be queried for blockMetadata per arb_getRawBlockMetadata query. Enabled by default, set 0 to disable the limit")
225200
f.Bool(prefix+".expose-multi-gas", false, "experimental: expose multi-dimensional gas in transaction receipts")
226201
LiveTracingConfigAddOptions(prefix+".vmtrace", f)
227-
<<<<<<< HEAD
228-
DangerousConfigAddOptions(prefix+".dangerous", f)
229-
=======
230202
rpcserver.ConfigAddOptions(prefix+".rpc-server", "execution", f)
231203
rpcclient.RPCClientAddOptions(prefix+".consensus-rpc-client", f, &ConfigDefault.ConsensusRPCClient)
232204
addressfilter.ConfigAddOptions(prefix+".address-filter", f)
233-
>>>>>>> origin/master
205+
DangerousConfigAddOptions(prefix+".dangerous", f)
234206
}
235207

236208
type LiveTracingConfig struct {
@@ -500,21 +472,20 @@ func CreateExecutionNode(
500472
Service: eth.NewDebugAPI(eth.NewArbEthereum(l2BlockChain, executionDB)),
501473
Public: false,
502474
})
503-
<<<<<<< HEAD
504-
if benchSequencerService != nil {
505-
apis = append(apis, rpc.API{
506-
Namespace: "benchseq",
507-
Service: benchSequencerService,
508-
Public: false,
509-
=======
510475
if config.RPCServer.Enable {
511476
apis = append(apis, rpc.API{
512477
Namespace: execution.RPCNamespace,
513478
Version: "1.0",
514479
Service: executionrpcserver.NewServer(execNode, execNode),
515480
Public: config.RPCServer.Public,
516481
Authenticated: config.RPCServer.Authenticated,
517-
>>>>>>> origin/master
482+
})
483+
}
484+
if benchSequencerService != nil {
485+
apis = append(apis, rpc.API{
486+
Namespace: "benchseq",
487+
Service: benchSequencerService,
488+
Public: false,
518489
})
519490
}
520491

‎execution/gethexec/sequencer.go‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"github.com/offchainlabs/nitro/arbos/l1pricing"
3838
"github.com/offchainlabs/nitro/arbutil"
3939
"github.com/offchainlabs/nitro/execution"
40-
"github.com/offchainlabs/nitro/experimental/debugblock"
4140
"github.com/offchainlabs/nitro/execution/gethexec/eventfilter"
41+
"github.com/offchainlabs/nitro/experimental/debugblock"
4242
"github.com/offchainlabs/nitro/timeboost"
4343
"github.com/offchainlabs/nitro/util/arbmath"
4444
"github.com/offchainlabs/nitro/util/containers"
@@ -65,27 +65,6 @@ var (
6565
)
6666

6767
type SequencerConfig struct {
68-
<<<<<<< HEAD
69-
Enable bool `koanf:"enable"`
70-
MaxBlockSpeed time.Duration `koanf:"max-block-speed" reload:"hot"`
71-
ReadFromTxQueueTimeout time.Duration `koanf:"read-from-tx-queue-timeout" reload:"hot"`
72-
MaxRevertGasReject uint64 `koanf:"max-revert-gas-reject" reload:"hot"`
73-
MaxAcceptableTimestampDelta time.Duration `koanf:"max-acceptable-timestamp-delta" reload:"hot"`
74-
SenderWhitelist []string `koanf:"sender-whitelist"`
75-
Forwarder ForwarderConfig `koanf:"forwarder"`
76-
QueueSize int `koanf:"queue-size"`
77-
QueueTimeout time.Duration `koanf:"queue-timeout" reload:"hot"`
78-
NonceCacheSize int `koanf:"nonce-cache-size" reload:"hot"`
79-
MaxTxDataSize int `koanf:"max-tx-data-size" reload:"hot"`
80-
NonceFailureCacheSize int `koanf:"nonce-failure-cache-size" reload:"hot"`
81-
NonceFailureCacheExpiry time.Duration `koanf:"nonce-failure-cache-expiry" reload:"hot"`
82-
ExpectedSurplusGasPriceMode string `koanf:"expected-surplus-gas-price-mode"`
83-
ExpectedSurplusSoftThreshold string `koanf:"expected-surplus-soft-threshold" reload:"hot"`
84-
ExpectedSurplusHardThreshold string `koanf:"expected-surplus-hard-threshold" reload:"hot"`
85-
EnableProfiling bool `koanf:"enable-profiling" reload:"hot"`
86-
Timeboost TimeboostConfig `koanf:"timeboost"`
87-
Dangerous SequencerDangerousConfig `koanf:"dangerous"`
88-
=======
8968
Enable bool `koanf:"enable"`
9069
MaxBlockSpeed time.Duration `koanf:"max-block-speed" reload:"hot"`
9170
ReadFromTxQueueTimeout time.Duration `koanf:"read-from-tx-queue-timeout" reload:"hot"`
@@ -104,9 +83,8 @@ type SequencerConfig struct {
10483
ExpectedSurplusHardThreshold string `koanf:"expected-surplus-hard-threshold" reload:"hot"`
10584
EnableProfiling bool `koanf:"enable-profiling" reload:"hot"`
10685
Timeboost TimeboostConfig `koanf:"timeboost"`
107-
Dangerous DangerousConfig `koanf:"dangerous"`
86+
Dangerous SequencerDangerousConfig `koanf:"dangerous"`
10887
EventFilter eventfilter.EventFilterConfig `koanf:"event-filter"`
109-
>>>>>>> origin/master
11088
expectedSurplusSoftThreshold int
11189
expectedSurplusHardThreshold int
11290
}
@@ -238,12 +216,8 @@ var DefaultSequencerConfig = SequencerConfig{
238216
ExpectedSurplusHardThreshold: "default",
239217
EnableProfiling: false,
240218
Timeboost: DefaultTimeboostConfig,
241-
<<<<<<< HEAD
242219
Dangerous: DefaultSequencerDangerousConfig,
243-
=======
244-
Dangerous: DefaultDangerousConfig,
245220
EventFilter: eventfilter.DefaultEventFilterConfig,
246-
>>>>>>> origin/master
247221
}
248222

249223
var DefaultSequencerDangerousConfig = SequencerDangerousConfig{
@@ -261,7 +235,6 @@ func SequencerConfigAddOptions(prefix string, f *pflag.FlagSet) {
261235
TimeboostAddOptions(prefix+".timeboost", f)
262236

263237
SequencerDangerousAddOptions(prefix+".dangerous", f)
264-
DangerousAddOptions(prefix+".dangerous", f)
265238
EventFilterAddOptions(prefix+".event-filter", f)
266239
f.Int(prefix+".queue-size", DefaultSequencerConfig.QueueSize, "size of the pending tx queue")
267240
f.Duration(prefix+".queue-timeout", DefaultSequencerConfig.QueueTimeout, "maximum amount of time transaction can wait in queue")

0 commit comments

Comments
 (0)