Merge branch 'master' into update-readme

.github/workflows/examples.yml

@@ -21,8 +21,6 @@ jobs:
         run: cd examples/non-fungible-token && yarn && yarn build && yarn test && rm -rf node_modules && rm -rf build && cd ../..
       - name: status-message
         run: cd examples/status-message && yarn && yarn build && yarn test && rm -rf node_modules && rm -rf build && cd ../..
-      - name: status-message-collections
-        run: cd examples/status-message-collections && yarn && yarn build && yarn test && rm -rf node_modules && rm -rf build && cd ../..
       - name: clean-state
         run: cd examples/clean-state && yarn && yarn build && yarn test && rm -rf node_modules && rm -rf build && cd ../..
       - name: template

examples/status-message/README.md

@@ -1,18 +1,16 @@
 # Status message contract in JavaScript
 
-This is an equivalent JavaScript implementation of the status message example. Every user can store a message on chain. Every user can view everyone's message.
+This is an equivalent JavaScript implementation of the status message example. Every user can store a message on chain. Every user can view everyone's message. Logic is implemented two times with the use of collections and without them.
 
 ## Build the contract
-
-First ensure JSVM contract is build and deployed locally, follow [Local Installation](https://github.com/near/near-sdk-js#local-installation). Then run:
 ```
 npm i
 npm run build
 ```
 
-Result contract bytecode file will be in `build/status-message.base64`. Intermediate JavaScript file can be found in `build/status-message.js`. You'll only need the `base64` file to deploy contract to chain. The intermediate JavaScript file is for curious user and near-sdk-js developers to understand what code generation happened under the hood.
+Result contract bytecode files will be stored in `build/status-message.base64` and `build/status-message-collections.base64`. Intermediate JavaScript file can be found in `build/` folder. You'll only need the `base64` file to deploy contract to chain. The intermediate JavaScript file is for curious user and near-sdk-js developers to understand what code generation happened under the hood.
 
-## Test the contract with workspaces-js
+## Test the contracts with workspaces-js
 ```
 npm run test
 ```
@@ -75,4 +73,4 @@ near js view status-message.test.near get_status --args '["alice.test.near"]' --
     near call jsvm.test.near call_js_contract --accountId bob.test.near --base64 --args $(node encode_call.js status-message.test.near get_status '["alice.test.near"]')
 
 </p>
-</details>
+</details>

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

@@ -21,7 +21,7 @@ test.beforeEach(async t => {
 
     // Deploy status-message JS contract
     const statusMessage = await root.createSubAccount('status-message');
-    let contract_base64 = (await readFile('build/contract.base64')).toString();
+    let contract_base64 = (await readFile('build/status-message-collections.base64')).toString();
     await statusMessage.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), {attachedDeposit: '400000000000000000000000'});
     await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', []), {attachedDeposit: '400000000000000000000000'});
 

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

@@ -21,7 +21,7 @@ test.before(async t => {
 
     // Deploy status-message JS contract
     const statusMessage = await root.createSubAccount('status-message');
-    let contract_base64 = (await readFile('build/contract.base64')).toString();
+    let contract_base64 = (await readFile('build/status-message.base64')).toString();
     await statusMessage.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), {attachedDeposit: '400000000000000000000000'});
     await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', []), {attachedDeposit: '400000000000000000000000'});
 

examples/status-message/package.json

@@ -5,7 +5,9 @@
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "build": "near-sdk build",
+    "build": "yarn build:simple && yarn build:collections",
+    "build:simple": "near-sdk build src/status-message.js build/status-message.base64",
+    "build:collections": "near-sdk build src/status-message-collections.js build/status-message-collections.base64",
     "test": "ava"
   },
   "author": "Near Inc <hello@nearprotocol.com>",