@marinade.finance/bankrun-utils 2.4.10 → 2.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marinade.finance/bankrun-utils",
-  "version": "2.4.10",
+  "version": "2.4.12",
   "description": "Bankrun library utilities",
   "repository": {
     "type": "git",
@@ -23,14 +23,14 @@
   ],
   "devDependencies": {
     "@solana/web3.js": "^1.98.0",
-    "@marinade.finance/web3js-common": "2.4.10",
+    "@marinade.finance/web3js-common": "2.4.12",
     "solana-bankrun": "^0.2.0",
     "anchor-bankrun": "^0.2.0",
     "class-transformer": "^0.5.1"
   },
   "peerDependencies": {
     "@solana/web3.js": "^1.98.0",
-    "@marinade.finance/web3js-common": "2.4.10",
+    "@marinade.finance/web3js-common": "2.4.12",
     "solana-bankrun": "^0.2.0",
     "anchor-bankrun": "^0.2.0",
     "class-transformer": "^0.5.1"

package/src/bankrun.js

@@ -1,67 +1,21 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.warpToNextSlot = exports.warpOffsetSlot = exports.currentSlot = exports.warpToNextEpoch = exports.warpOffsetEpoch = exports.currentEpoch = exports.warpToEpoch = exports.MINIMUM_SLOTS_PER_EPOCH = exports.assertNotExist = void 0;
-function assertNotExist(provider, account) {
-    return __awaiter(this, void 0, void 0, function () {
-        var accountInfo;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, provider.context.banksClient.getAccount(account)];
-                case 1:
-                    accountInfo = _a.sent();
-                    expect(accountInfo).toBeNull();
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function assertNotExist(provider, account) {
+    const accountInfo = await provider.context.banksClient.getAccount(account);
+    expect(accountInfo).toBeNull();
 }
 exports.assertNotExist = assertNotExist;
 // https://github.com/solana-labs/solana/blob/v1.17.7/sdk/program/src/epoch_schedule.rs#L29C1-L29C45
 exports.MINIMUM_SLOTS_PER_EPOCH = BigInt(32);
 // https://github.com/solana-labs/solana/blob/v1.17.7/sdk/program/src/epoch_schedule.rs#L167
 function warpToEpoch(provider, epoch) {
-    var epochBigInt = BigInt(epoch);
-    var _a = provider.context.genesisConfig.epochSchedule, slotsPerEpoch = _a.slotsPerEpoch, firstNormalEpoch = _a.firstNormalEpoch, firstNormalSlot = _a.firstNormalSlot;
-    var warpToSlot;
+    const epochBigInt = BigInt(epoch);
+    const { slotsPerEpoch, firstNormalEpoch, firstNormalSlot } = provider.context.genesisConfig.epochSchedule;
+    let warpToSlot;
     if (epochBigInt <= firstNormalEpoch) {
         warpToSlot =
-            (Math.pow(BigInt(2), epochBigInt) - BigInt(1)) * exports.MINIMUM_SLOTS_PER_EPOCH;
+            (BigInt(2) ** epochBigInt - BigInt(1)) * exports.MINIMUM_SLOTS_PER_EPOCH;
     }
     else {
         warpToSlot =
@@ -70,82 +24,30 @@ function warpToEpoch(provider, epoch) {
     provider.context.warpToSlot(warpToSlot);
 }
 exports.warpToEpoch = warpToEpoch;
-function currentEpoch(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, provider.context.banksClient.getClock()];
-                case 1: return [2 /*return*/, (_a.sent()).epoch];
-            }
-        });
-    });
+async function currentEpoch(provider) {
+    return (await provider.context.banksClient.getClock()).epoch;
 }
 exports.currentEpoch = currentEpoch;
