Skip to content

Commit 735d1af

Browse files
dailinsubjamQuentinI
dailinsubjam
and
QuentinI
authored
Enable circleCI after rebase14 (#265)
* Fix .circleci/config.yaml and lint and most of circleCI tests after rebasing celo-sync-14 * Skip tests (in TEST_PKGS) that need auth or celo-specific rpc specified --------- Co-authored-by: Artemii Gerasimovich <[email protected]>
1 parent 7c58557 commit 735d1af

File tree

10 files changed

+96
-95
lines changed

10 files changed

+96
-95
lines changed

‎.circleci/config.yml‎

Lines changed: 66 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ commands:
111111
name: "Authenticate with GCP using OIDC"
112112
command: |
113113
# Configure gcloud to leverage the generated credential configuration
114-
gcloud auth login --brief --cred-file "<< parameters.gcp_cred_config_file_path >>"
114+
# TODO: https://app.asana.com/1/1208976916964769/project/1209976130071762/task/1211927036399950?focus=true
115+
gcloud auth login --brief --cred-file "<< parameters.gcp_cred_config_file_path >>" || true
115116
# Configure ADC
116117
echo "export GOOGLE_APPLICATION_CREDENTIALS='<< parameters.gcp_cred_config_file_path >>'" | tee -a "$BASH_ENV"
117118
@@ -840,7 +841,7 @@ jobs:
840841
type: string
841842
docker:
842843
- image: <<pipeline.parameters.default_docker_image>>
843-
resource_class: xlarge
844+
resource_class: large
844845
steps:
845846
- utils/checkout-with-mise
846847
- attach_workspace: { at: "." }
@@ -1211,7 +1212,7 @@ jobs:
12111212
type: string
12121213
default: 30m
12131214
machine: true
1214-
resource_class: xlarge
1215+
resource_class: large
12151216
steps:
12161217
- utils/checkout-with-mise
12171218
- install-contracts-dependencies
@@ -1880,32 +1881,39 @@ workflows:
18801881
test_timeout: 20m
18811882
environment_overrides: |
18821883
export PARALLEL=24
1883-
# op-deployer & op-validator excluded as they need sepolia keys
1884-
packages: |
1885-
op-alt-da
1886-
op-batcher
1887-
op-chain-ops
1888-
op-node
1889-
op-proposer
1890-
op-challenger
1891-
op-dispute-mon
1892-
op-conductor
1893-
op-program
1894-
op-service
1895-
op-supervisor
1896-
op-fetcher
1897-
op-e2e/system
1898-
op-e2e/e2eutils
1899-
op-e2e/opgeth
1900-
op-e2e/interop
1901-
op-e2e/actions
1902-
op-e2e/faultproofs
1903-
packages/contracts-bedrock/scripts/checks
1904-
packages/contracts-bedrock/scripts/verify
1905-
op-dripper
1906-
devnet-sdk
1907-
op-acceptance-tests
1908-
kurtosis-devnet
1884+
# some op-deployer & op-validator excluded as they need sepolia keys or sepolia url
1885+
export TEST_PKGS="\
1886+
./op-alt-da/... \
1887+
./op-batcher/... \
1888+
./op-chain-ops/... \
1889+
./op-node/... \
1890+
./op-proposer/... \
1891+
./op-challenger/... \
1892+
./op-faucet/... \
1893+
./op-dispute-mon/... \
1894+
./op-conductor/... \
1895+
./op-program/... \
1896+
./op-service/... \
1897+
./op-supervisor/... \
1898+
./op-test-sequencer/... \
1899+
./op-fetcher/... \
1900+
./op-e2e/system/... \
1901+
./op-e2e/e2eutils/... \
1902+
./op-e2e/opgeth/... \
1903+
./op-e2e/interop/... \
1904+
./packages/contracts-bedrock/scripts/checks/... \
1905+
./op-dripper/... \
1906+
./devnet-sdk/... \
1907+
./op-acceptance-tests/... \
1908+
./kurtosis-devnet/... \
1909+
./op-devstack/... \
1910+
./op-deployer/pkg/deployer/artifacts/... \
1911+
./op-deployer/pkg/deployer/broadcaster/... \
1912+
./op-deployer/pkg/deployer/clean/... \
1913+
./op-deployer/pkg/deployer/integration_test/... \
1914+
./op-deployer/pkg/deployer/interop/... \
1915+
./op-deployer/pkg/deployer/standard/... \
1916+
./op-deployer/pkg/deployer/state/..."
19091917
requires:
19101918
- contracts-bedrock-build
19111919
- cannon-prestate-quick
@@ -1914,10 +1922,10 @@ workflows:
19141922
- discord
19151923
# TODO(#15353) - Need to regenerate data used in op-program-compat and then reenable this test
19161924
# See: https://github.com/ethereum-optimism/chain-test-data?tab=readme-ov-file#generating-new-data
1917-
# - op-program-compat:
1918-
# context:
1919-
# - circleci-repo-readonly-authenticated-github-token
1920-
# - discord
1925+
# - op-program-compat:
1926+
# context:
1927+
# - circleci-repo-readonly-authenticated-github-token
1928+
# - discord
19211929
- bedrock-go-tests:
19221930
requires:
19231931
- go-lint
@@ -2298,12 +2306,12 @@ workflows:
22982306
context:
22992307
- circleci-repo-readonly-authenticated-github-token
23002308
- discord
2301-
# Generate flaky test report
2302-
- generate-flaky-report:
2303-
name: generate-flaky-tests-report
2304-
context:
2305-
- circleci-repo-readonly-authenticated-github-token
2306-
- circleci-api-token
2309+
# Generate flaky test report : CircleCI API token not configured TODO: https://app.asana.com/1/1208976916964769/project/1209976130071762/task/1211927036399950?focus=true
2310+
# - generate-flaky-report:
2311+
# name: generate-flaky-tests-report
2312+
# context:
2313+
# - circleci-repo-readonly-authenticated-github-token
2314+
# - circleci-api-token
23072315

23082316
# Acceptance tests (pre-merge to develop)
23092317
acceptance-tests-pr:
@@ -2344,12 +2352,12 @@ workflows:
23442352
# context:
23452353
# - circleci-repo-readonly-authenticated-github-token
23462354
# - discord
2347-
# Generate flaky test report
2348-
- generate-flaky-report:
2349-
name: generate-flaky-tests-report
2350-
context:
2351-
- circleci-repo-readonly-authenticated-github-token
2352-
- circleci-api-token
2355+
# Generate flaky test report - Disabled: CircleCI API token not configured TODO: https://app.asana.com/1/1208976916964769/project/1209976130071762/task/1211927036399950?focus=true
2356+
# - generate-flaky-report:
2357+
# name: generate-flaky-tests-report
2358+
# context:
2359+
# - circleci-repo-readonly-authenticated-github-token
2360+
# - circleci-api-token
23532361

23542362
close-issue-workflow:
23552363
when:
@@ -2367,15 +2375,16 @@ workflows:
23672375
context:
23682376
- circleci-repo-optimism
23692377

2370-
devnet-metrics-collect:
2371-
when:
2372-
or:
2373-
- equal: [<< pipeline.trigger_source >>, "webhook"]
2374-
- and:
2375-
- equal: [true, << pipeline.parameters.devnet-metrics-collect >>]
2376-
- equal: [<< pipeline.trigger_source >>, "api"]
2377-
jobs:
2378-
- devnet-metrics-collect-authorship:
2379-
context:
2380-
- circleci-repo-readonly-authenticated-github-token
2381-
- oplabs-tools-data-public-metrics-bucket
2378+
# Disabled: GCP auth not configured TODO: https://app.asana.com/1/1208976916964769/project/1209976130071762/task/1211927036399950?focus=true
2379+
# devnet-metrics-collect:
2380+
# when:
2381+
# or:
2382+
# - equal: [<< pipeline.trigger_source >>, "webhook"]
2383+
# - and:
2384+
# - equal: [true, << pipeline.parameters.devnet-metrics-collect >>]
2385+
# - equal: [<< pipeline.trigger_source >>, "api"]
2386+
# jobs:
2387+
# - devnet-metrics-collect-authorship:
2388+
# context:
2389+
# - circleci-repo-readonly-authenticated-github-token
2390+
# - oplabs-tools-data-public-metrics-bucket

‎espresso/streamer_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,29 +279,29 @@ type NoOpLogger struct{}
279279

280280
var _ log.Logger = (*NoOpLogger)(nil)
281281

282-
func (l *NoOpLogger) With(ctx ...interface{}) log.Logger { return l }
283-
func (l *NoOpLogger) New(ctx ...interface{}) log.Logger { return l }
284-
func (l *NoOpLogger) Log(level slog.Level, msg string, ctx ...interface{}) {}
285-
func (l *NoOpLogger) Trace(msg string, ctx ...interface{}) {}
286-
func (l *NoOpLogger) Debug(msg string, ctx ...interface{}) {}
287-
func (l *NoOpLogger) Info(msg string, ctx ...interface{}) {}
288-
func (l *NoOpLogger) Warn(msg string, ctx ...interface{}) {}
289-
func (l *NoOpLogger) Error(msg string, ctx ...interface{}) {}
290-
func (l *NoOpLogger) Crit(msg string, ctx ...interface{}) { panic("critical error") }
291-
func (l *NoOpLogger) Write(level slog.Level, msg string, attrs ...any) {}
292-
func (l *NoOpLogger) Enabled(ctx context.Context, level slog.Level) bool { return true }
293-
func (l *NoOpLogger) Handler() slog.Handler { return nil }
282+
func (l *NoOpLogger) With(ctx ...interface{}) log.Logger { return l }
283+
func (l *NoOpLogger) New(ctx ...interface{}) log.Logger { return l }
284+
func (l *NoOpLogger) Log(level slog.Level, msg string, ctx ...interface{}) {}
285+
func (l *NoOpLogger) Trace(msg string, ctx ...interface{}) {}
286+
func (l *NoOpLogger) Debug(msg string, ctx ...interface{}) {}
287+
func (l *NoOpLogger) Info(msg string, ctx ...interface{}) {}
288+
func (l *NoOpLogger) Warn(msg string, ctx ...interface{}) {}
289+
func (l *NoOpLogger) Error(msg string, ctx ...interface{}) {}
290+
func (l *NoOpLogger) Crit(msg string, ctx ...interface{}) { panic("critical error") }
291+
func (l *NoOpLogger) Write(level slog.Level, msg string, attrs ...any) {}
292+
func (l *NoOpLogger) Enabled(ctx context.Context, level slog.Level) bool { return true }
293+
func (l *NoOpLogger) Handler() slog.Handler { return nil }
294294
func (l *NoOpLogger) TraceContext(ctx context.Context, msg string, ctxArgs ...interface{}) {}
295295
func (l *NoOpLogger) DebugContext(ctx context.Context, msg string, ctxArgs ...interface{}) {}
296296
func (l *NoOpLogger) InfoContext(ctx context.Context, msg string, ctxArgs ...interface{}) {}
297297
func (l *NoOpLogger) WarnContext(ctx context.Context, msg string, ctxArgs ...interface{}) {}
298298
func (l *NoOpLogger) ErrorContext(ctx context.Context, msg string, ctxArgs ...interface{}) {}
299-
func (l *NoOpLogger) CritContext(ctx context.Context, msg string, ctxArgs ...interface{}) {
299+
func (l *NoOpLogger) CritContext(ctx context.Context, msg string, ctxArgs ...interface{}) {
300300
panic("critical error")
301301
}
302302
func (l *NoOpLogger) LogAttrs(ctx context.Context, level slog.Level, msg string, attrs ...slog.Attr) {
303303
}
304-
func (l *NoOpLogger) SetContext(ctx context.Context) {}
304+
func (l *NoOpLogger) SetContext(ctx context.Context) {}
305305
func (l *NoOpLogger) WriteCtx(ctx context.Context, level slog.Level, msg string, args ...any) {}
306306

307307
func createHashFromHeight(height uint64) common.Hash {

‎go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ require (
106106
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
107107
github.com/cockroachdb/redact v1.1.5 // indirect
108108
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
109-
github.com/coder/websocket v1.8.13
110109
github.com/consensys/bavard v0.1.27 // indirect
111110
github.com/containerd/cgroups v1.1.0 // indirect
112111
github.com/containerd/log v0.1.0 // indirect

‎op-batcher/batcher/driver.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ type BatchSubmitter struct {
126126

127127
throttling atomic.Bool // whether the batcher is throttling sequencers and additional endpoints
128128

129-
submitter *espressoTransactionSubmitter
130-
streamer espresso.EspressoStreamer[derive.EspressoBatch]
131129
txpoolMutex sync.Mutex // guards txpoolState and txpoolBlockedBlob
132130
txpoolState TxPoolState
133131
txpoolBlockedBlob bool

‎op-batcher/batcher/espresso.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,7 @@ func (l *BlockLoader) nextBlockRange(newSyncStatus *eth.SyncStatus) (inclusiveBl
875875
return inclusiveBlockRange{}, ActionRetry
876876
}
877877

878-
var safeL2 eth.L2BlockRef
879-
safeL2 = newSyncStatus.SafeL2
878+
safeL2 := newSyncStatus.SafeL2
880879

881880
// State empty, just enqueue all unsafe blocks
882881
if len(l.queuedBlocks) == 0 {

‎op-deployer/pkg/deployer/state/deploy_config.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
168168
return cfg, nil
169169
}
170170

171-
func mustHexBigFromHex(hex string) *hexutil.Big {
172-
num := hexutil.MustDecodeBig(hex)
173-
hexBig := hexutil.Big(*num)
174-
return &hexBig
175-
}
176-
177171
func calculateBatchInboxAddr(chainState *ChainState) common.Address {
178172
if chainState.BatchInboxAddress != (common.Address{}) {
179173
return chainState.BatchInboxAddress

‎op-e2e/config/init.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ const (
5252
type AllocType string
5353

5454
const (
55-
AllocTypeStandard AllocType = "standard"
56-
AllocTypeAltDA AllocType = "alt-da"
57-
AllocTypeAltDAGeneric AllocType = "alt-da-generic"
58-
AllocTypeL2OO AllocType = "l2oo"
59-
AllocTypeMTCannon AllocType = "mt-cannon"
60-
AllocTypeMTCannonNext AllocType = "mt-cannon-next"
61-
AllocTypeEspresso AllocType = "espresso"
55+
AllocTypeStandard AllocType = "standard"
56+
AllocTypeAltDA AllocType = "alt-da"
57+
AllocTypeAltDAGeneric AllocType = "alt-da-generic"
58+
AllocTypeL2OO AllocType = "l2oo"
59+
AllocTypeMTCannon AllocType = "mt-cannon"
60+
AllocTypeMTCannonNext AllocType = "mt-cannon-next"
61+
AllocTypeEspresso AllocType = "espresso"
6262
AllocTypeEspressoWithoutEnclave AllocType = "espresso-no-enclave"
6363
AllocTypeEspressoWithEnclave AllocType = "espresso-enclave"
6464

‎op-program/client/l1/client.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ func (o *OracleL1Client) L1BlockRefByLabel(ctx context.Context, label eth.BlockL
4646
return o.head, nil
4747
}
4848

49+
func (o *OracleL1Client) L1FinalizedBlock() (eth.L1BlockRef, error) {
50+
// The L1 head is pre-agreed and unchanging so it can be used as finalized
51+
return o.head, nil
52+
}
53+
4954
func (o *OracleL1Client) L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error) {
5055
if number > o.head.Number {
5156
return eth.L1BlockRef{}, fmt.Errorf("%w: block number %d", ErrNotFound, number)

‎op-supervisor/supervisor/backend/depset/links.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ func (lc *LinkCheckerImpl) CanExecute(execInChain eth.ChainID,
5858
return false
5959
}
6060
expiresAt := safemath.SaturatingAdd(initTimestamp, lc.cfg.MessageExpiryWindow())
61-
if expiresAt < execInTimestamp { // expiry check
62-
return false
63-
}
64-
return true
61+
return expiresAt >= execInTimestamp // expiry check
6562
}
6663

6764
// LinkCheckFn is a function-type that implements LinkChecker, for testing and other special case definitions

‎packages/contracts-bedrock/snapshots/semver-lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"src/L1/BatchAuthenticator.sol:BatchAuthenticator": {
3-
"initCodeHash": "0x90f154249a328699903e02c068f01f4f99fc9b5d79bccc4104fd006fdaaec4df",
3+
"initCodeHash": "0x886ad73f143db896806140ccb2a64c353c4822bcc6021e1e6bb48497da478d1c",
44
"sourceCodeHash": "0xb0769be04670274b46231d81eb19b7bac6f2f8d4b4989ad9dda4aea85ef6166d"
55
},
66
"src/L1/DataAvailabilityChallenge.sol:DataAvailabilityChallenge": {
@@ -223,4 +223,4 @@
223223
"initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
224224
"sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
225225
}
226-
}
226+
}

0 commit comments

Comments
 (0)