diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index 0cf28af7f..bf5a85ac8 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -23,6 +23,9 @@ jobs: go-version-file: "go.mod" check-latest: true cache: true + - uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # nix:v2.24.6 + with: + nix_path: nixpkgs=channel:nixos-unstable - name: Run changes id: run run: ${{ inputs.run }} diff --git a/pkg/solana/txm/txm_internal_test.go b/pkg/solana/txm/txm_internal_test.go index adfa273f4..17b73d0e6 100644 --- a/pkg/solana/txm/txm_internal_test.go +++ b/pkg/solana/txm/txm_internal_test.go @@ -680,6 +680,7 @@ func TestTxm_Enqueue(t *testing.T) { cfg := config.NewDefault() mc := mocks.NewReaderWriter(t) mc.On("SendTx", mock.Anything, mock.Anything).Return(solana.Signature{}, nil).Maybe() + mc.On("SimulateTx", mock.Anything, mock.Anything, mock.Anything).Return(&rpc.SimulateTransactionResult{}, nil).Maybe() ctx := tests.Context(t) // mock solana keystore diff --git a/scripts/update-solana.sh b/scripts/update-solana.sh index 992301e8c..030026f33 100755 --- a/scripts/update-solana.sh +++ b/scripts/update-solana.sh @@ -41,7 +41,7 @@ else cd integration-tests sed -i -e "s~$testVersion~$latestVersion~" testconfig/default.toml cd .. - sed -i -e "s~$containerVersion~$latestContainer~" scripts/setup-localnet/localnet.sh + sed -i -e "s~$localnetVersion~$latestLocalnet~" scripts/setup-localnet/localnet.sh sed -i -e "s~$nixVersion~$latestNix~" solana.nix fi