Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/setup-node-if-needed/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
id: check-node
shell: bash
run: |
if command -v node >/dev/null 2>&1; then
if node --version 2>/dev/null | grep -q "v${{ inputs.node_version }}"; then
echo "installed=true" >> "$GITHUB_OUTPUT"
else
echo "installed=false" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- "master"
env:
NODE_VERSION: 20
NODE_VERSION: 22
jobs:
# Multiple jobs depend on having EVM and SVM artifacts available, so we upload them first in separate jobs.
upload-svm-artifacts:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
permissions:
contents: write
env:
NODE_VERSION: "20.x"
NODE_VERSION: "22"
EVM_ARTIFACTS_PATHS: |
artifacts
cache
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "git+https://github.com/across-protocol/across-smart-contracts-v2.git"
},
"engines": {
"node": ">=16.18.0"
"node": ">=22.16.0"
},
"files": [
"/contracts/**/*.sol",
Expand Down Expand Up @@ -64,7 +64,7 @@
"@solana-developers/helpers": "^2.4.0",
"@solana-program/address-lookup-table": "^0.7.0",
"@solana-program/token": "^0.5.1",
"@solana/kit": "^2.1.0",
"@solana/kit": "^2.3.0",
"@solana/spl-token": "^0.4.6",
"@solana/web3.js": "1.98.2",
"@types/yargs": "^17.0.33",
Expand Down Expand Up @@ -95,7 +95,7 @@
"@types/bn.js": "^5.1.0",
"@types/chai": "^4.3.5",
"@types/mocha": "^9.0.0",
"@types/node": "^12.0.0",
"@types/node": "^24.3.0",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"chai": "^4.3.7",
Expand Down
6 changes: 4 additions & 2 deletions src/svm/web3-v2/solanaProgramUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@ export async function readEvents(
commitment: Commitment = "confirmed"
) {
const txResult = await client.rpc
.getTransaction(txSignature, { commitment, maxSupportedTransactionVersion: 0 })
.getTransaction(txSignature, { encoding: "json", commitment, maxSupportedTransactionVersion: 0 })
.send();

if (txResult === null) return [];

return processEventFromTx(txResult, programId, programIdl);
// Ensure `version` field is always present in the response. @todo Drop this with next Anchor upgrade.
const txWithVersion = { ...txResult, version: txResult.version ?? 0 };
return processEventFromTx(txWithVersion, programId, programIdl);
}

/**
Expand Down
Loading