Skip to content

Commit

Permalink
feat: deployed
Browse files Browse the repository at this point in the history
  • Loading branch information
ratankaliani committed Dec 6, 2024
1 parent a7ec633 commit 8ea5c02
Show file tree
Hide file tree
Showing 11 changed files with 201 additions and 118 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ sp1-zkvm = { version = "3.0.0", features = ["verify"] }
# Note: This rev is on Matt's mattstam/v3.0.0-w-network-v2 branch which includes the network-v2 changes from Dec 2.
# This branch DOES NOT include the SP1 mock groth16 bytes fix, skipping deferred verification and executor opts.
# This means deferred verification does not work, mock does not work and the cost estimator will be slow.
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "0a455d69946a0eb9984cbabb38a5c3ed50ceebed", features = [
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "2f5bf71d5d2f809924e5135f5e42b76e6fb58750", features = [
"network-v2",
] }
sp1-build = { version = "3.0.0" }
Expand Down
1 change: 1 addition & 0 deletions configs/808813/rollup.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"ecotone_time": 0,
"fjord_time": 0,
"granite_time": 1725984001,
"holocene_time": 1732633200,
"batch_inbox_address": "0x734dde12fd466c14a85de838788efe6f1993c84c",
"deposit_contract_address": "0xbaaf3bafdbd660380938b27d21c31bb7d072a799",
"l1_system_config_address": "0x3974436fa4bb4deb5a04ace51a704b10ff5a1f25",
Expand Down
8 changes: 4 additions & 4 deletions contracts/opsuccinctl2ooconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"rollupConfigHash": "0x71241d0f92749d7365aaaf6a015de550816632a4e4e84e273f865f582e8190aa",
"startingBlockNumber": 123687,
"startingOutputRoot": "0x3b3bf4dad86d165365067c3a0095b114e111701b5cb78b9400256f200620f162",
"startingTimestamp": 1733355474,
"startingBlockNumber": 135683,
"startingOutputRoot": "0xe8d10b7d47734fbc3b9d5148229bc50db4f633b47cc9479e7f13b289227a6495",
"startingTimestamp": 1733475434,
"submissionInterval": 300,
"verifier": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
"aggregationVkey": "0x00ea4171dbd0027768055bee7f6d64e17e9cec99b29aad5d18e5d804b967775b",
"rangeVkeyCommitment": "0x1a4ebe5c47d55436319c425951eb1a7e04f560945e29eb454215d30b30987bbb"
"rangeVkeyCommitment": "0x18c3562e27c0166e506c25fd5c9a40f5361022ab446617b12298f0496d20b495"
}
41 changes: 34 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,55 @@
services:
# OP Succinct Server
op-succinct-server:
op-succinct-server-bob-testnet:
build:
context: .
dockerfile: ./proposer/succinct/Dockerfile
env_file:
- ${ENV_FILE:-.env}
- ${ENV_FILE:-.env.bobtestnet}
restart: unless-stopped
ports:
- "3000:3000"
- "3001:3001"

# OP Succinct Proposer
op-succinct-proposer:
op-succinct-proposer-bob-testnet:
build:
context: .
dockerfile: ./proposer/op/Dockerfile.op_proposer
env_file:
# Running with Conduit.
- ${ENV_FILE:-.env}
- ${ENV_FILE:-.env.bobtestnet}
restart: unless-stopped
depends_on:
- op-succinct-server
- op-succinct-server-bob-testnet
volumes:
- ./db:/usr/local/bin/dbdata
# The metrics port is the default port for the OP Proposer.
ports:
- "7303:7303"
- "7301:7301"
# OP Succinct Server
op-succinct-server-conduit-10s:
build:
context: .
dockerfile: ./proposer/succinct/Dockerfile
env_file:
- ${ENV_FILE:-.env.conduit}
restart: unless-stopped
ports:
- "3002:3002"

# OP Succinct Proposer
op-succinct-proposer-conduit-10s:
build:
context: .
dockerfile: ./proposer/op/Dockerfile.op_proposer
env_file:
# Running with Conduit.
- ${ENV_FILE:-.env.conduit}
restart: unless-stopped
depends_on:
- op-succinct-server-conduit-10s
volumes:
- ./db:/usr/local/bin/dbdata
# The metrics port is the default port for the OP Proposer.
ports:
- "7302:7302"
12 changes: 10 additions & 2 deletions proposer/op/proposer/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ func (l *L2OutputSubmitter) GetProposerMetrics(ctx context.Context) (opsuccinctm
return opsuccinctmetrics.ProposerMetrics{}, fmt.Errorf("failed to get max contiguous span proof range: %w", err)
}

// This fetches the next block number, which is the currentBlock + submissionInterval.
minBlockToProveToAgg, err := l.l2ooContract.NextBlockNumber(&bind.CallOpts{Context: ctx})
if err != nil {
return opsuccinctmetrics.ProposerMetrics{}, fmt.Errorf("failed to get next L2OO output: %w", err)
}

numProving, err := l.db.GetNumberOfRequestsWithStatuses(proofrequest.StatusPROVING)
if err != nil {
return opsuccinctmetrics.ProposerMetrics{}, fmt.Errorf("failed to get number of proofs proving: %w", err)
Expand All @@ -271,6 +277,7 @@ func (l *L2OutputSubmitter) GetProposerMetrics(ctx context.Context) (opsuccinctm
L2FinalizedBlock: l2FinalizedBlock,
LatestContractL2Block: latestContractL2Block.Uint64(),
HighestProvenContiguousL2Block: highestProvenContiguousL2Block,
MinBlockToProveToAgg: minBlockToProveToAgg.Uint64(),
NumProving: uint64(numProving),
NumWitnessgen: uint64(numWitnessgen),
NumUnrequested: uint64(numUnrequested),
Expand Down Expand Up @@ -312,8 +319,8 @@ func (l *L2OutputSubmitter) SendSlackNotification(proposerMetrics opsuccinctmetr

message := fmt.Sprintf("*Chain %d Proposer Metrics*:\n"+
"Contract is %d minutes behind L2 Finalized\n"+
"| L2 Unsafe | L2 Finalized | Contract L2 | Proven L2 |\n"+
"| %-9d | %-12d | %-11d | %-9d |\n"+
"| L2 Unsafe | L2 Finalized | Contract L2 | Proven L2 | Min to Agg |\n"+
"| %-9d | %-12d | %-11d | %-9d | %-9d |\n"+
"| Proving | Witness Gen | Unrequested |\n"+
"| %-9d | %-11d | %-11d |",
l.Cfg.L2ChainID,
Expand All @@ -322,6 +329,7 @@ func (l *L2OutputSubmitter) SendSlackNotification(proposerMetrics opsuccinctmetr
proposerMetrics.L2FinalizedBlock,
proposerMetrics.LatestContractL2Block,
proposerMetrics.HighestProvenContiguousL2Block,
proposerMetrics.MinBlockToProveToAgg,
proposerMetrics.NumProving,
proposerMetrics.NumWitnessgen,
proposerMetrics.NumUnrequested)
Expand Down
Loading

0 comments on commit 8ea5c02

Please sign in to comment.