Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: conduit #151

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contracts/opsuccinctl2ooconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"rollupConfigHash": "0x50efb1261373319cd7ba429612d9a18e585627618ec04560e7d27ba7e36d4c05",
"startingBlockNumber": 2388661,
"startingOutputRoot": "0x8ef839cbbc8228ec45ac3a17a1dc7323c0b6aff59e3f9b27a5374dcefedb4417",
"startingTimestamp": 1728264674,
"startingBlockNumber": 2438213,
"startingOutputRoot": "0xbb0cb9544faaf0eca309b10001992e16caef3aa76b02284619c40242374828eb",
"startingTimestamp": 1728363778,
"submissionInterval": 1000,
"verifierGateway": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"aggregationVkey": "0x00e4dc504bcd3355a4bf7382ba15d74e058aa144948edb753879055d243ebad0",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- ${ENV_FILE:-.env}
restart: unless-stopped
ports:
- "3000:3000"
- "3001:3001"

# OP Succinct Proposer
op-succinct-proposer:
Expand Down
12 changes: 5 additions & 7 deletions proposer/db-utils/query_proofs.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,26 +87,24 @@ def query_agg_proofs(db_path) -> [ProofRequest]:


if __name__ == "__main__":
# Load environment variables from .env file
load_dotenv()
# If ENV_FILE is set, load environment variables from .env file
if os.getenv('ENV_FILE') is not None:
load_dotenv(os.getenv('ENV_FILE'))

# Get L2OO_ADDRESS from environment variables
L2OO_ADDRESS = os.getenv('L2OO_ADDRESS')
if L2OO_ADDRESS is None:
raise ValueError("L2OO_ADDRESS not found in .env file")

print(f"L2OO_ADDRESS: {L2OO_ADDRESS}")
db_path = "../../db/11155420/proofs.db"
db_path = "../../db/13269/proofs.db"

# Get all span proofs
print("\nSpan Proofs:")
span_proofs = query_span_proofs(db_path)

for proof in span_proofs:
proof_time_difference = None
if proof.proof_request_time is not None:
proof_time_difference = proof.proof_request_time - proof.request_added_time
print(f"Request ID: {proof.id}, Type: {proof.type}, Start Block: {proof.start_block}, End Block: {proof.end_block}, Status: {proof.status}, Prover Request ID: {proof.prover_request_id}, Request Added Time: {proof.request_added_time}, Proof Request Time: {proof.proof_request_time}, Proof Time Difference: {proof_time_difference}")
print(f"Proof ID: {proof.id}, Type: {proof.type}, Start Block: {proof.start_block}, End Block: {proof.end_block}, Status: {proof.status}, Prover Request ID: {proof.prover_request_id}")

# Query for aggregation proofs
print("\nAggregation Proofs:")
Expand Down
4 changes: 2 additions & 2 deletions proposer/op/op_proposer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
--private-key=${PRIVATE_KEY} \
--l1-eth-rpc=${L1_RPC} \
--beacon-rpc=${L1_BEACON_RPC} \
--max-concurrent-proof-requests=${MAX_CONCURRENT_PROOF_REQUESTS:-10} \
--max-concurrent-proof-requests=${MAX_CONCURRENT_PROOF_REQUESTS:-5} \
--db-path=${DB_PATH:-/usr/local/bin/dbdata} \
--op-succinct-server-url=${OP_SUCCINCT_SERVER_URL:-http://op-succinct-server:3000} \
--max-block-range-per-span-proof=${MAX_BLOCK_RANGE_PER_SPAN_PROOF:-20} \
--max-block-range-per-span-proof=${MAX_BLOCK_RANGE_PER_SPAN_PROOF:-500} \
--use-cached-db=${USE_CACHED_DB:-false}
4 changes: 2 additions & 2 deletions proposer/succinct/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ COPY programs ./programs
# Build the server
RUN cargo build --bin server --release

# Expose port 3000
EXPOSE 3000
# Expose port 3001
EXPOSE 3001

# Run the server
CMD ["/app/target/release/server"]
2 changes: 1 addition & 1 deletion proposer/succinct/bin/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async fn main() {
.layer(DefaultBodyLimit::disable())
.layer(RequestBodyLimitLayer::new(102400 * 1024 * 1024));

let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
let listener = tokio::net::TcpListener::bind("0.0.0.0:3001").await.unwrap();

info!("Server listening on {}", listener.local_addr().unwrap());
axum::serve(listener, app).await.unwrap();
Expand Down
Loading