From fbf299f7b99012f7d85ddd89f2f2f3e00f4efd3a Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 18:41:06 +0200 Subject: [PATCH 1/6] Updated some dependencies --- lake-primitives/Cargo.toml | 8 ++++---- lake-primitives/src/types/delegate_actions.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lake-primitives/Cargo.toml b/lake-primitives/Cargo.toml index bbbb454..37a723e 100644 --- a/lake-primitives/Cargo.toml +++ b/lake-primitives/Cargo.toml @@ -9,10 +9,10 @@ repository.workspace = true [dependencies] anyhow = "1.0.51" -near-crypto = "0.17.0" -near-primitives-core = "0.17.0" -near-primitives = "0.17.0" -near-indexer-primitives = "0.17.0" +near-crypto = "0.21.2" +near-primitives-core = "0.21.2" +near-primitives = "0.21.2" +near-indexer-primitives = "0.21.2" paste = "1.0.12" serde = { version = "1", features = ["derive"] } serde_json = "1.0.75" diff --git a/lake-primitives/src/types/delegate_actions.rs b/lake-primitives/src/types/delegate_actions.rs index 5375303..4ac23b3 100644 --- a/lake-primitives/src/types/delegate_actions.rs +++ b/lake-primitives/src/types/delegate_actions.rs @@ -216,13 +216,13 @@ impl DelegateDeleteAccount { impl DelegateAction { // Tries to convert a `near_primitives::delegate_action::DelegateAction` into a [Vec]. pub fn try_from_delegate_action( - delegate_action: &near_primitives::delegate_action::DelegateAction, + delegate_action: &near_primitives::action::delegate::DelegateAction, ) -> Result, &'static str> { let mut actions = Vec::with_capacity(delegate_action.actions.len()); for nearcore_action in delegate_action.clone().actions { let action = match views::ActionView::from( - >::into(nearcore_action), ) { From fcce7fcff2318990339c7024cc3d325a62eafb5e Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 18:50:02 +0200 Subject: [PATCH 2/6] Update runner version for a new cargo So we can build newer dependencies --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fb7897..fb9d58b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: rustfmt: name: rustfmt - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v2 @@ -49,7 +49,7 @@ jobs: rustclippy: name: rustclippy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v2 From 1536b72657d7e869f4bc6d9c2021b65d13fc771a Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 18:56:09 +0200 Subject: [PATCH 3/6] Updated AWS --- lake-framework/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lake-framework/Cargo.toml b/lake-framework/Cargo.toml index 75dc44d..694fd5c 100644 --- a/lake-framework/Cargo.toml +++ b/lake-framework/Cargo.toml @@ -7,10 +7,10 @@ license.workspace = true repository.workspace = true [dependencies] -aws-config = { version = "1.0.0", features = ["behavior-version-latest"] } -aws-types = "1.0.0" -aws-credential-types = "1.0.0" -aws-sdk-s3 = "0.39.0" +aws-config = { version = "1.4.0", features = ["behavior-version-latest"] } +aws-types = "1.2.0" +aws-credential-types = "1.2.0" +aws-sdk-s3 = "1.24.0" async-stream = "0.3.3" async-trait = "0.1.64" derive_builder = "0.11.2" From e2bc6294555e9d79221fa226571373daa4d401da Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 19:15:09 +0200 Subject: [PATCH 4/6] Updateding all to latest (because some were already there) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb9d58b..5ae7c3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: rustfmt: name: rustfmt - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v2 @@ -49,7 +49,7 @@ jobs: rustclippy: name: rustclippy - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v2 From 9a358764f64d9e1482a4af48ac42097cdbc679d2 Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 19:38:13 +0200 Subject: [PATCH 5/6] Another swing at the CI --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ae7c3f..da06309 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,13 @@ jobs: check: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 + - name: install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable - name: Run check run: cargo check @@ -27,6 +31,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable - name: Run check run: cargo test From e4eaa0c1b1c1d63c45963474db7ee82c38557d54 Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 10 May 2024 19:57:36 +0200 Subject: [PATCH 6/6] Fix the rust toolchain the right way --- .github/workflows/ci.yml | 15 +++------------ rust-toolchain | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da06309..1fb7897 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,9 @@ jobs: check: runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - - name: install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - name: Run check run: cargo check @@ -31,17 +27,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - name: Run check run: cargo test rustfmt: name: rustfmt - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout repository uses: actions/checkout@v2 @@ -58,7 +49,7 @@ jobs: rustclippy: name: rustclippy - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/rust-toolchain b/rust-toolchain index 4934985..5422724 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.69.0 +1.78.0