Skip to content

Commit 7a5e952

Browse files
authored
Merge pull request #163 from Squads-Protocol/chore/green-build
Updates and cleanups to get tests and CI passing green
2 parents af071fd + c2645e9 commit 7a5e952

7 files changed

Lines changed: 331 additions & 403 deletions

File tree

.github/actions/setup-anchor/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runs:
2222
- if: steps.restore-cache-anchor-cargo.outputs.cache-hit != 'true'
2323
name: Install Anchor CLI
2424
shell: bash
25-
run: cargo install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_VERSION }} anchor-cli --locked
25+
run: cargo +1.78.0 install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_VERSION }} anchor-cli --locked
2626

2727
- if: steps.restore-cache-anchor-cargo.outputs.cache-hit != 'true'
2828
name: Save Cargo Cache with Installed Anchor CLI

.github/actions/setup-solana/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
max_attempts: 10
2020
retry_on: error
2121
shell: bash
22-
command: sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_CLI_VERSION }}/install)"
22+
command: sh -c "$(curl -sSfL https://release.anza.xyz/v${{ env.SOLANA_CLI_VERSION }}/install)"
2323
- run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
2424
shell: bash
2525
- run: solana-keygen new --no-bip39-passphrase

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: ./.github/workflows/reusable-tests.yaml
1414
with:
1515
cache: true
16-
solana_cli_version: 1.18.4
16+
solana_cli_version: 1.18.16
1717
anchor_version: 0.29.0
1818
node_version: 18
1919
cargo_profile: debug

programs/squads_multisig_program/src/instructions/spending_limit_use.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pub struct SpendingLimitUse<'info> {
8989
impl SpendingLimitUse<'_> {
9090
fn validate(&self) -> Result<()> {
9191
let Self {
92-
multisig,
9392
member,
9493
spending_limit,
9594
mint,

programs/squads_multisig_program/src/instructions/vault_transaction_create.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use anchor_lang::prelude::*;
2-
use anchor_lang::system_program;
32

43
use crate::errors::*;
54
use crate::state::*;

sdk/rs/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ pub mod utils {
591591
AccountMeta::new(self.multisig, false),
592592
AccountMeta::new_readonly(self.member, true),
593593
AccountMeta::new(self.proposal, false),
594-
AccountMeta::new(self.transaction, false),
594+
AccountMeta::new_readonly(self.transaction, false),
595595
if let Some(rent_payer) = self.rent_payer {
596596
AccountMeta::new(rent_payer, true)
597597
} else {

yarn.lock

Lines changed: 327 additions & 397 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)