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

feat(proto, core, sequencer)!: add traceability to rollup deposits #1410

Merged
merged 44 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
b154955
Add traceability to rollup deposits
ethanoroshiba Aug 27, 2024
bef575f
Update geth devtag
ethanoroshiba Aug 27, 2024
92a6146
Update chart versions
ethanoroshiba Aug 27, 2024
9459123
helm dependency update
ethanoroshiba Aug 27, 2024
ec1e224
Fix bridge_lock fee calculation
ethanoroshiba Aug 27, 2024
dca519d
Add chart clarity
ethanoroshiba Aug 27, 2024
779535e
Add comment space
ethanoroshiba Aug 27, 2024
193d3da
Minor cleanup
ethanoroshiba Aug 27, 2024
f8344f1
Requested changes
ethanoroshiba Aug 29, 2024
bebd0cc
Merge branch 'main' into ENG-744/add_deposit_source
ethanoroshiba Aug 29, 2024
355dc98
Update chart.lock
ethanoroshiba Aug 29, 2024
91db783
fix test
ethanoroshiba Aug 29, 2024
aae8ed8
Migrate back to encode::hex instead of ethers
ethanoroshiba Aug 30, 2024
a8274ef
Merge branch 'main' into ENG-744/add_deposit_source
ethanoroshiba Aug 30, 2024
1fd6ad2
Update snapshot
ethanoroshiba Aug 30, 2024
3288e9a
Cleanup
ethanoroshiba Aug 30, 2024
de2a38c
Requested changes from Janis
ethanoroshiba Aug 30, 2024
7645a19
Proto lint
ethanoroshiba Aug 30, 2024
cf70451
Fix tests
ethanoroshiba Aug 30, 2024
bd02b0c
Requested changes
ethanoroshiba Sep 3, 2024
4bd0908
Revert to string
ethanoroshiba Sep 3, 2024
1e38264
Minor changes
ethanoroshiba Sep 3, 2024
d374265
fix(charts)!: sequencer-relayer chart correct startup env var (#1437)
joroshiba Aug 30, 2024
a0d7da9
chore(metrics): restrict `metrics` crate usage to `astria-telemetry` …
Fraser999 Aug 30, 2024
e1e515c
chore: ibc e2e smoke test (#1284)
steezeburger Aug 30, 2024
cdf625f
Requested changes
ethanoroshiba Sep 4, 2024
305f369
Merge branch 'main' of https://github.com/astriaorg/astria
ethanoroshiba Sep 4, 2024
2edd08b
Merge branch 'main' into ENG-744/add_deposit_source
ethanoroshiba Sep 4, 2024
d057d72
Minor changes
ethanoroshiba Sep 4, 2024
174a52b
Delete try_from_raw
ethanoroshiba Sep 4, 2024
84f8241
Chart version bump
ethanoroshiba Sep 4, 2024
3aec12b
Requested changes
ethanoroshiba Sep 4, 2024
3da2a37
Remove option from transaction context
ethanoroshiba Sep 4, 2024
e7a8972
Minor changes
ethanoroshiba Sep 4, 2024
77e8beb
Err instead of panic when transaction context is missing
ethanoroshiba Sep 4, 2024
a8c45e9
Requested changes
ethanoroshiba Sep 4, 2024
2911562
Minor update
ethanoroshiba Sep 4, 2024
c048e1c
Merge branch 'main' into ENG-744/add_deposit_source
ethanoroshiba Sep 9, 2024
da84a7f
Fix merge changes
ethanoroshiba Sep 9, 2024
22c606e
rust fmt
ethanoroshiba Sep 9, 2024
89b0f5a
Requested verbage change
ethanoroshiba Sep 9, 2024
faaf2ac
Merge branch 'main' into ENG-744/add_deposit_source
ethanoroshiba Sep 9, 2024
47518d7
Update snapshot
ethanoroshiba Sep 9, 2024
934deab
Update delete_current_source() to delete_current_transaction_context()
ethanoroshiba Sep 9, 2024
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
2 changes: 1 addition & 1 deletion charts/evm-rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.26.1
version: 0.27.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion charts/evm-rollup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ images:
geth:
repo: ghcr.io/astriaorg/astria-geth
tag: 0.14.0
devTag: latest
devTag: pr-42 # update to latest once geth changes(https://github.com/astriaorg/astria-geth/pull/42) merged
overrideTag: ""
conductor:
repo: ghcr.io/astriaorg/conductor
Expand Down
6 changes: 3 additions & 3 deletions charts/evm-stack/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
version: 0.3.5
- name: evm-rollup
repository: file://../evm-rollup
version: 0.26.1
version: 0.27.0
- name: composer
repository: file://../composer
version: 0.1.2
Expand All @@ -20,5 +20,5 @@ dependencies:
- name: blockscout-stack
repository: https://blockscout.github.io/helm-charts
version: 1.6.2
digest: sha256:6406abf0864a14a8268dc0c78512ca5d18779e9f20dac8ad540399ddcfbe062c
generated: "2024-08-28T09:44:42.794673-04:00"
digest: sha256:0f28c7685337429db5cef3b9d54dc114534306c9cc36b2835cf2ce989ab29c79
generated: "2024-08-29T14:29:57.519173-05:00"
4 changes: 2 additions & 2 deletions charts/evm-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.1
version: 0.5.0

dependencies:
- name: celestia-node
version: "0.3.5"
repository: "file://../celestia-node"
condition: celestia-node.enabled
- name: evm-rollup
version: 0.26.1
version: 0.27.0
repository: "file://../evm-rollup"
- name: composer
version: 0.1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ fn rollup_height_from_signed_transaction(
.expect("action is already checked to be either BridgeUnlock or Ics20Withdrawal");

info!(
last_batch.tx_hash = %telemetry::display::hex(&signed_transaction.sha256_of_proto_encoding()),
last_batch.tx_hash = signed_transaction.id().get(),
ethanoroshiba marked this conversation as resolved.
Show resolved Hide resolved
last_batch.rollup_height = last_batch_rollup_height,
"extracted rollup height from last batch of withdrawals",
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl Submitter {

// sign transaction
let signed = unsigned.into_signed(signer.signing_key());
debug!(tx_hash = %telemetry::display::hex(&signed.sha256_of_proto_encoding()), "signed transaction");
debug!(tx_hash = &signed.id().get(), "signed transaction");
ethanoroshiba marked this conversation as resolved.
Show resolved Hide resolved

// submit transaction and handle response
let rsp = submit_tx(
Expand Down Expand Up @@ -221,7 +221,7 @@ fn report_exit(reason: eyre::Result<&str>) {
skip_all,
fields(
nonce = tx.nonce(),
transaction.hash = %telemetry::display::hex(&tx.sha256_of_proto_encoding()),
transaction.hash = tx.id().get(),
ethanoroshiba marked this conversation as resolved.
Show resolved Hide resolved
),
err
)]
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-composer/src/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ impl Future for SubmitFut {
info!(
nonce.actual = *this.nonce,
bundle = %telemetry::display::json(&SizedBundleReport(this.bundle)),
transaction.hash = %telemetry::display::hex(&tx.sha256_of_proto_encoding()),
transaction.hash = tx.id().get(),
ethanoroshiba marked this conversation as resolved.
Show resolved Hide resolved
"submitting transaction to sequencer",
);
SubmitState::WaitingForSend {
Expand Down Expand Up @@ -767,7 +767,7 @@ impl Future for SubmitFut {
info!(
nonce.resubmission = *this.nonce,
bundle = %telemetry::display::json(&SizedBundleReport(this.bundle)),
transaction.hash = %telemetry::display::hex(&tx.sha256_of_proto_encoding()),
transaction.hash = tx.id().get(),
ethanoroshiba marked this conversation as resolved.
Show resolved Hide resolved
"resubmitting transaction to sequencer with new nonce",
);
SubmitState::WaitingForSend {
Expand Down
16 changes: 16 additions & 0 deletions crates/astria-core/src/generated/astria.primitive.v1.rs

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

91 changes: 91 additions & 0 deletions crates/astria-core/src/generated/astria.primitive.v1.serde.rs

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

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

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

Loading
Loading