-function warpOffsetEpoch(provider, plusEpochs) {
-    return __awaiter(this, void 0, void 0, function () {
-        var nextEpoch;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, currentEpoch(provider)];
-                case 1:
-                    nextEpoch = (_a.sent()) + BigInt(plusEpochs);
-                    warpToEpoch(provider, nextEpoch);
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function warpOffsetEpoch(provider, plusEpochs) {
+    const nextEpoch = (await currentEpoch(provider)) + BigInt(plusEpochs);
+    warpToEpoch(provider, nextEpoch);
 }
 exports.warpOffsetEpoch = warpOffsetEpoch;
-function warpToNextEpoch(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, warpOffsetEpoch(provider, 1)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function warpToNextEpoch(provider) {
+    await warpOffsetEpoch(provider, 1);
 }
 exports.warpToNextEpoch = warpToNextEpoch;
-function currentSlot(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, provider.context.banksClient.getClock()];
-                case 1: return [2 /*return*/, (_a.sent()).slot];
-            }
-        });
-    });
+async function currentSlot(provider) {
+    return (await provider.context.banksClient.getClock()).slot;
 }
 exports.currentSlot = currentSlot;
-function warpOffsetSlot(provider, plusSlots) {
-    return __awaiter(this, void 0, void 0, function () {
-        var nextSlot;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, currentSlot(provider)];
-                case 1:
-                    nextSlot = (_a.sent()) + BigInt(plusSlots);
-                    provider.context.warpToSlot(nextSlot);
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function warpOffsetSlot(provider, plusSlots) {
+    const nextSlot = (await currentSlot(provider)) + BigInt(plusSlots);
+    provider.context.warpToSlot(nextSlot);
 }
 exports.warpOffsetSlot = warpOffsetSlot;
-function warpToNextSlot(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, warpOffsetSlot(provider, 1)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function warpToNextSlot(provider) {
+    await warpOffsetSlot(provider, 1);
 }
 exports.warpToNextSlot = warpToNextSlot;
 //# sourceMappingURL=bankrun.js.map

package/src/bankrun.js.map

@@ -1 +1 @@
-{"version":3,"file":"bankrun.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/bankrun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,SAAsB,cAAc,CAClC,QAAyB,EACzB,OAAkB;;;;;wBAEE,qBAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAA;;oBAApE,WAAW,GAAG,SAAsD;oBAC1E,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;;;;;CAC/B;AAND,wCAMC;AAED,oGAAoG;AACvF,QAAA,uBAAuB,GAAG,MAAM,CAAC,EAAE,CAAC,CAAA;AACjD,4FAA4F;AAC5F,SAAgB,WAAW,CAAC,QAAyB,EAAE,KAAsB;IAC3E,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC3B,IAAA,KACJ,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,EADtC,aAAa,mBAAA,EAAE,gBAAgB,sBAAA,EAAE,eAAe,qBACV,CAAA;IAC9C,IAAI,UAAkB,CAAA;IACtB,IAAI,WAAW,IAAI,gBAAgB,EAAE;QACnC,UAAU;YACR,CAAC,SAAA,MAAM,CAAC,CAAC,CAAC,EAAI,WAAW,CAAA,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,+BAAuB,CAAA;KACnE;SAAM;QACL,UAAU;YACR,CAAC,WAAW,GAAG,gBAAgB,CAAC,GAAG,aAAa,GAAG,eAAe,CAAA;KACrE;IACD,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;AACzC,CAAC;AAbD,kCAaC;AAED,SAAsB,YAAY,CAAC,QAAyB;;;;wBAClD,qBAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAA;wBAArD,sBAAO,CAAC,SAA6C,CAAC,CAAC,KAAK,EAAA;;;;CAC7D;AAFD,oCAEC;AAED,SAAsB,eAAe,CACnC,QAAyB,EACzB,UAA2B;;;;;wBAER,qBAAM,YAAY,CAAC,QAAQ,CAAC,EAAA;;oBAAzC,SAAS,GAAG,CAAC,SAA4B,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC;oBACrE,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;;;;;CACjC;AAND,0CAMC;AAED,SAAsB,eAAe,CAAC,QAAyB;;;;wBAC7D,qBAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAA;;oBAAlC,SAAkC,CAAA;;;;;CACnC;AAFD,0CAEC;AAED,SAAsB,WAAW,CAAC,QAAyB;;;;wBACjD,qBAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAA;wBAArD,sBAAO,CAAC,SAA6C,CAAC,CAAC,IAAI,EAAA;;;;CAC5D;AAFD,kCAEC;AAED,SAAsB,cAAc,CAClC,QAAyB,EACzB,SAA0B;;;;;wBAER,qBAAM,WAAW,CAAC,QAAQ,CAAC,EAAA;;oBAAvC,QAAQ,GAAG,CAAC,SAA2B,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;oBAClE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;;;;;CACtC;AAND,wCAMC;AAED,SAAsB,cAAc,CAAC,QAAyB;;;;wBAC5D,qBAAM,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAA;;oBAAjC,SAAiC,CAAA;;;;;CAClC;AAFD,wCAEC"}
+{"version":3,"file":"bankrun.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/bankrun.ts"],"names":[],"mappings":";;;AAGO,KAAK,UAAU,cAAc,CAClC,QAAyB,EACzB,OAAkB;IAElB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1E,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAA;AAChC,CAAC;AAND,wCAMC;AAED,oGAAoG;AACvF,QAAA,uBAAuB,GAAG,MAAM,CAAC,EAAE,CAAC,CAAA;AACjD,4FAA4F;AAC5F,SAAgB,WAAW,CAAC,QAAyB,EAAE,KAAsB;IAC3E,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,GACxD,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAA;IAC9C,IAAI,UAAkB,CAAA;IACtB,IAAI,WAAW,IAAI,gBAAgB,EAAE,CAAC;QACpC,UAAU;YACR,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,+BAAuB,CAAA;IACpE,CAAC;SAAM,CAAC;QACN,UAAU;YACR,CAAC,WAAW,GAAG,gBAAgB,CAAC,GAAG,aAAa,GAAG,eAAe,CAAA;IACtE,CAAC;IACD,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;AACzC,CAAC;AAbD,kCAaC;AAEM,KAAK,UAAU,YAAY,CAAC,QAAyB;IAC1D,OAAO,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAA;AAC9D,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,eAAe,CACnC,QAAyB,EACzB,UAA2B;IAE3B,MAAM,SAAS,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;IACrE,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;AAClC,CAAC;AAND,0CAMC;AAEM,KAAK,UAAU,eAAe,CAAC,QAAyB;IAC7D,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AACpC,CAAC;AAFD,0CAEC;AAEM,KAAK,UAAU,WAAW,CAAC,QAAyB;IACzD,OAAO,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAA;AAC7D,CAAC;AAFD,kCAEC;AAEM,KAAK,UAAU,cAAc,CAClC,QAAyB,EACzB,SAA0B;IAE1B,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;IAClE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;AACvC,CAAC;AAND,wCAMC;AAEM,KAAK,UAAU,cAAc,CAAC,QAAyB;IAC5D,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AACnC,CAAC;AAFD,wCAEC"}

package/src/extendedProvider.js

@@ -1,176 +1,49 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.bankrunExecute = exports.bankrunExecuteIx = exports.bankrunTransaction = exports.BankrunExtendedProvider = void 0;
-var web3js_common_1 = require("@marinade.finance/web3js-common");
-var web3_js_1 = require("@solana/web3.js");
-var anchor_bankrun_1 = require("anchor-bankrun");
-var BankrunExtendedProvider = /** @class */ (function (_super) {
-    __extends(BankrunExtendedProvider, _super);
-    function BankrunExtendedProvider() {
-        return _super !== null && _super.apply(this, arguments) || this;
+const web3js_common_1 = require("@marinade.finance/web3js-common");
+const web3_js_1 = require("@solana/web3.js");
+const anchor_bankrun_1 = require("anchor-bankrun");
+class BankrunExtendedProvider extends anchor_bankrun_1.BankrunProvider {
+    async sendIx(signers, ...ixes) {
+        const tx = await bankrunTransaction(this);
+        tx.add(...ixes);
+        await bankrunExecute(this, [this.wallet, ...signers], tx);
     }
-    BankrunExtendedProvider.prototype.sendIx = function (signers) {
-        var ixes = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            ixes[_i - 1] = arguments[_i];
-        }
-        return __awaiter(this, void 0, void 0, function () {
-            var tx;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, bankrunTransaction(this)];
-                    case 1:
-                        tx = _a.sent();
-                        tx.add.apply(tx, ixes);
-                        return [4 /*yield*/, bankrunExecute(this, __spreadArray([this.wallet], signers, true), tx)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Object.defineProperty(BankrunExtendedProvider.prototype, "walletPubkey", {
-        get: function () {
-            return this.wallet.publicKey;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return BankrunExtendedProvider;
-}(anchor_bankrun_1.BankrunProvider));
+    get walletPubkey() {
+        return this.wallet.publicKey;
+    }
+}
 exports.BankrunExtendedProvider = BankrunExtendedProvider;
-function bankrunTransaction(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        var bh, lastValidBlockHeight;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, provider.context.banksClient.getLatestBlockhash()];
-                case 1:
-                    bh = _a.sent();
-                    lastValidBlockHeight = (bh === null ? Number.MAX_VALUE : bh[1]);
-                    return [2 /*return*/, new web3_js_1.Transaction({
-                            feePayer: provider.wallet.publicKey,
-                            blockhash: provider.context.lastBlockhash,
-                            lastValidBlockHeight: lastValidBlockHeight
-                        })];
-            }
-        });
+async function bankrunTransaction(provider) {
+    const bh = await provider.context.banksClient.getLatestBlockhash();
+    const lastValidBlockHeight = (bh === null ? Number.MAX_VALUE : bh[1]);
+    return new web3_js_1.Transaction({
+        feePayer: provider.wallet.publicKey,
+        blockhash: provider.context.lastBlockhash,
+        lastValidBlockHeight,
     });
 }
 exports.bankrunTransaction = bankrunTransaction;
-function bankrunExecuteIx(provider, signers) {
-    var ixes = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        ixes[_i - 2] = arguments[_i];
-    }
-    return __awaiter(this, void 0, void 0, function () {
-        var tx;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, bankrunTransaction(provider)];
-                case 1:
-                    tx = _a.sent();
-                    tx.add.apply(tx, ixes);
-                    return [4 /*yield*/, bankrunExecute(provider, signers, tx)];
-                case 2: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
+async function bankrunExecuteIx(provider, signers, ...ixes) {
+    const tx = await bankrunTransaction(provider);
+    tx.add(...ixes);
+    return await bankrunExecute(provider, signers, tx);
 }
 exports.bankrunExecuteIx = bankrunExecuteIx;
-function bankrunExecute(provider, signers, tx) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _i, signers_1, signer;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _i = 0, signers_1 = signers;
-                    _a.label = 1;
-                case 1:
-                    if (!(_i < signers_1.length)) return [3 /*break*/, 5];
-                    signer = signers_1[_i];
-                    if (!(0, web3js_common_1.instanceOfWallet)(signer)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, signer.signTransaction(tx)];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    if (signer instanceof web3_js_1.Keypair || 'secretKey' in signer) {
-                        tx.partialSign(signer);
-                    }
-                    else {
-                        throw new Error('bankrunExecute: provided signer parameter is not a signer: ' + signer);
-                    }
-                    _a.label = 4;
-                case 4:
-                    _i++;
-                    return [3 /*break*/, 1];
-                case 5: return [4 /*yield*/, provider.context.banksClient.processTransaction(tx)];
-                case 6: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
+async function bankrunExecute(provider, signers, tx) {
+    for (const signer of signers) {
+        if ((0, web3js_common_1.instanceOfWallet)(signer)) {
+            await signer.signTransaction(tx);
+        }
+        else if (signer instanceof web3_js_1.Keypair || 'secretKey' in signer) {
+            tx.partialSign(signer);
+        }
+        else {
+            throw new Error('bankrunExecute: provided signer parameter is not a signer: ' + signer);
+        }
+    }
+    return await provider.context.banksClient.processTransaction(tx);
 }
 exports.bankrunExecute = bankrunExecute;
 //# sourceMappingURL=extendedProvider.js.map

package/src/extendedProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"extendedProvider.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/extendedProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAIwC;AACxC,2CAOwB;AACxB,iDAAgD;AAGhD;IACU,2CAAe;IADzB;;IAoBA,CAAC;IAhBO,wCAAM,GAAZ,UACE,OAAsC;QACtC,cAIG;aAJH,UAIG,EAJH,qBAIG,EAJH,IAIG;YAJH,6BAIG;;;;;;4BAEQ,qBAAM,kBAAkB,CAAC,IAAI,CAAC,EAAA;;wBAAnC,EAAE,GAAG,SAA8B;wBACzC,EAAE,CAAC,GAAG,OAAN,EAAE,EAAQ,IAAI,EAAC;wBACf,qBAAM,cAAc,CAAC,IAAI,iBAAG,IAAI,CAAC,MAAM,GAAK,OAAO,SAAG,EAAE,CAAC,EAAA;;wBAAzD,SAAyD,CAAA;;;;;KAC1D;IAED,sBAAI,iDAAY;aAAhB;YACE,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;QAC9B,CAAC;;;OAAA;IACH,8BAAC;AAAD,CAAC,AApBD,CACU,gCAAe,GAmBxB;AApBY,0DAAuB;AAsBpC,SAAsB,kBAAkB,CACtC,QAAyB;;;;;wBAEd,qBAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,EAAA;;oBAA5D,EAAE,GAAG,SAAuD;oBAC5D,oBAAoB,GAAG,CAC3B,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAC7B,CAAA;oBACX,sBAAO,IAAI,qBAAW,CAAC;4BACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;4BACnC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa;4BACzC,oBAAoB,sBAAA;yBACrB,CAAC,EAAA;;;;CACH;AAZD,gDAYC;AAED,SAAsB,gBAAgB,CACpC,QAAyB,EACzB,OAAsC;IACtC,cAIG;SAJH,UAIG,EAJH,qBAIG,EAJH,IAIG;QAJH,6BAIG;;;;;;wBAEQ,qBAAM,kBAAkB,CAAC,QAAQ,CAAC,EAAA;;oBAAvC,EAAE,GAAG,SAAkC;oBAC7C,EAAE,CAAC,GAAG,OAAN,EAAE,EAAQ,IAAI,EAAC;oBACR,qBAAM,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAA;wBAAlD,sBAAO,SAA2C,EAAA;;;;CACnD;AAZD,4CAYC;AAED,SAAsB,cAAc,CAClC,QAAyB,EACzB,OAAsC,EACtC,EAAe;;;;;;0BAEa,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAjB,MAAM;yBACX,IAAA,gCAAgB,EAAC,MAAM,CAAC,EAAxB,wBAAwB;oBAC1B,qBAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,EAAA;;oBAAhC,SAAgC,CAAA;;;oBAC3B,IAAI,MAAM,YAAY,iBAAO,IAAI,WAAW,IAAI,MAAM,EAAE;wBAC7D,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;qBACvB;yBAAM;wBACL,MAAM,IAAI,KAAK,CACb,6DAA6D,GAAG,MAAM,CACvE,CAAA;qBACF;;;oBATkB,IAAO,CAAA;;wBAWrB,qBAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAA;wBAAhE,sBAAO,SAAyD,EAAA;;;;CACjE;AAjBD,wCAiBC"}
+{"version":3,"file":"extendedProvider.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/extendedProvider.ts"],"names":[],"mappings":";;;AAAA,mEAIwC;AACxC,6CAOwB;AACxB,mDAAgD;AAGhD,MAAa,uBACX,SAAQ,gCAAe;IAGvB,KAAK,CAAC,MAAM,CACV,OAAsC,EACtC,GAAG,IAIA;QAEH,MAAM,EAAE,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACzC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;QACf,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;IAC3D,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;CACF;AApBD,0DAoBC;AAEM,KAAK,UAAU,kBAAkB,CACtC,QAAyB;IAEzB,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAA;IAClE,MAAM,oBAAoB,GAAG,CAC3B,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAC7B,CAAA;IACX,OAAO,IAAI,qBAAW,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;QACnC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa;QACzC,oBAAoB;KACrB,CAAC,CAAA;AACJ,CAAC;AAZD,gDAYC;AAEM,KAAK,UAAU,gBAAgB,CACpC,QAAyB,EACzB,OAAsC,EACtC,GAAG,IAIA;IAEH,MAAM,EAAE,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAC7C,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IACf,OAAO,MAAM,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;AACpD,CAAC;AAZD,4CAYC;AAEM,KAAK,UAAU,cAAc,CAClC,QAAyB,EACzB,OAAsC,EACtC,EAAe;IAEf,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAA,gCAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAClC,CAAC;aAAM,IAAI,MAAM,YAAY,iBAAO,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;YAC9D,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,6DAA6D,GAAG,MAAM,CACvE,CAAA;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAA;AAClE,CAAC;AAjBD,wCAiBC"}

package/src/index.js

@@ -13,7 +13,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./extendedProvider"), exports);
 __exportStar(require("./testInit"), exports);
 __exportStar(require("./bankrun"), exports);

package/src/testInit.js

@@ -5,174 +5,122 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.testInit = exports.calculateRentExemption = exports.loadPrograms = exports.loadAccountFromJson = exports.loadAccountsFromDirectory = exports.toAccountInfoBytes = exports.JsonAccount = exports.JsonAccountData = void 0;
-var web3_js_1 = require("@solana/web3.js");
-var solana_bankrun_1 = require("solana-bankrun");
+const web3_js_1 = require("@solana/web3.js");
+const solana_bankrun_1 = require("solana-bankrun");
 require("reflect-metadata");
-var class_transformer_1 = require("class-transformer");
-var fs_1 = require("fs");
-var path_1 = require("path");
-var extendedProvider_1 = require("./extendedProvider");
+const class_transformer_1 = require("class-transformer");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const extendedProvider_1 = require("./extendedProvider");
 // note: VsCode error:
 //       https://github.com/microsoft/TypeScript/issues/52396#issuecomment-1409152884
 //       https://bobbyhadz.com/blog/typescript-experimental-support-for-decorators-warning#solve-the-error-in-visual-studio-code
-var JsonAccountData = /** @class */ (function () {
-    function JsonAccountData() {
-    }
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Transform)(function (_a) {
-            var value = _a.value;
-            return Number(value);
-        })
-    ], JsonAccountData.prototype, "lamports");
-    __decorate([
-        (0, class_transformer_1.Expose)()
-    ], JsonAccountData.prototype, "data");
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Transform)(function (_a) {
-            var value = _a.value;
-            return new web3_js_1.PublicKey(value);
-        })
-    ], JsonAccountData.prototype, "owner");
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Transform)(function (_a) {
-            var value = _a.value;
-            return Boolean(value);
-        })
-    ], JsonAccountData.prototype, "executable");
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Transform)(function (_a) {
-            var value = _a.value;
-            return Number(value);
-        })
-    ], JsonAccountData.prototype, "rentEpoch");
-    return JsonAccountData;
-}());
+class JsonAccountData {
+    lamports;
+    data;
+    owner;
+    executable;
+    rentEpoch;
+}
 exports.JsonAccountData = JsonAccountData;
