From 27851d5436fb4e687cb743801fe0ecf76c1100e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Bo=C4=8Fa?= Date: Tue, 4 Mar 2025 11:01:38 +0100 Subject: [PATCH] feat(everstake): added everstake solana user agent --- packages/blockchain-link/package.json | 2 +- .../src/workers/solana/stakingAccounts.ts | 6 +++++- suite-common/wallet-utils/package.json | 3 ++- suite-common/wallet-utils/src/solanaStakingUtils.ts | 6 +++++- suite-common/wallet-utils/tsconfig.json | 1 + yarn.lock | 13 +++++++------ 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/blockchain-link/package.json b/packages/blockchain-link/package.json index 6d71c9444e0..01bddc6152c 100644 --- a/packages/blockchain-link/package.json +++ b/packages/blockchain-link/package.json @@ -72,7 +72,7 @@ "worker-loader": "^3.0.8" }, "dependencies": { - "@everstake/wallet-sdk-solana": "2.0.5", + "@everstake/wallet-sdk-solana": "2.0.8", "@solana-program/token": "^0.4.1", "@solana-program/token-2022": "^0.3.4", "@solana/web3.js": "^2.0.0", diff --git a/packages/blockchain-link/src/workers/solana/stakingAccounts.ts b/packages/blockchain-link/src/workers/solana/stakingAccounts.ts index 8c9cad69791..9e93b80913d 100644 --- a/packages/blockchain-link/src/workers/solana/stakingAccounts.ts +++ b/packages/blockchain-link/src/workers/solana/stakingAccounts.ts @@ -1,6 +1,7 @@ import { Network, Solana, isStake, stakeAccountState } from '@everstake/wallet-sdk-solana'; import { SolanaStakingAccount } from '@trezor/blockchain-link-types/src/solana'; +import { getSuiteVersion } from '@trezor/env-utils'; const EVERSTAKE_VOTER_PUBKEYS = [ '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF', // mainnet @@ -15,7 +16,10 @@ export const getSolanaStakingData = async ( ): Promise => { const network = isTestnet ? Network.Devnet : Network.Mainnet; - const solanaClient = new Solana(network, serverUrl); + const solanaClient = new Solana(network, { + rpc: serverUrl, + userAgent: `Trezor Suite ${getSuiteVersion()}`, + }); const delegations = await solanaClient.getDelegations(descriptor); if (!delegations || !delegations.result) { diff --git a/suite-common/wallet-utils/package.json b/suite-common/wallet-utils/package.json index 3bd6a9b1ce0..bbc63f980f9 100644 --- a/suite-common/wallet-utils/package.json +++ b/suite-common/wallet-utils/package.json @@ -12,7 +12,7 @@ "test-unit:watch": "yarn g:jest -c ../../jest.config.base.js -o --watch" }, "dependencies": { - "@everstake/wallet-sdk-solana": "2.0.5", + "@everstake/wallet-sdk-solana": "2.0.8", "@suite-common/fiat-services": "workspace:*", "@suite-common/metadata-types": "workspace:*", "@suite-common/suite-config": "workspace:*", @@ -26,6 +26,7 @@ "@trezor/blockchain-link-utils": "workspace:*", "@trezor/connect": "workspace:*", "@trezor/device-utils": "workspace:*", + "@trezor/env-utils": "workspace:*", "@trezor/urls": "workspace:*", "@trezor/utils": "workspace:*", "date-fns": "^2.30.0", diff --git a/suite-common/wallet-utils/src/solanaStakingUtils.ts b/suite-common/wallet-utils/src/solanaStakingUtils.ts index 5391316e710..c23e3893af8 100644 --- a/suite-common/wallet-utils/src/solanaStakingUtils.ts +++ b/suite-common/wallet-utils/src/solanaStakingUtils.ts @@ -8,6 +8,7 @@ import { supportedSolanaNetworkSymbols, } from '@suite-common/wallet-types'; import { SolanaStakingAccount } from '@trezor/blockchain-link-types/src/solana'; +import { getSuiteVersion } from '@trezor/env-utils'; import { PartialRecord } from '@trezor/type-utils'; import { BigNumber, isArrayMember } from '@trezor/utils'; @@ -47,7 +48,10 @@ export const getSolNetworkForWalletSdk = (symbol: NetworkSymbol): SolNetworkConf export const selectSolanaWalletSdkNetwork = (symbol: NetworkSymbol, url?: string) => { const { network } = getSolNetworkForWalletSdk(symbol); - return new Solana(network, url); + return new Solana(network, { + rpc: url, + userAgent: `Trezor Suite ${getSuiteVersion()}`, + }); }; export const calculateTotalSolStakingBalance = (stakingAccounts: SolanaStakingAccount[]) => { diff --git a/suite-common/wallet-utils/tsconfig.json b/suite-common/wallet-utils/tsconfig.json index 687b3f70d72..60de6fc9b5a 100644 --- a/suite-common/wallet-utils/tsconfig.json +++ b/suite-common/wallet-utils/tsconfig.json @@ -22,6 +22,7 @@ }, { "path": "../../packages/connect" }, { "path": "../../packages/device-utils" }, + { "path": "../../packages/env-utils" }, { "path": "../../packages/urls" }, { "path": "../../packages/utils" } ] diff --git a/yarn.lock b/yarn.lock index 28e8102e93a..be41eaf651d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3559,15 +3559,15 @@ __metadata: languageName: node linkType: hard -"@everstake/wallet-sdk-solana@npm:2.0.5": - version: 2.0.5 - resolution: "@everstake/wallet-sdk-solana@npm:2.0.5" +"@everstake/wallet-sdk-solana@npm:2.0.8": + version: 2.0.8 + resolution: "@everstake/wallet-sdk-solana@npm:2.0.8" dependencies: "@solana-program/compute-budget": "npm:^0.6.1" "@solana-program/stake": "npm:^0.1.0" "@solana-program/system": "npm:^0.6.2" "@solana/web3.js": "npm:2.0.0" - checksum: 10/5a608d04377e300fa10738911b0b0bea36f7fb8cc3fee35af29b2e55ed6b6008c169c5fb7ba2e9f72bfa3dfc606793851025c4641035f671a1dc60dd95349a6f + checksum: 10/0c82365fe2582c02cdf7cfc75cb9d28ed198522906ab9875c79a9a69c3b1d389e0d76563447178ef160c090368bc264f28b2ff2edf8934eb1d92ea867afd25c2 languageName: node linkType: hard @@ -9775,7 +9775,7 @@ __metadata: version: 0.0.0-use.local resolution: "@suite-common/wallet-utils@workspace:suite-common/wallet-utils" dependencies: - "@everstake/wallet-sdk-solana": "npm:2.0.5" + "@everstake/wallet-sdk-solana": "npm:2.0.8" "@suite-common/fiat-services": "workspace:*" "@suite-common/metadata-types": "workspace:*" "@suite-common/suite-config": "workspace:*" @@ -9789,6 +9789,7 @@ __metadata: "@trezor/blockchain-link-utils": "workspace:*" "@trezor/connect": "workspace:*" "@trezor/device-utils": "workspace:*" + "@trezor/env-utils": "workspace:*" "@trezor/urls": "workspace:*" "@trezor/utils": "workspace:*" date-fns: "npm:^2.30.0" @@ -11554,7 +11555,7 @@ __metadata: version: 0.0.0-use.local resolution: "@trezor/blockchain-link@workspace:packages/blockchain-link" dependencies: - "@everstake/wallet-sdk-solana": "npm:2.0.5" + "@everstake/wallet-sdk-solana": "npm:2.0.8" "@solana-program/token": "npm:^0.4.1" "@solana-program/token-2022": "npm:^0.3.4" "@solana/web3.js": "npm:^2.0.0"