diff --git a/__tests__/08.custom-network.ava.ts b/__tests__/08.custom-network.ava.ts index 8f26b7b8..2fc01a35 100644 --- a/__tests__/08.custom-network.ava.ts +++ b/__tests__/08.custom-network.ava.ts @@ -4,6 +4,8 @@ import anyTest, {TestFn} from 'ava'; // To run this test, you need to set the NEAR_RPC_API_KEY environment variable tied the Pagoda testnet network. // And the NEAR_WORKSPACES_NETWORK environment variable to 'custom'. +// +// Sample: NEAR_WORKSPACES_NETWORK=custom NEAR_RPC_API_KEY="xxx" yarn test... if (getNetworkFromEnv() === 'custom' && process.env.NEAR_RPC_API_KEY !== '') { const test = anyTest as TestFn<{ worker: Worker; @@ -25,8 +27,14 @@ if (getNetworkFromEnv() === 'custom' && process.env.NEAR_RPC_API_KEY !== '') { }); test('Ping network', async t => { - await t.context.worker.provider.block({finality: 'final'}); - console.log('Network is alive!'); + try { + await t.context.worker.provider.block({finality: 'final'}); + } catch (error: unknown) { + t.fail(`Failed to ping the network: ${error as string}`); + return; + } + + t.pass('Network pinged successfully!'); }); } diff --git a/packages/js/dist/account/account-manager.d.ts b/packages/js/dist/account/account-manager.d.ts index 3e627797..ab2d87e4 100644 --- a/packages/js/dist/account/account-manager.d.ts +++ b/packages/js/dist/account/account-manager.d.ts @@ -46,6 +46,14 @@ export declare abstract class AccountManager implements NearAccountManager { protected get networkId(): string; protected get connection(): nearAPI.Connection; } +export declare class CustomnetManager extends AccountManager { + get DEFAULT_INITIAL_BALANCE(): string; + get defaultKeyStore(): KeyStore; + get connection(): nearAPI.Connection; + get networkId(): string; + init(): Promise; + createFrom(config: Config): Promise; +} export declare class TestnetManager extends AccountManager { static readonly KEYSTORE_PATH: string; private static numTestAccounts; diff --git a/packages/js/dist/account/account-manager.d.ts.map b/packages/js/dist/account/account-manager.d.ts.map index 0741580d..1245c6e6 100644 --- a/packages/js/dist/account/account-manager.d.ts.map +++ b/packages/js/dist/account/account-manager.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"account-manager.d.ts","sourceRoot":"","sources":["../../src/account/account-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"account-manager.d.ts","sourceRoot":"","sources":["../../src/account/account-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/js/dist/account/account-manager.js b/packages/js/dist/account/account-manager.js index c15230bd..6a2ff7b2 100644 --- a/packages/js/dist/account/account-manager.js +++ b/packages/js/dist/account/account-manager.js @@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.ManagedTransaction = exports.SandboxManager = exports.TestnetManager = exports.AccountManager = void 0; +exports.ManagedTransaction = exports.SandboxManager = exports.TestnetManager = exports.CustomnetManager = exports.AccountManager = void 0; const path = __importStar(require("path")); const process = __importStar(require("process")); const nearAPI = __importStar(require("near-api-js")); @@ -48,7 +48,9 @@ class AccountManager { return new SandboxManager(config); case 'testnet': return new TestnetManager(config); - default: throw new Error(`Bad network id: "${network}"; expected "testnet" or "sandbox"`); + case 'custom': + return new CustomnetManager(config); + default: throw new Error(`Bad network id: "${network}"; expected "testnet", "custom" or "sandbox"`); } } async accountView(accountId) { @@ -204,6 +206,27 @@ class AccountManager { } } exports.AccountManager = AccountManager; +class CustomnetManager extends AccountManager { + get DEFAULT_INITIAL_BALANCE() { + return near_units_1.NEAR.parse('10 N').toJSON(); + } + get defaultKeyStore() { + return new nearAPI.keyStores.InMemoryKeyStore(); + } + get connection() { + return new nearAPI.Connection(this.networkId, this.provider, this.signer, `jsvm.${this.networkId}`); + } + get networkId() { + return this.config.network; + } + async init() { + return this; + } + async createFrom(config) { + return new CustomnetManager(config); + } +} +exports.CustomnetManager = CustomnetManager; class TestnetManager extends AccountManager { static get defaultKeyStore() { const keyStore = new nearAPI.keyStores.UnencryptedFileSystemKeyStore(this.KEYSTORE_PATH); diff --git a/packages/js/dist/account/account-manager.js.map b/packages/js/dist/account/account-manager.js.map index 23c39fb9..d546c744 100644 --- a/packages/js/dist/account/account-manager.js.map +++ b/packages/js/dist/account/account-manager.js.map @@ -1 +1 @@ -{"version":3,"file":"account-manager.js","sourceRoot":"","sources":["../../src/account/account-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"account-manager.js","sourceRoot":"","sources":["../../src/account/account-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/js/dist/account/index.js b/packages/js/dist/account/index.js index fac830ac..5241593f 100644 --- a/packages/js/dist/account/index.js +++ b/packages/js/dist/account/index.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/packages/js/dist/account/index.js.map b/packages/js/dist/account/index.js.map index a6b16130..7367f83f 100644 --- a/packages/js/dist/account/index.js.map +++ b/packages/js/dist/account/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B;AAC/B,yDAAuC;AACvC,oDAAkC;AAClC,4CAA0B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,yDAAuC;AACvC,oDAAkC;AAClC,4CAA0B"} \ No newline at end of file diff --git a/packages/js/dist/utils.d.ts b/packages/js/dist/utils.d.ts index baaad9a0..4bee558a 100644 --- a/packages/js/dist/utils.d.ts +++ b/packages/js/dist/utils.d.ts @@ -13,6 +13,7 @@ export declare function captureError(fn: () => Promise): Promise; export declare function isTopLevelAccount(accountId: string): boolean; export declare function urlConfigFromNetwork(network: string | { network: string; + rpcAddr?: string; }): ClientConfig; /** * diff --git a/packages/js/dist/utils.d.ts.map b/packages/js/dist/utils.d.ts.map index b4a8b579..287d7ae6 100644 --- a/packages/js/dist/utils.d.ts.map +++ b/packages/js/dist/utils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAO9B,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAC,MAAM,SAAS,CAAC;AAE1E,eAAO,MAAM,QAAQ,MAAmB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,UAQtC;AAGD,wBAAgB,eAAe,CAAC,MAAM,SAAS,EAAE,UAAU,SAAK,EAAE,YAAY,SAAK,GAAG,MAAM,CAG3F;AAED,wBAAgB,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,UAAU,MAAe,CAAC;AAEvC,wBAAsB,YAAY,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAU1E;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAsBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,GAAG,YAAY,CAetF;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI9D;AAED,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,GAAG,SAAS,GAAG,QAAQ,CAepE;AAED,wBAAgB,YAAY,IAAI,QAAQ,CAIvC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,CAE7D;AAID,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE,GAAG,GAAG,CAM5C;AAID,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE,GAAG,IAAI,CAM9C"} \ No newline at end of file +{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAO9B,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAC,MAAM,SAAS,CAAC;AAE1E,eAAO,MAAM,QAAQ,MAAmB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,UAQtC;AAGD,wBAAgB,eAAe,CAAC,MAAM,SAAS,EAAE,UAAU,SAAK,EAAE,YAAY,SAAK,GAAG,MAAM,CAG3F;AAED,wBAAgB,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,UAAU,MAAe,CAAC;AAEvC,wBAAsB,YAAY,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAU1E;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAoBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,YAAY,CAqBxG;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI9D;AAED,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,GAAG,SAAS,GAAG,QAAQ,CAepE;AAED,wBAAgB,YAAY,IAAI,QAAQ,CAIvC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,CAE7D;AAID,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE,GAAG,GAAG,CAM5C;AAID,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE,GAAG,IAAI,CAM9C"} \ No newline at end of file diff --git a/packages/js/dist/utils.js b/packages/js/dist/utils.js index 03863c73..1a468567 100644 --- a/packages/js/dist/utils.js +++ b/packages/js/dist/utils.js @@ -86,9 +86,6 @@ function configFromDomain(network) { else if (network === 'testnet' && process.env.NEAR_CLI_TESTNET_RPC_SERVER_URL) { rpcAddr = process.env.NEAR_CLI_TESTNET_RPC_SERVER_URL; } - else if (network === 'custom' && process.env.NEAR_CLI_CUSTOM_RPC_SERVER_URL) { - rpcAddr = process.env.NEAR_CLI_CUSTOM_RPC_SERVER_URL; - } return { network, rpcAddr, @@ -100,15 +97,20 @@ function configFromDomain(network) { } function urlConfigFromNetwork(network) { const networkName = typeof network === 'string' ? network : network.network; + const rpcAddr = typeof network === 'string' ? undefined : network.rpcAddr; switch (networkName) { case 'sandbox': return { network: 'sandbox', rpcAddr: 'http://localhost', }; + case 'custom': + return { + network: 'custom', + rpcAddr: rpcAddr, + }; case 'testnet': - case 'mainnet': - case 'custom': return configFromDomain(networkName); + case 'mainnet': return configFromDomain(networkName); default: throw new Error(`Got network ${networkName}, but only accept 'sandbox', 'testnet', 'mainnet' and 'custom'`); } diff --git a/packages/js/dist/utils.js.map b/packages/js/dist/utils.js.map index b3134aa9..a760197b 100644 --- a/packages/js/dist/utils.js.map +++ b/packages/js/dist/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/js/dist/worker.d.ts b/packages/js/dist/worker.d.ts index bdb0be03..378cd311 100644 --- a/packages/js/dist/worker.d.ts +++ b/packages/js/dist/worker.d.ts @@ -28,11 +28,11 @@ export declare abstract class Worker { abstract tearDown(): Promise; } export declare class CustomnetWorker extends Worker { + private readonly clientConfig; static init(config: Partial): Promise; get provider(): JsonRpcProvider; tearDown(): Promise; - static get defaultConfig(): Config; - private static get clientConfig(); + get defaultConfig(): Config; } export declare class TestnetWorker extends Worker { static init(config: Partial): Promise; diff --git a/packages/js/dist/worker.d.ts.map b/packages/js/dist/worker.d.ts.map index 8a79da2a..e59a7ca3 100644 --- a/packages/js/dist/worker.d.ts.map +++ b/packages/js/dist/worker.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAe,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAiB,WAAW,EAAE,kBAAkB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAI1C;;GAEG;AACH,8BAAsB,MAAM;IAC1B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;gBAE3B,MAAM,EAAE,MAAM;IAM1B;;;;;;;;;;;;;OAaG;WACU,IAAI,CAAC,MAAM,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhE,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,QAAQ,KAAK,QAAQ,IAAI,eAAe,CAAC;IAEzC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CACnC;AAID,qBAAa,eAAgB,SAAQ,MAAM;WAC5B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAQpE,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,MAAM,KAAK,aAAa,IAAI,MAAM,CAQjC;IAED,OAAO,CAAC,MAAM,KAAK,YAAY,GAE9B;CACF;AAED,qBAAa,aAAc,SAAQ,MAAM;WAC1B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAQlE,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,MAAM,KAAK,aAAa,IAAI,MAAM,CAQjC;IAED,OAAO,CAAC,MAAM,KAAK,YAAY,GAE9B;CACF;AAED,qBAAa,aAAc,SAAQ,MAAM;IACvC,OAAO,CAAC,MAAM,CAAiB;WAElB,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;WAgCrD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAY7C,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ/B,OAAO,CAAC,MAAM,KAAK,YAAY,GAO9B;IAED,OAAO,KAAK,OAAO,GAElB;CACF"} \ No newline at end of file +{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAe,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAiB,WAAW,EAAE,kBAAkB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAM1C;;GAEG;AACH,8BAAsB,MAAM;IAC1B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;gBAE3B,MAAM,EAAE,MAAM;IAM1B;;;;;;;;;;;;;OAaG;WACU,IAAI,CAAC,MAAM,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhE,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,QAAQ,KAAK,QAAQ,IAAI,eAAe,CAAC;IAEzC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CACnC;AAID,qBAAa,eAAgB,SAAQ,MAAM;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyF;WAEzG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAsBpE,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,IAAI,aAAa,IAAI,MAAM,CAQ1B;CACF;AAED,qBAAa,aAAc,SAAQ,MAAM;WAC1B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAelE,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,MAAM,KAAK,aAAa,IAAI,MAAM,CAQjC;IAED,OAAO,CAAC,MAAM,KAAK,YAAY,GAE9B;CACF;AAED,qBAAa,aAAc,SAAQ,MAAM;IACvC,OAAO,CAAC,MAAM,CAAiB;WAElB,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;WAsCrD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAY7C,IAAI,QAAQ,IAAI,eAAe,CAE9B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ/B,OAAO,CAAC,MAAM,KAAK,YAAY,GAO9B;IAED,OAAO,KAAK,OAAO,GAElB;CACF"} \ No newline at end of file diff --git a/packages/js/dist/worker.js b/packages/js/dist/worker.js index b5ff515c..6ca8cfa3 100644 --- a/packages/js/dist/worker.js +++ b/packages/js/dist/worker.js @@ -12,6 +12,7 @@ const account_1 = require("./account"); const jsonrpc_1 = require("./jsonrpc"); const internal_utils_1 = require("./internal-utils"); const server_1 = require("./server/server"); +const API_KEY_HEADER = 'x-api-key'; /** * The main interface to near-workspaces. Create a new worker instance with {@link Worker.init}, then run code on it. */ @@ -58,21 +59,37 @@ exports.Worker = Worker; // Connect to a custom network. // Note: the burden of ensuring the methods that are able to be called are left up to the user. class CustomnetWorker extends Worker { + constructor() { + super(...arguments); + this.clientConfig = (0, utils_1.urlConfigFromNetwork)({ network: 'custom', rpcAddr: this.config.rpcAddr }); + } static async init(config) { (0, internal_utils_1.debug)('Lifecycle.CustomnetWorker.create()', 'config:', config); - const fullConfig = { ...this.defaultConfig, ...config }; + const fullConfig = { + homeDir: 'ignored', + port: 3030, + rm: false, + refDir: null, + ...(0, utils_1.urlConfigFromNetwork)({ network: 'custom', rpcAddr: config.rpcAddr }), + ...config, + }; const worker = new CustomnetWorker(fullConfig); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } await worker.manager.init(); return worker; } get provider() { - return jsonrpc_1.JsonRpcProvider.from(CustomnetWorker.clientConfig); + return jsonrpc_1.JsonRpcProvider.from(this.clientConfig); } async tearDown() { - // We are not stopping any server here because we are using Testnet + // We are not stopping any server here because it is an external network. return Promise.resolve(); } - static get defaultConfig() { + get defaultConfig() { return { homeDir: 'ignored', port: 3030, @@ -81,9 +98,6 @@ class CustomnetWorker extends Worker { ...this.clientConfig, }; } - static get clientConfig() { - return (0, utils_1.urlConfigFromNetwork)('custom'); - } } exports.CustomnetWorker = CustomnetWorker; class TestnetWorker extends Worker { @@ -91,6 +105,11 @@ class TestnetWorker extends Worker { (0, internal_utils_1.debug)('Lifecycle.TestnetWorker.create()', 'config:', config); const fullConfig = { ...this.defaultConfig, ...config }; const worker = new TestnetWorker(fullConfig); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } await worker.manager.init(); return worker; } @@ -139,6 +158,11 @@ class SandboxWorker extends Worker { const release = await (0, proper_lockfile_1.lock)(syncFilename, retryOptions); const defaultConfig = await this.defaultConfig(); const worker = new SandboxWorker({ ...defaultConfig, ...config }); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } worker.server = await server_1.SandboxServer.init(worker.config); await worker.server.start(); // Release file lock after near node start diff --git a/packages/js/dist/worker.js.map b/packages/js/dist/worker.js.map index a0451157..a5016dfd 100644 --- a/packages/js/dist/worker.js.map +++ b/packages/js/dist/worker.js.map @@ -1 +1 @@ -{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,2CAAgC;AAChC,qDAAqC;AACrC,mCAAgE;AAEhE,uCAA0E;AAC1E,uCAA0C;AAC1C,qDAAuC;AACvC,4CAA8C;AAE9C,MAAM,cAAc,GAAG,WAAW,CAAC;AAEnC;;GAEG;AACH,MAAsB,MAAM;IAK1B,YAAY,MAAc;QACxB,IAAA,sBAAK,EAAC,8BAA8B,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,wBAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAA0B,EAAE;;QAC5C,IAAA,sBAAK,EAAC,yBAAyB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACpD,QAAQ,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,yBAAiB,GAAE,EAAE;YAC7C,KAAK,SAAS;gBACZ,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpC,KAAK,SAAS;gBACZ,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpC,KAAK,QAAQ;gBACX,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtC;gBACE,MAAM,IAAI,KAAK,CACb,qBAAqB,MAAM,CAAC,OAAO,aAAa,CAAC,uEAAuE;sBACpH,gFAAgF,CACrF,CAAC;SACL;IACH,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;CAKF;AAjDD,wBAiDC;AAED,+BAA+B;AAC/B,+FAA+F;AAC/F,MAAa,eAAgB,SAAQ,MAAM;IAA3C;;QACmB,iBAAY,GAAiB,IAAA,4BAAoB,EAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAC,CAAC,CAAC;IA0CxH,CAAC;IAxCC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAuB;QACvC,IAAA,sBAAK,EAAC,oCAAoC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG;YACjB,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI;YACZ,GAAG,IAAA,4BAAoB,EAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAC,CAAC;YACrE,GAAG,MAAM;SACV,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG;gBACnC,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM;aACvE,CAAC;SACH;QAED,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,yBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,yEAAyE;QACzE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa;QACf,OAAO;YACL,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI;YACZ,GAAG,IAAI,CAAC,YAAY;SACrB,CAAC;IACJ,CAAC;CACF;AA3CD,0CA2CC;AAED,MAAa,aAAc,SAAQ,MAAM;IACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAuB;QACvC,IAAA,sBAAK,EAAC,kCAAkC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,EAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,EAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG;gBACnC,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM;aACvE,CAAC;SACH;QAED,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,yBAAe,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,kEAAkE;QAClE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,aAAa;QACtB,OAAO;YACL,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI;YACZ,GAAG,IAAI,CAAC,YAAY;SACrB,CAAC;IACJ,CAAC;IAEO,MAAM,KAAK,YAAY;QAC7B,OAAO,IAAA,4BAAoB,EAAC,SAAS,CAAC,CAAC;IACzC,CAAC;CACF;AAtCD,sCAsCC;AAED,MAAa,aAAc,SAAQ,MAAM;IAGvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAuB;QACvC,IAAA,sBAAK,EAAC,kCAAkC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAG,sBAAa,CAAC,YAAY,CAAC,8BAA8B,CAAC,CAAC;QAChF,IAAI;YACF,YAAE,CAAC,UAAU,CAAC,YAAY,EAAE,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SAChD;QAAC,MAAM;YACN,IAAA,sBAAK,EAAC,2BAA2B,EAAE,YAAY,CAAC,CAAC;YACjD,YAAE,CAAC,aAAa,CAAC,YAAY,EAAE,6BAA6B,CAAC,CAAC;SAC/D;QAED,MAAM,YAAY,GAAG;YACnB,OAAO,EAAE;gBACP,OAAO,EAAE,GAAG;gBACZ,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,GAAG;gBACf,UAAU,EAAE,CAAC,GAAG,IAAI;gBACpB,SAAS,EAAE,IAAI;aAChB;SACF,CAAC;QAEF,yDAAyD;QACzD,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAI,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAC,GAAG,aAAa,EAAE,GAAG,MAAM,EAAC,CAAC,CAAC;QAChE,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG;gBACnC,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM;aACvE,CAAC;SACH;QAED,MAAM,CAAC,MAAM,GAAG,MAAM,sBAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,0CAA0C;QAC1C,MAAM,OAAO,EAAE,CAAC;QAChB,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa;QACxB,MAAM,IAAI,GAAG,MAAM,sBAAa,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO;YACL,GAAG,IAAI,CAAC,YAAY;YACpB,OAAO,EAAE,sBAAa,CAAC,aAAa,EAAE;YACtC,IAAI;YACJ,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,oBAAoB,IAAI,EAAE;SACpC,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,yBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SAC3B;QAAC,OAAO,KAAc,EAAE;YACvB,IAAA,sBAAK,EAAC,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAC3E;IACH,CAAC;IAEO,MAAM,KAAK,YAAY;QAC7B,OAAO;YACL,OAAO,EAAE,SAAS;YAClB,aAAa,EAAE,WAAW;YAC1B,OAAO,EAAE,EAAE;YACX,cAAc,EAAE,iBAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;SAC7C,CAAC;IACJ,CAAC;IAED,IAAY,OAAO;QACjB,OAAO,oBAAoB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAChD,CAAC;CACF;AA7ED,sCA6EC"} \ No newline at end of file diff --git a/packages/js/src/account/account-manager.ts b/packages/js/src/account/account-manager.ts index 2cc9485e..0db38ac2 100644 --- a/packages/js/src/account/account-manager.ts +++ b/packages/js/src/account/account-manager.ts @@ -29,7 +29,9 @@ export abstract class AccountManager implements NearAccountManager { return new SandboxManager(config); case 'testnet': return new TestnetManager(config); - default: throw new Error(`Bad network id: "${network as string}"; expected "testnet" or "sandbox"`); + case 'custom': + return new CustomnetManager(config); + default: throw new Error(`Bad network id: "${network as string}"; expected "testnet", "custom" or "sandbox"`); } } @@ -220,6 +222,32 @@ export abstract class AccountManager implements NearAccountManager { } } +export class CustomnetManager extends AccountManager { + get DEFAULT_INITIAL_BALANCE(): string { + return NEAR.parse('10 N').toJSON(); + } + + get defaultKeyStore(): KeyStore { + return new nearAPI.keyStores.InMemoryKeyStore(); + } + + get connection(): nearAPI.Connection { + return new nearAPI.Connection(this.networkId, this.provider, this.signer, `jsvm.${this.networkId}`); + } + + get networkId(): string { + return this.config.network; + } + + async init(): Promise { + return this; + } + + async createFrom(config: Config): Promise { + return new CustomnetManager(config); + } +} + export class TestnetManager extends AccountManager { static readonly KEYSTORE_PATH: string = path.join(process.cwd(), '.near-credentials', 'workspaces'); private static numTestAccounts = 0; diff --git a/packages/js/src/utils.ts b/packages/js/src/utils.ts index 09c736eb..0949c251 100644 --- a/packages/js/src/utils.ts +++ b/packages/js/src/utils.ts @@ -62,8 +62,6 @@ function configFromDomain(network: 'testnet' | 'mainnet' | 'custom'): ClientConf rpcAddr = process.env.NEAR_CLI_MAINNET_RPC_SERVER_URL; } else if (network === 'testnet' && process.env.NEAR_CLI_TESTNET_RPC_SERVER_URL) { rpcAddr = process.env.NEAR_CLI_TESTNET_RPC_SERVER_URL; - } else if (network === 'custom' && process.env.NEAR_CLI_CUSTOM_RPC_SERVER_URL) { - rpcAddr = process.env.NEAR_CLI_CUSTOM_RPC_SERVER_URL; } return { @@ -76,8 +74,9 @@ function configFromDomain(network: 'testnet' | 'mainnet' | 'custom'): ClientConf }; } -export function urlConfigFromNetwork(network: string | {network: string}): ClientConfig { +export function urlConfigFromNetwork(network: string | {network: string; rpcAddr?: string}): ClientConfig { const networkName = typeof network === 'string' ? network : network.network; + const rpcAddr = typeof network === 'string' ? undefined : network.rpcAddr; switch (networkName) { case 'sandbox': return { @@ -85,9 +84,14 @@ export function urlConfigFromNetwork(network: string | {network: string}): Clien rpcAddr: 'http://localhost', }; + case 'custom': + return { + network: 'custom', + rpcAddr: rpcAddr!, + }; + case 'testnet': - case 'mainnet': - case 'custom': return configFromDomain(networkName); + case 'mainnet': return configFromDomain(networkName); default: throw new Error(`Got network ${networkName}, but only accept 'sandbox', 'testnet', 'mainnet' and 'custom'`); } diff --git a/packages/js/src/worker.ts b/packages/js/src/worker.ts index f14aebd5..579cffd6 100644 --- a/packages/js/src/worker.ts +++ b/packages/js/src/worker.ts @@ -8,6 +8,8 @@ import {JsonRpcProvider} from './jsonrpc'; import {debug} from './internal-utils'; import {SandboxServer} from './server/server'; +const API_KEY_HEADER = 'x-api-key'; + /** * The main interface to near-workspaces. Create a new worker instance with {@link Worker.init}, then run code on it. */ @@ -65,24 +67,40 @@ export abstract class Worker { // Connect to a custom network. // Note: the burden of ensuring the methods that are able to be called are left up to the user. export class CustomnetWorker extends Worker { + private readonly clientConfig: ClientConfig = urlConfigFromNetwork({network: 'custom', rpcAddr: this.config.rpcAddr}); + static async init(config: Partial): Promise { debug('Lifecycle.CustomnetWorker.create()', 'config:', config); - const fullConfig = {...this.defaultConfig, ...config}; + const fullConfig = { + homeDir: 'ignored', + port: 3030, + rm: false, + refDir: null, + ...urlConfigFromNetwork({network: 'custom', rpcAddr: config.rpcAddr}), // Copied over, can't access member clientConfig here + ...config, + }; + const worker = new CustomnetWorker(fullConfig); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } + await worker.manager.init(); return worker; } get provider(): JsonRpcProvider { - return JsonRpcProvider.from(CustomnetWorker.clientConfig); + return JsonRpcProvider.from(this.clientConfig); } async tearDown(): Promise { - // We are not stopping any server here because we are using Testnet + // We are not stopping any server here because it is an external network. return Promise.resolve(); } - static get defaultConfig(): Config { + get defaultConfig(): Config { return { homeDir: 'ignored', port: 3030, @@ -91,17 +109,20 @@ export class CustomnetWorker extends Worker { ...this.clientConfig, }; } - - private static get clientConfig(): ClientConfig { - return urlConfigFromNetwork('custom'); - } } export class TestnetWorker extends Worker { static async init(config: Partial): Promise { debug('Lifecycle.TestnetWorker.create()', 'config:', config); const fullConfig = {...this.defaultConfig, ...config}; + const worker = new TestnetWorker(fullConfig); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } + await worker.manager.init(); return worker; } @@ -157,6 +178,12 @@ export class SandboxWorker extends Worker { const release = await lock(syncFilename, retryOptions); const defaultConfig = await this.defaultConfig(); const worker = new SandboxWorker({...defaultConfig, ...config}); + if (config.apiKey) { + worker.provider.connection.headers = { + ...worker.provider.connection.headers, [API_KEY_HEADER]: config.apiKey, + }; + } + worker.server = await SandboxServer.init(worker.config); await worker.server.start(); // Release file lock after near node start