-var JsonAccount = /** @class */ (function () {
-    function JsonAccount() {
-    }
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Transform)(function (_a) {
-            var value = _a.value;
-            return new web3_js_1.PublicKey(value);
-        })
-    ], JsonAccount.prototype, "pubkey");
-    __decorate([
-        (0, class_transformer_1.Expose)(),
-        (0, class_transformer_1.Type)(function () { return JsonAccountData; })
-    ], JsonAccount.prototype, "account");
-    return JsonAccount;
-}());
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Transform)(({ value }) => Number(value))
+], JsonAccountData.prototype, "lamports", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)()
+], JsonAccountData.prototype, "data", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Transform)(({ value }) => new web3_js_1.PublicKey(value))
+], JsonAccountData.prototype, "owner", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Transform)(({ value }) => Boolean(value))
+], JsonAccountData.prototype, "executable", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Transform)(({ value }) => Number(value))
+], JsonAccountData.prototype, "rentEpoch", void 0);
+class JsonAccount {
+    pubkey;
+    account;
+}
 exports.JsonAccount = JsonAccount;
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Transform)(({ value }) => new web3_js_1.PublicKey(value))
+], JsonAccount.prototype, "pubkey", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Type)(() => JsonAccountData)
+], JsonAccount.prototype, "account", void 0);
 function toAccountInfoBytes(jsonAccount) {
-    var dataField = jsonAccount.account.data;
+    const dataField = jsonAccount.account.data;
     return {
         executable: jsonAccount.account.executable,
         owner: jsonAccount.account.owner,
         lamports: jsonAccount.account.lamports,
         data: Buffer.from(dataField[0], dataField[1]),
-        rentEpoch: jsonAccount.account.rentEpoch
+        rentEpoch: jsonAccount.account.rentEpoch,
     };
 }
 exports.toAccountInfoBytes = toAccountInfoBytes;
 function loadAccountsFromDirectory(directory) {
-    var accounts = [];
-    for (var _i = 0, _a = (0, fs_1.readdirSync)(directory, {
+    const accounts = [];
+    for (const jsonFile of (0, fs_1.readdirSync)(directory, {
         recursive: true,
-        encoding: null
-    }).filter(function (f) { return f.endsWith('.json'); }); _i < _a.length; _i++) {
-        var jsonFile = _a[_i];
-        var jsonPath = (0, path_1.join)(directory, jsonFile);
-        var loadedAccount = loadAccountFromJson(jsonPath);
+        encoding: null,
+    }).filter(f => f.endsWith('.json'))) {
+        const jsonPath = (0, path_1.join)(directory, jsonFile);
+        const loadedAccount = loadAccountFromJson(jsonPath);
         accounts.push(loadedAccount);
     }
     return accounts;
 }
 exports.loadAccountsFromDirectory = loadAccountsFromDirectory;
 function loadAccountFromJson(jsonPath) {
-    var fileBuffer = (0, fs_1.readFileSync)(jsonPath);
-    var parsedData = JSON.parse(fileBuffer.toString());
-    var jsonAccount = (0, class_transformer_1.plainToInstance)(JsonAccount, parsedData);
+    const fileBuffer = (0, fs_1.readFileSync)(jsonPath);
+    const parsedData = JSON.parse(fileBuffer.toString());
+    const jsonAccount = (0, class_transformer_1.plainToInstance)(JsonAccount, parsedData);
     return {
         address: jsonAccount.pubkey,
-        info: toAccountInfoBytes(jsonAccount)
+        info: toAccountInfoBytes(jsonAccount),
     };
 }
 exports.loadAccountFromJson = loadAccountFromJson;
 function loadPrograms(programs) {
-    var addedPrograms = [];
-    var hookDeleteDir = false;
-    var hookDeleteProgramNames = [];
+    const addedPrograms = [];
+    let hookDeleteDir = false;
+    const hookDeleteProgramNames = [];
     // programs that should be loaded just by name based on the rules of the solana-test-program
     programs
-        .filter(function (p) { return p.path === undefined; })
-        .forEach(function (p) {
+        .filter(p => p.path === undefined)
+        .forEach(p => {
         addedPrograms.push({
             name: p.name,
-            programId: p.pubkey
+            programId: p.pubkey,
         });
     });
     // programs that provided the path would be copied to the fixtures directory where
     // the solana-test-program looks for the program data
     // see: https://github.com/solana-labs/solana/blob/v1.18.14/program-test/src/lib.rs#L428
-    var fixturesPath = (0, path_1.join)(process.cwd(), 'tests', 'fixtures');
+    const fixturesPath = (0, path_1.join)(process.cwd(), 'tests', 'fixtures');
     if (!(0, fs_1.existsSync)(fixturesPath)) {
         (0, fs_1.mkdirSync)(fixturesPath, { recursive: true });
         hookDeleteDir = true;
     }
-    for (var _i = 0, _a = programs.filter(function (p) { return p.path !== undefined; }); _i < _a.length; _i++) {
-        var _b = _a[_i], pubkey = _b.pubkey, path = _b.path, name_1 = _b.name;
-        var programPath = path;
+    for (const { pubkey, path, name } of programs.filter(p => p.path !== undefined)) {
+        const programPath = path;
         if (!(0, fs_1.existsSync)(programPath)) {
-            console.error("bankrun startup: program ".concat(pubkey.toBase58(), " at path ").concat(programPath, " does not exist cannot be loaded"));
+            console.error(`bankrun startup: program ${pubkey.toBase58()} at path ${programPath} does not exist cannot be loaded`);
             continue;
         }
-        var fixturesProgramSoPath = (0, path_1.join)(fixturesPath, "".concat(name_1, ".so"));
+        const fixturesProgramSoPath = (0, path_1.join)(fixturesPath, `${name}.so`);
         if ((0, fs_1.existsSync)(fixturesProgramSoPath)) {
-            console.log("bankrun startup: skipping to upload the program ".concat(pubkey.toBase58(), " from path ").concat(path, " to ").concat(fixturesProgramSoPath, " as it already exists"));
+            console.log(`bankrun startup: skipping to upload the program ${pubkey.toBase58()} from path ${path} to ${fixturesProgramSoPath} as it already exists`);
         }
         else {
             console.debug('bankrun startup: copying program', fixturesProgramSoPath, 'to', fixturesProgramSoPath);
@@ -180,13 +128,13 @@ function loadPrograms(programs) {
             hookDeleteProgramNames.push(fixturesProgramSoPath);
         }
         addedPrograms.push({
-            name: name_1,
-            programId: pubkey
+            name,
+            programId: pubkey,
         });
     }
     // TODO: exit hooks somehow does not work in jest
-    registerCleanup(function () {
-        hookDeleteProgramNames.forEach(function (p) {
+    registerCleanup(() => {
+        hookDeleteProgramNames.forEach(p => {
             console.log('Deleting program file', p);
             (0, fs_1.rmSync)(p);
         });
@@ -227,8 +175,8 @@ exitHandler) {
  * > Rent-exempt minimum: 0.00089784 SOL
  */
 function calculateRentExemption(dataSize) {
-    var basePaymentLamports = 890880;
-    var perByteLamports = 6960;
+    const basePaymentLamports = 890880;
+    const perByteLamports = 6960;
     return basePaymentLamports + perByteLamports * dataSize;
 }
 exports.calculateRentExemption = calculateRentExemption;
@@ -246,38 +194,27 @@ exports.calculateRentExemption = calculateRentExemption;
  *                   The 'path' is optional and when provided the file is copied to place where the solana-test-program looks for the program data.
  *                   see: https://github.com/solana-labs/solana/blob/v1.18.14/program-test/src/lib.rs#L428
  */
-function testInit(_a) {
-    var accountDirs = _a.accountDirs, accounts = _a.accounts, programs = _a.programs;
-    return __awaiter(this, void 0, void 0, function () {
-        var additionalAccounts, additionalPrograms, context;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    additionalAccounts = [];
-                    additionalPrograms = [];
-                    if (accountDirs !== undefined) {
-                        additionalAccounts = accountDirs.flatMap(loadAccountsFromDirectory);
-                    }
-                    if (accounts !== undefined) {
-                        additionalAccounts.push.apply(additionalAccounts, accounts.flatMap(function (acc) {
-                            var accountData = loadAccountFromJson(acc.path);
-                            if (acc.pubkey !== undefined) {
-                                // rewriting the address when passed in
-                                accountData.address = acc.pubkey;
-                            }
-                            return accountData;
-                        }));
-                    }
-                    if (programs !== undefined) {
-                        additionalPrograms = loadPrograms(programs);
-                    }
-                    return [4 /*yield*/, (0, solana_bankrun_1.startAnchor)('./', additionalPrograms, additionalAccounts)];
-                case 1:
-                    context = _b.sent();
-                    return [2 /*return*/, new extendedProvider_1.BankrunExtendedProvider(context)];
+async function testInit({ accountDirs, accounts, programs, }) {
+    let additionalAccounts = [];
+    let additionalPrograms = [];
+    if (accountDirs !== undefined) {
+        additionalAccounts = accountDirs.flatMap(loadAccountsFromDirectory);
+    }
+    if (accounts !== undefined) {
+        additionalAccounts.push(...accounts.flatMap(acc => {
+            const accountData = loadAccountFromJson(acc.path);
+            if (acc.pubkey !== undefined) {
+                // rewriting the address when passed in
+                accountData.address = acc.pubkey;
             }
-        });
-    });
+            return accountData;
+        }));
+    }
+    if (programs !== undefined) {
+        additionalPrograms = loadPrograms(programs);
+    }
+    const context = await (0, solana_bankrun_1.startAnchor)('./', additionalPrograms, additionalAccounts);
+    return new extendedProvider_1.BankrunExtendedProvider(context);
 }
 exports.testInit = testInit;
 //# sourceMappingURL=testInit.js.map

package/src/testInit.js.map

@@ -1 +1 @@
-{"version":3,"file":"testInit.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/testInit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testInit.js","sourceRoot":"","sources":["../../../../../packages/lib/bankrun-utils/src/testInit.ts"],"names":[],"mappings":"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"}