Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3d98bc4
binary scaffolding
itamarreif Apr 19, 2024
312ac95
cleanup config vars
itamarreif Apr 19, 2024
dc13bb6
cleanup names
itamarreif Apr 19, 2024
b36a152
merge w main and make bridge compile and no warnings
noot May 20, 2024
badadd1
rename astria-bridge to astria-bridge-withdrawer
noot May 20, 2024
743f57d
lint toml
noot May 20, 2024
687f371
clippy
noot May 20, 2024
fade698
lint
noot May 21, 2024
6b3e883
implement AstriaWithdrawer contract and ethereum watcher (#1086)
noot May 22, 2024
9e860e2
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 22, 2024
4d8a8ad
update AstriaWithdrawer contract to have separate methods for sequenc…
noot May 23, 2024
75a1b29
feat(bridge-withdrawer): Bridge withdrawer transaction submission (#1…
itamarreif May 24, 2024
16ebcf6
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 24, 2024
397ddbb
cleanup
noot May 24, 2024
c41a562
ethereum scripts, deploy and call instructions
noot May 24, 2024
014c51f
add example .env
noot May 24, 2024
3ccc909
lint
noot May 24, 2024
ee8ceec
lint
noot May 24, 2024
631b090
attempt to fix ci
noot May 24, 2024
4e78e99
comment out ci changes
noot May 24, 2024
455d532
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 24, 2024
b78dfd8
clippy and lint
noot May 24, 2024
c61bd2e
ci??
noot May 24, 2024
fc0237d
ci??
noot May 24, 2024
80336fa
ci??
noot May 24, 2024
7b71c86
ci??
noot May 24, 2024
d22c387
env updates and log
noot May 24, 2024
1879617
install foundry in ci
noot May 24, 2024
1b3c1f7
put solc back
noot May 24, 2024
0e115f7
don't cache pip
noot May 24, 2024
10ad97a
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 28, 2024
4ee6fd1
address comments
noot May 28, 2024
6ce8d8e
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 28, 2024
f914103
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 30, 2024
bee7fb3
implement ASSET_WITHDRAWAL_DECIMALS in contract and asset_withdrawal_…
noot May 30, 2024
4a914f8
clippy
noot May 30, 2024
2dfd7c4
run tests using foundry into their own job
noot May 31, 2024
7271f75
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
noot May 31, 2024
7aba534
fix nextest
noot May 31, 2024
8d38b31
submit sanity check works
itamarreif May 31, 2024
0876648
checktx and delivertx failure tests
itamarreif Jun 1, 2024
6940e98
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
itamarreif Jun 1, 2024
b399c13
clean up after merge
itamarreif Jun 1, 2024
7a793eb
get rid of rpc error tests because of backoff
itamarreif Jun 1, 2024
339bf24
fix clippy
itamarreif Jun 1, 2024
e64205d
clean up clippy
itamarreif Jun 3, 2024
1833420
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
itamarreif Jun 3, 2024
8c7d096
clean up missed merge conflict
itamarreif Jun 3, 2024
cc48995
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
itamarreif Jun 3, 2024
dcb38e0
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
itamarreif Jun 5, 2024
c515328
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/br…
itamarreif Jun 6, 2024
ca56bca
cleanup err message
itamarreif Jun 6, 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
4 changes: 4 additions & 0 deletions Cargo.lock

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

4 changes: 4 additions & 0 deletions crates/astria-bridge-withdrawer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ hyper = { workspace = true }
humantime = { workspace = true }
ibc-types = { workspace = true }
metrics = { workspace = true }
once_cell = { workspace = true }
pin-project-lite = { workspace = true }
prost = { workspace = true }
serde = { workspace = true, features = ["derive"] }
Expand Down Expand Up @@ -50,6 +51,9 @@ astria-grpc-mock = { path = "../astria-grpc-mock" }
config = { package = "astria-config", path = "../astria-config", features = [
"tests",
] }
tempfile = { workspace = true }
tendermint-rpc = { workspace = true }
wiremock = { workspace = true }

[build-dependencies]
astria-build-info = { path = "../astria-build-info", features = ["build"] }
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ pub(crate) fn event_to_action(
}

#[derive(Debug, Serialize, Deserialize)]
struct BridgeUnlockMemo {
block_number: U64,
transaction_hash: TxHash,
pub(crate) struct BridgeUnlockMemo {
pub(crate) block_number: U64,
pub(crate) transaction_hash: TxHash,
}

fn event_to_bridge_unlock(
Expand Down Expand Up @@ -109,10 +109,10 @@ fn event_to_bridge_unlock(
}

#[derive(Debug, Serialize, Deserialize)]
struct Ics20WithdrawalMemo {
memo: String,
block_number: U64,
transaction_hash: TxHash,
pub(crate) struct Ics20WithdrawalMemo {
pub(crate) memo: String,
pub(crate) block_number: U64,
pub(crate) transaction_hash: TxHash,
}

fn event_to_ics20_withdrawal(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pub(crate) mod astria_withdrawer;
mod convert;
pub(crate) mod convert;
mod watcher;

pub(crate) use watcher::Watcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ use super::{

mod builder;
mod signer;
#[cfg(test)]
mod tests;

pub(super) struct Submitter {
shutdown_token: CancellationToken,
Expand All @@ -60,14 +62,13 @@ pub(super) struct Submitter {

impl Submitter {
pub(super) async fn run(mut self) -> eyre::Result<()> {
self.state.set_submitter_ready();

let actual_chain_id =
get_sequencer_chain_id(self.sequencer_cometbft_client.clone()).await?;
ensure!(
self.sequencer_chain_id == actual_chain_id.to_string(),
"sequencer_chain_id provided in config does not match chain_id returned from sequencer"
);
self.state.set_submitter_ready();

let reason = loop {
select!(
Expand Down
Loading