Skip to content

Commit 878477e

Browse files
committed
Merge remote-tracking branch 'origin/main' into yjamin/aleo-provider
2 parents 7cfaa07 + 6d61936 commit 878477e

11 files changed

Lines changed: 16913 additions & 9488 deletions

File tree

.github/workflows/agent-release-artifacts.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
OS: depot-macos-latest
3333
- TARGET: aarch64-apple-darwin
3434
OS: depot-macos-latest
35-
- TARGET: x86_64-pc-windows-msvc
36-
OS: depot-windows-2022-4
3735
runs-on: ${{ matrix.OS }}
3836
steps:
3937
- name: checkout
@@ -51,12 +49,6 @@ jobs:
5149
[target.aarch64-unknown-linux-musl]
5250
linker = "aarch64-linux-gnu-gcc"
5351
EOF
54-
- name: windows setup
55-
if: ${{ matrix.OS == 'depot-windows-2022-4' }}
56-
run: |
57-
choco install llvm -y
58-
$llvmPath = 'C:\Program Files\LLVM\bin'
59-
echo "LIBCLANG_PATH=$llvmPath" >> $env:GITHUB_ENV
6052
- name: setup rust
6153
uses: dtolnay/rust-toolchain@stable
6254
with:
@@ -72,7 +64,7 @@ jobs:
7264
run: chmod ug+x,-w relayer scraper validator
7365
working-directory: rust/main/target/${{ matrix.TARGET }}/release
7466
- name: upload binaries
75-
uses: actions/upload-artifact@v4
67+
uses: actions/upload-artifact@v5
7668
with:
7769
name: ${{ matrix.TARGET }}-${{ needs.prepare.outputs.tag_name }}
7870
path: |

.registryrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e8866ba34bff55145770582f12048114d9af2689
1+
93a21a90c1fcff8bf6e449c1fc4db9290c43f62e

rust/main/agents/relayer/src/msg/message_processor.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ async fn prepare_lander_task(
400400
};
401401

402402
let batch_to_process = confirm_already_submitted_operations(
403-
entrypoint.clone(),
403+
entrypoint.clone() as Arc<dyn Entrypoint + Send + Sync>,
404404
&confirm_queue,
405405
db.clone(),
406406
batch,
@@ -423,7 +423,7 @@ async fn prepare_lander_task(
423423
/// If the payload is not dropped, the operation is pushed to the confirmation queue.
424424
/// If the payload is dropped, does not exist or there is issue in retrieving payload or its status, the operation will go through prepare logic.
425425
async fn confirm_already_submitted_operations(
426-
entrypoint: Arc<DispatcherEntrypoint>,
426+
entrypoint: Arc<dyn Entrypoint + Send + Sync>,
427427
confirm_queue: &OpQueue,
428428
db: Arc<dyn HyperlaneDb>,
429429
batch: Vec<QueueOperation>,
@@ -448,7 +448,7 @@ async fn confirm_already_submitted_operations(
448448
}
449449

450450
async fn has_operation_been_submitted(
451-
entrypoint: Arc<DispatcherEntrypoint>,
451+
entrypoint: Arc<dyn Entrypoint + Send + Sync>,
452452
db: Arc<dyn HyperlaneDb>,
453453
op: &QueueOperation,
454454
) -> bool {
@@ -1073,3 +1073,6 @@ impl MessageProcessorMetrics {
10731073
}
10741074
}
10751075
}
1076+
1077+
#[cfg(test)]
1078+
mod tests;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod tests_confirm_already_submitted_operations;
2+
mod tests_has_operation_been_submitted;

0 commit comments

Comments
 (0)