test: mock chainlink

test: other polishes

Author: andreivladbrg

bun.lock

@@ -21,9 +21,7 @@
         "keccak256": "^1.0.6",
         "lint-staged": "^16.1.2",
         "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
         "merkletreejs": "^0.5.2",
-        "node-fetch": "^3.3.2",
         "prettier": "^2.8.8",
         "solana-bankrun": "^0.4.0",
         "typescript": "5.8.3",
@@ -117,7 +115,7 @@
 
     "@noble/ciphers": ["@noble/[email protected]", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
 
-    "@noble/curves": ["@noble/[email protected].6", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-GIKz/j99FRthB8icyJQA51E8Uk5hXmdyThjgQXRKiv9h0zeRlzSCLIzFw6K1LotZ3XuB7yzlf76qk7uBmTdFqA=="],
+    "@noble/curves": ["@noble/[email protected].2", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g=="],
 
     "@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
 
@@ -195,7 +193,7 @@
 
     "@solana/spl-token-metadata": ["@solana/[email protected]", "", { "dependencies": { "@solana/codecs": "2.0.0-rc.1" }, "peerDependencies": { "@solana/web3.js": "^1.95.3" } }, "sha512-7sMt1rsm/zQOQcUWllQX9mD2O6KhSAtY1hFR2hfFwgqfFWzSY9E9GDvFVNYUI1F0iQKcm6HmePU9QbKRXTEBiA=="],
 
-    "@solana/web3.js": ["@solana/[email protected].2", "", { "dependencies": { "@babel/runtime": "^7.25.0", "@noble/curves": "^1.4.2", "@noble/hashes": "^1.4.0", "@solana/buffer-layout": "^4.0.1", "@solana/codecs-numbers": "^2.1.0", "agentkeepalive": "^4.5.0", "bn.js": "^5.2.1", "borsh": "^0.7.0", "bs58": "^4.0.1", "buffer": "6.0.3", "fast-stable-stringify": "^1.0.0", "jayson": "^4.1.1", "node-fetch": "^2.7.0", "rpc-websockets": "^9.0.2", "superstruct": "^2.0.2" } }, "sha512-BqVwEG+TaG2yCkBMbD3C4hdpustR4FpuUFRPUmqRZYYlPI9Hg4XMWxHWOWRzHE9Lkc9NDjzXFX7lDXSgzC7R1A=="],
+    "@solana/web3.js": ["@solana/[email protected].4", "", { "dependencies": { "@babel/runtime": "^7.25.0", "@noble/curves": "^1.4.2", "@noble/hashes": "^1.4.0", "@solana/buffer-layout": "^4.0.1", "@solana/codecs-numbers": "^2.1.0", "agentkeepalive": "^4.5.0", "bn.js": "^5.2.1", "borsh": "^0.7.0", "bs58": "^4.0.1", "buffer": "6.0.3", "fast-stable-stringify": "^1.0.0", "jayson": "^4.1.1", "node-fetch": "^2.7.0", "rpc-websockets": "^9.0.2", "superstruct": "^2.0.2" } }, "sha512-vv9lfnvjUsRiq//+j5pBdXig0IQdtzA0BRZ3bXEP4KaIyF1CcaydWqgyzQgfZMNIsWNWmG+AUHwPy4AHOD6gpw=="],
 
     "@swc/helpers": ["@swc/[email protected]", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="],
 
@@ -295,8 +293,6 @@
 
     "crypto-js": ["[email protected]", "", {}, "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="],
 
-    "data-uri-to-buffer": ["[email protected]", "", {}, "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="],
-
     "dayjs": ["[email protected]", "", {}, "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="],
 
     "debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
@@ -331,8 +327,6 @@
 
     "fdir": ["[email protected]", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w=="],
 
-    "fetch-blob": ["[email protected]", "", { "dependencies": { "node-domexception": "^1.0.0", "web-streams-polyfill": "^3.0.3" } }, "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="],
-
     "fflate": ["[email protected]", "", {}, "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="],
 
     "file-uri-to-path": ["[email protected]", "", {}, "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="],
@@ -341,8 +335,6 @@
 
     "flatted": ["[email protected]", "", {}, "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg=="],
 
-    "formdata-polyfill": ["[email protected]", "", { "dependencies": { "fetch-blob": "^3.1.2" } }, "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="],
-
     "fsevents": ["[email protected]", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
 
     "get-east-asian-width": ["[email protected]", "", {}, "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ=="],
@@ -381,8 +373,6 @@
 
     "lodash": ["[email protected]", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="],
 
-    "lodash-es": ["[email protected]", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="],
-
     "log-update": ["[email protected]", "", { "dependencies": { "ansi-escapes": "^7.0.0", "cli-cursor": "^5.0.0", "slice-ansi": "^7.1.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w=="],
 
     "loupe": ["[email protected]", "", {}, "sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw=="],
@@ -405,9 +395,7 @@
 
     "node-addon-api": ["[email protected]", "", {}, "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="],
 
-    "node-domexception": ["[email protected]", "", {}, "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="],
-
-    "node-fetch": ["[email protected]", "", { "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } }, "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="],
+    "node-fetch": ["[email protected]", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
 
     "node-gyp-build": ["[email protected]", "", { "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ=="],
 
@@ -529,8 +517,6 @@
 
     "vitest": ["[email protected]", "", { "dependencies": { "@types/chai": "^5.2.2", "@vitest/expect": "3.2.4", "@vitest/mocker": "3.2.4", "@vitest/pretty-format": "^3.2.4", "@vitest/runner": "3.2.4", "@vitest/snapshot": "3.2.4", "@vitest/spy": "3.2.4", "@vitest/utils": "3.2.4", "chai": "^5.2.0", "debug": "^4.4.1", "expect-type": "^1.2.1", "magic-string": "^0.30.17", "pathe": "^2.0.3", "picomatch": "^4.0.2", "std-env": "^3.9.0", "tinybench": "^2.9.0", "tinyexec": "^0.3.2", "tinyglobby": "^0.2.14", "tinypool": "^1.1.1", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0", "vite-node": "3.2.4", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "@vitest/browser": "3.2.4", "@vitest/ui": "3.2.4", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@types/debug", "@types/node", "@vitest/browser", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A=="],
 
-    "web-streams-polyfill": ["[email protected]", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="],
-
     "webidl-conversions": ["[email protected]", "", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="],
 
     "whatwg-url": ["[email protected]", "", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="],
@@ -565,12 +551,8 @@
 
     "@solana/options/@solana/errors": ["@solana/[email protected]", "", { "dependencies": { "chalk": "^5.3.0", "commander": "^12.1.0" }, "peerDependencies": { "typescript": ">=5" }, "bin": { "errors": "bin/cli.mjs" } }, "sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ=="],
 
-    "@solana/web3.js/node-fetch": ["[email protected]", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
-
     "@solana/web3.js/superstruct": ["[email protected]", "", {}, "sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A=="],
 
-    "cross-fetch/node-fetch": ["[email protected]", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
-
     "jayson/@types/node": ["@types/[email protected]", "", {}, "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="],
 
     "jayson/commander": ["[email protected]", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],
@@ -589,8 +571,6 @@
 
     "rpc-websockets/eventemitter3": ["[email protected]", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
 
-    "viem/@noble/curves": ["@noble/[email protected]", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g=="],
-
     "@solana/codecs-data-structures/@solana/errors/commander": ["[email protected]", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
     "@solana/codecs-strings/@solana/errors/commander": ["[email protected]", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],

package.json

@@ -28,8 +28,6 @@
     "keccak256": "^1.0.6",
     "lint-staged": "^16.1.2",
     "lodash": "^4.17.21",
-    "lodash-es": "^4.17.21",
-    "node-fetch": "^3.3.2",
     "merkletreejs": "^0.5.2",
     "prettier": "^2.8.8",
     "solana-bankrun": "^0.4.0",

scripts/ts/init-lockup.ts

@@ -117,7 +117,7 @@ async function configureTestingEnvironment() {
 
 async function initSablierLockup() {
   await lockupProgram.methods
-    .initialize(senderKeys.publicKey, ProgramId.CHAINLINK_PROGRAM_ID, ProgramId.CHAINLINK_SOL_USD_FEED_ID)
+    .initialize(senderKeys.publicKey, ProgramId.CHAINLINK_PROGRAM, ProgramId.CHAINLINK_SOL_USD_FEED)
     .signers([senderKeys])
     .accounts({
       initializer: senderKeys.publicKey,

scripts/ts/init-merkle-instant.ts

@@ -32,7 +32,7 @@ async function configureTestingEnvironment() {
 
 async function initSablierMerkleInstant() {
   await merkleInstantProgram.methods
-    .initialize(senderKeys.publicKey, ProgramId.CHAINLINK_PROGRAM_ID, ProgramId.CHAINLINK_SOL_USD_FEED_ID)
+    .initialize(senderKeys.publicKey, ProgramId.CHAINLINK_PROGRAM, ProgramId.CHAINLINK_SOL_USD_FEED)
     .signers([senderKeys])
     .accounts({
       initializer: senderKeys.publicKey,

tests/common/chainlink-mock.ts

@@ -0,0 +1,62 @@
+import { LAMPORTS_PER_SOL } from "@solana/web3.js";
+import type BN from "bn.js";
+import { type AddedAccount } from "solana-bankrun";
+import { ProgramId } from "../../lib/constants";
+import { toBn } from "../../lib/helpers";
+
+/// TODO: add multiple mocks scenarios to match the EVM ones:
+/// https://github.com/sablier-labs/evm-utils/blob/9a4139fed83788c5ffb455193f5005abf02ea366/src/mocks/ChainlinkMocks.sol
+export class ChainlinkMock {
+  /// To get the mock data run the CLI: `solana account 99B2bTijsU6f1GCT73HmdR7HCFFjGMBcPZY6jZ96ynrR --url devnet --output json`
+  /// This data is mocked at "1754142441" Unix timestamp
+  public MOCK_CHAINLINK_DATA =
+    "YLNFQoCBSXUCAWQUUYa2ANnUYYrbqZcNlEBTsnm1vMbAD/Shxwnxadi/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAD9IzGmE6swmiVX6E+mpeINgNJ4h4AyDGib6NC7wlNPTCAvIFVTRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAr+bMBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7PsAXAAAAAOkWjmgAAAAAoTdp0wMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+
+  async accountData(): Promise<AddedAccount> {
+    const MOCK_ACCOUNT_DATA = new Uint8Array(Buffer.from(this.MOCK_CHAINLINK_DATA, "base64"));
+
+    return {
+      address: ProgramId.CHAINLINK_SOL_USD_FEED,
+      info: {
+        data: MOCK_ACCOUNT_DATA,
+        executable: false,
+        lamports: 2616962,
+        owner: ProgramId.CHAINLINK_PROGRAM,
+      },
+    };
+  }
+
+  public calculateFeeInLamports(feeUSD: BN): BN {
+    const price = this.getMockPrice();
+    const decimals = this.getMockDecimals();
+
+    let feeInLamports: BN;
+    if (decimals === 8) {
+      feeInLamports = feeUSD.mul(toBn(LAMPORTS_PER_SOL)).div(toBn(price));
+    } else {
+      feeInLamports = feeUSD.mul(toBn(10).pow(toBn(1 + decimals))).div(toBn(price));
+    }
+
+    return feeInLamports;
+  }
+
+  // TODO: Fix this, I think it's incorrect
+  public getMockPrice(): number {
+    const bytes = new Uint8Array(Buffer.from(this.MOCK_CHAINLINK_DATA, "base64"));
+    // Price at offset 216 (4 bytes, little-endian, unsigned)
+    const priceRaw = (bytes[216] | (bytes[217] << 8) | (bytes[218] << 16) | (bytes[219] << 24)) >>> 0;
+    return priceRaw;
+  }
+
+  public getMockTimestamp(): number {
+    const bytes = new Uint8Array(Buffer.from(this.MOCK_CHAINLINK_DATA, "base64"));
+    // Timestamp at offset 208 (4 bytes, little-endian)
+    return bytes[208] | (bytes[209] << 8) | (bytes[210] << 16) | (bytes[211] << 24);
+  }
+
+  public getMockDecimals(): number {
+    const bytes = new Uint8Array(Buffer.from(this.MOCK_CHAINLINK_DATA, "base64"));
+    // Decimals at offset 138
+    return bytes[138];
+  }
+}

tests/common/context.ts

@@ -1,10 +1,9 @@
 import * as token from "@solana/spl-token";
-import { type Cluster, Connection, clusterApiUrl, Keypair, PublicKey } from "@solana/web3.js";
+import { Keypair, PublicKey } from "@solana/web3.js";
 import { BankrunProvider } from "anchor-bankrun";
 import type BN from "bn.js";
 import {
   type AccountInfoBytes,
-  type AddedAccount,
   type AddedProgram,
   type BanksClient,
   Clock,
@@ -16,6 +15,7 @@ import { dai, sol, usdc } from "../../lib/convertors";
 import { toBigInt, toBn } from "../../lib/helpers";
 import { type ProgramName } from "../../lib/types";
 import { createATAAndFund, createMint } from "./anchor-bankrun";
+import { ChainlinkMock } from "./chainlink-mock";
 import { type User } from "./types";
 
 export class TestContext {
@@ -30,6 +30,9 @@ export class TestContext {
   public feeCollector!: User;
   public recipient!: User;
 
+  // Chainlink Mock
+  public chainlink: ChainlinkMock = new ChainlinkMock();
+
   // Tokens
   public dai!: PublicKey; // Token 2022
   public randomToken!: PublicKey; // Token standard
@@ -40,7 +43,6 @@ export class TestContext {
     programId: PublicKey,
 
     addedPrograms: AddedProgram[] = [],
-    addedAccountIds: PublicKey[] = [],
   ) {
     const programs = [
       { name: programName, programId },
@@ -51,9 +53,10 @@ export class TestContext {
       ...addedPrograms,
     ];
 
+    const addedAccountIds: PublicKey[] = [];
     // Add the Chainlink SOL/USD price feed program ID to the added accounts
     addedAccountIds.push(ProgramId.CHAINLINK_SOL_USD_FEED);
-    const addedAccounts = await Promise.all(addedAccountIds.map((id) => this.fetchAccountDataAsFixture(id.toString())));
+    const addedAccounts = await Promise.all(addedAccountIds.map((_id) => this.chainlink.accountData()));
 
     // Start Anchor context with the provided programs & accounts
     this.context = await startAnchor("", programs, addedAccounts);
@@ -111,26 +114,6 @@ export class TestContext {
     return (await this.banksClient.getAccount(address)) !== null;
   }
 
-  async fetchAccountDataAsFixture(address: string, cluster: Cluster = "devnet"): Promise<AddedAccount> {
-    const connection = new Connection(clusterApiUrl(cluster), "confirmed");
-    const accountId = new PublicKey(address);
-
-    const raw = await connection.getAccountInfo(accountId);
-    if (!raw) {
-      throw new Error(`Account not found: ${address}`);
-    }
-
-    return {
-      address: accountId,
-      info: {
-        data: new Uint8Array(raw.data),
-        executable: raw.executable,
-        lamports: raw.lamports,
-        owner: raw.owner,
-      },
-    };
-  }
-
   async getLamportsOf(user: PublicKey): Promise<BN> {
     const balance = await this.banksClient.getBalance(user);
     return toBn(balance);

tests/common/oracles.ts

@@ -242,6 +242,17 @@ export class LockupTestContext extends TestContext {
     await buildSignAndProcessTx(this.banksClient, withdrawIx, signer);
   }
 
+  async withdrawalFeeInLamports(): Promise<BN> {
+    return await this.lockup.methods
+      .withdrawalFeeInLamports()
+      .accounts({
+        chainlinkProgram: ProgramId.CHAINLINK_PROGRAM,
+        chainlinkSolUsdFeed: ProgramId.CHAINLINK_SOL_USD_FEED,
+      })
+      .signers([this.defaultBankrunPayer])
+      .view();
+  }
+
   async withdrawToken2022(salt: BN, signer: Keypair): Promise<void> {
     await this.withdraw({
       depositedTokenMint: this.dai,