Workspaces 3.1.0

.github/workflows/standalone-examples.yml

@@ -4,7 +4,7 @@ jobs:
  examples:
  strategy:
  matrix:
- platform: [ubuntu-latest, macos-latest]
+ platform: [ubuntu-latest] # macos-latest
  runs-on: ${{ matrix.platform }}
  steps:
  - uses: actions/checkout@v2

examples/__tests__/test-clean-state.ava.js

@@ -9,10 +9,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the clean-state contract.
- const cleanState = await root.createAndDeploy(
- root.getSubAccount('cleanstate').accountId,
- './build/clean-state.wasm',
- );
+ const cleanState = await root.devDeploy('./build/clean-state.wasm');
 
  // Init the contract
  await cleanState.call(cleanState, 'init', {});

examples/__tests__/test-counter.ava.js

@@ -9,8 +9,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the counter contract.
- const counter = await root.createAndDeploy(
- root.getSubAccount('counter').accountId,
+ const counter = await root.devDeploy(
  process.env['COUNTER_LOWLEVEL'] ? 
  './build/counter-lowlevel.wasm' :
  (process.env['COUNTER_TS'] ? './build/counter-ts.wasm' : './build/counter.wasm')

examples/__tests__/test-cross-contract-call.ava.js

@@ -8,23 +8,21 @@ test.beforeEach(async t => {
  // Prepare sandbox for tests, create accounts, deploy contracts, etx.
  const root = worker.rootAccount;
 
- // Deploy the onCall contract.
- const onCall = await root.createAndDeploy(
- root.getSubAccount('oncall').accountId,
- './build/cross-contract-call.wasm',
+ // Deploy status-message the contract.
+ const statusMessage = await root.devDeploy(
+ './build/status-message.wasm',
  );
 
  // Init the contract
- await onCall.call(onCall, 'init', {});
+ await statusMessage.call(statusMessage, 'init', {});
 
- // Deploy status-message the contract.
- const statusMessage = await root.createAndDeploy(
- root.getSubAccount('statusmessage').accountId,
- './build/status-message.wasm',
+ // Deploy the onCall contract.
+ const onCall = await root.devDeploy(
+ './build/cross-contract-call.wasm',
  );
 
  // Init the contract
- await statusMessage.call(statusMessage, 'init', {});
+ await onCall.call(onCall, 'init', { statusMessageContract: statusMessage.accountId });
 
  // Create test accounts
  const ali = await root.createSubAccount('ali');
@@ -61,7 +59,6 @@ test('Person can be set on-call if AVAILABLE', async t => {
  // Bob sets Ali on-call
  await bob.call(onCall, 'set_person_on_call', { accountId: ali.accountId }, { gas: 120000000000000 });
 
-
  // Check that Ali is on-call
  t.is(
  await onCall.view('person_on_call', {}),

examples/__tests__/test-fungible-token-lockable.ava.js

@@ -9,8 +9,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the lockable-ft contract.
- const lockableFt = await root.createAndDeploy(
- root.getSubAccount('lockableft').accountId,
+ const lockableFt = await root.devDeploy(
  './build/fungible-token-lockable.wasm',
  );
 

examples/__tests__/test-fungible-token.ava.js

@@ -9,8 +9,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the ft contract.
- const ft = await root.createAndDeploy(
- root.getSubAccount('ft').accountId,
+ const ft = await root.devDeploy(
  './build/fungible-token.wasm',
  );
 

examples/__tests__/test-non-fungible-token.ava.js

@@ -9,17 +9,15 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the nft contract.
- const nft = await root.createAndDeploy(
- root.getSubAccount('nft').accountId,
+ const nft = await root.devDeploy(
  './build/non-fungible-token.wasm',
  );
 
  // Init the contract
  await nft.call(nft, 'init', { owner_id: nft.accountId, owner_by_id_prefix: 'a' });
 
  // Deploy the tokenReceiver contract.
- const tokenReceiver = await root.createAndDeploy(
- root.getSubAccount('tokenreceiver').accountId,
+ const tokenReceiver = await root.devDeploy(
  './build/non-fungible-token-receiver.wasm',
  );
 

examples/__tests__/test-status-message-collections.ava.js

@@ -9,8 +9,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the statis-message contract.
- const statusMessage = await root.createAndDeploy(
- root.getSubAccount('statusmessage').accountId,
+ const statusMessage = await root.devDeploy(
  './build/status-message-collections.wasm',
  );
 

examples/__tests__/test-status-message.ava.js

@@ -9,8 +9,7 @@ test.before(async t => {
  const root = worker.rootAccount;
 
  // Deploy the contract.
- const statusMessage = await root.createAndDeploy(
- root.getSubAccount('statusmessage').accountId,
+ const statusMessage = await root.devDeploy(
  './build/status-message.wasm',
  );
 

examples/package.json

@@ -37,7 +37,7 @@
  },
  "devDependencies": {
  "ava": "^4.2.0",
- "near-workspaces": "2.0.0",
+ "near-workspaces": "3.1.0",
  "typescript": "^4.7.4"
  }
 }

examples/src/cross-contract-call.js

@@ -2,15 +2,16 @@ import { NearContract, NearBindgen, call, view, near, bytes } from 'near-sdk-js'
 
 @NearBindgen
 class OnCall extends NearContract {
- constructor({ }) {
+ constructor({ statusMessageContract }) {
  super()
  this.personOnCall = "undefined"
+ this.statusMessageContract = statusMessageContract
  }
 
  @call
  set_person_on_call({ accountId }) {
  near.log(`Trying to set ${accountId} on-call`)
- const promise = near.promiseBatchCreate('statusmessage.test.near')
+ const promise = near.promiseBatchCreate(this.statusMessageContract)
  near.promiseBatchActionFunctionCall(promise, 'get_status', bytes(JSON.stringify({ account_id: accountId })), 0, 30000000000000)
  near.promiseThen(promise, near.currentAccountId(), '_set_person_on_call_private', bytes(JSON.stringify({ accountId: accountId })), 0, 30000000000000);
  }

jsvm/examples/__tests__/test-clean-state.ava.js

@@ -15,8 +15,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-counter.ava.js

@@ -16,8 +16,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-cross-contract-call.ava.js

@@ -15,8 +15,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-fungible-token-lockable.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-fungible-token.ava.js

@@ -15,8 +15,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-non-fungible-token.ava.js

@@ -15,8 +15,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-status-message-collections.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/__tests__/test-status-message.ava.js

@@ -14,8 +14,7 @@ test.before(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  './node_modules/near-sdk-js/jsvm/build/jsvm.wasm',
  );
 

jsvm/examples/package.json

@@ -33,6 +33,6 @@
  },
  "devDependencies": {
  "ava": "^4.2.0",
- "near-workspaces": "^2.0.0"
+ "near-workspaces": "^3.0.0"
  }
 }

jsvm/tests/__tests__/bytes.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/function-params.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/lookup-map.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/lookup-set.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/unordered-map.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/unordered-set.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/__tests__/vector.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the jsvm contract.
- const jsvm = await root.createAndDeploy(
- root.getSubAccount('jsvm').accountId,
+ const jsvm = await root.devDeploy(
  '../../jsvm/build/jsvm.wasm',
  );
 

jsvm/tests/package.json

@@ -16,6 +16,6 @@
  },
  "devDependencies": {
  "ava": "^4.2.0",
- "near-workspaces": "^2.0.0"
+ "near-workspaces": "^3.0.0"
  }
 }

lib/api.d.ts

@@ -69,4 +69,4 @@ export declare function promiseResult(resultIdx: number | BigInt): Bytes | Promi
 export declare function promiseReturn(promiseIdx: number | BigInt): void;
 export declare function storageWrite(key: Bytes, value: Bytes): boolean;
 export declare function storageRemove(key: Bytes): boolean;
-export declare function storage_byte_cost(): BigInt;
+export declare function storageByteCost(): BigInt;

lib/api.js

@@ -288,6 +288,6 @@ export function storageRemove(key) {
  }
  return false;
 }
-export function storage_byte_cost() {
+export function storageByteCost() {
  return 10000000000000000000n;
 }

tests/__tests__/bytes.ava.js

@@ -14,8 +14,7 @@ test.beforeEach(async t => {
  const root = worker.rootAccount;
 
  // Deploy the test contract.
- const bytesContract = await root.createAndDeploy(
- root.getSubAccount('test-contract').accountId,
+ const bytesContract = await root.devDeploy(
  'build/bytes.wasm',
  );
  // Test users