Skip to content

Conversation

@JuArce
Copy link
Collaborator

@JuArce JuArce commented Mar 27, 2025

Merge testnet into staging

Description

This PR pulls changes from testnet and solves conflicts

Type of change

Please delete options that are not relevant.

  • New feature
  • Bug fix
  • Optimization
  • Refactor

Checklist

  • “Hotfix” to testnet, everything else to staging
  • Linked to Github Issue
  • This change depends on code or research by an external entity
    • Acknowledgements were updated to give credit
  • Unit tests added
  • This change requires new documentation.
    • Documentation has been added/updated.
  • This change is an Optimization
    • Benchmarks added/run
  • Has a known issue
  • If your PR changes the Operator compatibility (Ex: Upgrade prover versions)
    • This PR adds compatibility for operator for both versions and do not change batcher/docs/examples
    • This PR updates batcher and docs/examples to the newer version. This requires the operator are already updated to be compatible

JuArce added 3 commits March 27, 2025 10:59
# Conflicts:
#	batcher/aligned-sdk/src/core/types.rs
#	batcher/aligned-sdk/src/sdk.rs
#	batcher/aligned/src/main.rs
@MauroToscano MauroToscano merged commit 0d9731e into staging Mar 27, 2025
2 checks passed
@MauroToscano MauroToscano deleted the merge_testnet_into_staging branch March 27, 2025 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants