Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
af8ca902
Unverified
Commit
af8ca902
authored
Dec 12, 2022
by
mergify[bot]
Committed by
GitHub
Dec 12, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4376 from ethereum-optimism/sc/cmn-bs-private-default
feat(cmn): BSv2 private options by default
parents
b7ea6ef5
ab8ec365
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
10 deletions
+18
-10
nervous-moose-bake.md
.changeset/nervous-moose-bake.md
+8
-0
base-service-v2.ts
packages/common-ts/src/base-service/base-service-v2.ts
+6
-2
service.ts
packages/drippie-mon/src/service.ts
+1
-1
service.ts
packages/fault-detector/src/service.ts
+1
-2
service.ts
packages/message-relayer/src/service.ts
+1
-3
service.ts
packages/replica-healthcheck/src/service.ts
+1
-2
No files found.
.changeset/nervous-moose-bake.md
0 → 100644
View file @
af8ca902
---
'
@eth-optimism/common-ts'
:
minor
'
@eth-optimism/drippie-mon'
:
patch
'
@eth-optimism/fault-detector'
:
patch
'
@eth-optimism/replica-healthcheck'
:
patch
---
Updates BaseServiceV2 so that options are secret by default. Services will have to explicitly mark options as "public" for those options to be logged and included in the metadata metric.
packages/common-ts/src/base-service/base-service-v2.ts
View file @
af8ca902
...
@@ -31,7 +31,7 @@ export type OptionsSpec<TOptions extends Options> = {
...
@@ -31,7 +31,7 @@ export type OptionsSpec<TOptions extends Options> = {
validator
:
(
spec
?:
Spec
<
TOptions
[
P
]
>
)
=>
ValidatorSpec
<
TOptions
[
P
]
>
validator
:
(
spec
?:
Spec
<
TOptions
[
P
]
>
)
=>
ValidatorSpec
<
TOptions
[
P
]
>
desc
:
string
desc
:
string
default
?:
TOptions
[
P
]
default
?:
TOptions
[
P
]
secret
?:
boolean
public
?:
boolean
}
}
}
}
...
@@ -167,21 +167,25 @@ export abstract class BaseServiceV2<
...
@@ -167,21 +167,25 @@ export abstract class BaseServiceV2<
validator
:
validators
.
num
,
validator
:
validators
.
num
,
desc
:
'
Loop interval in milliseconds
'
,
desc
:
'
Loop interval in milliseconds
'
,
default
:
params
.
loopIntervalMs
||
0
,
default
:
params
.
loopIntervalMs
||
0
,
public
:
true
,
},
},
port
:
{
port
:
{
validator
:
validators
.
num
,
validator
:
validators
.
num
,
desc
:
'
Port for the app server
'
,
desc
:
'
Port for the app server
'
,
default
:
params
.
port
||
7300
,
default
:
params
.
port
||
7300
,
public
:
true
,
},
},
hostname
:
{
hostname
:
{
validator
:
validators
.
str
,
validator
:
validators
.
str
,
desc
:
'
Hostname for the app server
'
,
desc
:
'
Hostname for the app server
'
,
default
:
params
.
hostname
||
'
0.0.0.0
'
,
default
:
params
.
hostname
||
'
0.0.0.0
'
,
public
:
true
,
},
},
logLevel
:
{
logLevel
:
{
validator
:
validators
.
logLevel
,
validator
:
validators
.
logLevel
,
desc
:
'
Log level
'
,
desc
:
'
Log level
'
,
default
:
params
.
logLevel
||
'
debug
'
,
default
:
params
.
logLevel
||
'
debug
'
,
public
:
true
,
},
},
}
}
...
@@ -194,7 +198,7 @@ export abstract class BaseServiceV2<
...
@@ -194,7 +198,7 @@ export abstract class BaseServiceV2<
// List of options that can safely be logged.
// List of options that can safely be logged.
const
publicOptionNames
=
Object
.
entries
(
params
.
optionsSpec
)
const
publicOptionNames
=
Object
.
entries
(
params
.
optionsSpec
)
.
filter
(([,
spec
])
=>
{
.
filter
(([,
spec
])
=>
{
return
spec
.
secret
!==
true
return
spec
.
public
})
})
.
map
(([
key
])
=>
{
.
map
(([
key
])
=>
{
return
key
return
key
...
...
packages/drippie-mon/src/service.ts
View file @
af8ca902
...
@@ -41,11 +41,11 @@ export class DrippieMonService extends BaseServiceV2<
...
@@ -41,11 +41,11 @@ export class DrippieMonService extends BaseServiceV2<
rpc
:
{
rpc
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for network where Drippie is deployed
'
,
desc
:
'
Provider for network where Drippie is deployed
'
,
secret
:
true
,
},
},
drippieAddress
:
{
drippieAddress
:
{
validator
:
validators
.
str
,
validator
:
validators
.
str
,
desc
:
'
Address of Drippie contract
'
,
desc
:
'
Address of Drippie contract
'
,
public
:
true
,
},
},
},
},
metricsSpec
:
{
metricsSpec
:
{
...
...
packages/fault-detector/src/service.ts
View file @
af8ca902
...
@@ -50,17 +50,16 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> {
...
@@ -50,17 +50,16 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> {
l1RpcProvider
:
{
l1RpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L1
'
,
desc
:
'
Provider for interacting with L1
'
,
secret
:
true
,
},
},
l2RpcProvider
:
{
l2RpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L2
'
,
desc
:
'
Provider for interacting with L2
'
,
secret
:
true
,
},
},
startBatchIndex
:
{
startBatchIndex
:
{
validator
:
validators
.
num
,
validator
:
validators
.
num
,
default
:
-
1
,
default
:
-
1
,
desc
:
'
Batch index to start checking from
'
,
desc
:
'
Batch index to start checking from
'
,
public
:
true
,
},
},
},
},
metricsSpec
:
{
metricsSpec
:
{
...
...
packages/message-relayer/src/service.ts
View file @
af8ca902
...
@@ -46,22 +46,20 @@ export class MessageRelayerService extends BaseServiceV2<
...
@@ -46,22 +46,20 @@ export class MessageRelayerService extends BaseServiceV2<
l1RpcProvider
:
{
l1RpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L1.
'
,
desc
:
'
Provider for interacting with L1.
'
,
secret
:
true
,
},
},
l2RpcProvider
:
{
l2RpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L2.
'
,
desc
:
'
Provider for interacting with L2.
'
,
secret
:
true
,
},
},
l1Wallet
:
{
l1Wallet
:
{
validator
:
validators
.
wallet
,
validator
:
validators
.
wallet
,
desc
:
'
Wallet used to interact with L1.
'
,
desc
:
'
Wallet used to interact with L1.
'
,
secret
:
true
,
},
},
fromL2TransactionIndex
:
{
fromL2TransactionIndex
:
{
validator
:
validators
.
num
,
validator
:
validators
.
num
,
desc
:
'
Index of the first L2 transaction to start processing from.
'
,
desc
:
'
Index of the first L2 transaction to start processing from.
'
,
default
:
0
,
default
:
0
,
public
:
true
,
},
},
},
},
metricsSpec
:
{
metricsSpec
:
{
...
...
packages/replica-healthcheck/src/service.ts
View file @
af8ca902
...
@@ -42,17 +42,16 @@ export class HealthcheckService extends BaseServiceV2<
...
@@ -42,17 +42,16 @@ export class HealthcheckService extends BaseServiceV2<
referenceRpcProvider
:
{
referenceRpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L1
'
,
desc
:
'
Provider for interacting with L1
'
,
secret
:
true
,
},
},
targetRpcProvider
:
{
targetRpcProvider
:
{
validator
:
validators
.
provider
,
validator
:
validators
.
provider
,
desc
:
'
Provider for interacting with L2
'
,
desc
:
'
Provider for interacting with L2
'
,
secret
:
true
,
},
},
onDivergenceWaitMs
:
{
onDivergenceWaitMs
:
{
validator
:
validators
.
num
,
validator
:
validators
.
num
,
desc
:
'
Waiting time in ms per loop when divergence is detected
'
,
desc
:
'
Waiting time in ms per loop when divergence is detected
'
,
default
:
60
_000
,
default
:
60
_000
,
public
:
true
,
},
},
},
},
metricsSpec
:
{
metricsSpec
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment