Env usage localized in api.js

examples/cross-contract-call/src/index.js

@@ -9,20 +9,20 @@ class OnCall extends NearContract {
 
     @call
     set_person_on_call(accountId) {
-        env.log(`Trying to set ${accountId} on-call`)
+        near.log(`Trying to set ${accountId} on-call`)
         const status = near.jsvmCall('status-message.test.near', 'get_status', [accountId])
-        env.log(`${accountId} status is ${status}`)
+        near.log(`${accountId} status is ${status}`)
         if (status === 'AVAILABLE') {
             this.personOnCall = accountId
-            env.log(`${accountId} set on-call`)
+            near.log(`${accountId} set on-call`)
         } else {
-            env.log(`${accountId} can not be set on-call`)
+            near.log(`${accountId} can not be set on-call`)
         }
     }
 
     @view
     person_on_call() {
-        env.log(`Returning person on-call: ${this.personOnCall}`)
+        near.log(`Returning person on-call: ${this.personOnCall}`)
         return this.personOnCall
     }
 }

examples/status-message/src/status-message-collections.js

@@ -19,14 +19,14 @@ class StatusMessage extends NearContract {
     @call
     set_status(message) {
         let account_id = near.signerAccountId()
-        env.log(`${account_id} set_status with message ${message}`)
+        near.log(`${account_id} set_status with message ${message}`)
         this.records.set(account_id, message)
         this.uniqueValues.set(message)
     }
 
     @view
     get_status(account_id) {
-        env.log(`get_status for account_id ${account_id}`)
+        near.log(`get_status for account_id ${account_id}`)
         return this.records.get(account_id)
     }
 

examples/status-message/src/status-message.js

@@ -10,13 +10,13 @@ class StatusMessage extends NearContract {
     @call
     set_status(message) {
         let account_id = near.signerAccountId()
-        env.log(`${account_id} set_status with message ${message}`)
+        near.log(`${account_id} set_status with message ${message}`)
         this.records[account_id] = message
     }
 
     @view
     get_status(account_id) {
-        env.log(`get_status for account_id ${account_id}`)
+        near.log(`get_status for account_id ${account_id}`)
         return this.records[account_id] || null
     }
 }

examples/template/src/index.js

@@ -1,4 +1,4 @@
-import {NearContract, NearBindgen, call, view} from 'near-sdk-js'
+import {NearContract, NearBindgen, near, call, view} from 'near-sdk-js'
 import {isUndefined} from 'lodash-es'
 
 @NearBindgen
@@ -11,7 +11,7 @@ class Counter extends NearContract {
     @call
     increase(n=1) {
         this.count += n
-        env.log(`Counter increased to ${this.count}`)
+        near.log(`Counter increased to ${this.count}`)
     }
 
     @call
@@ -23,7 +23,7 @@ class Counter extends NearContract {
         } else {
             this.count -= n
         }
-        env.log(`Counter decreased to ${this.count}`)
+        near.log(`Counter decreased to ${this.count}`)
     }
 
     @view

package.json

@@ -20,7 +20,7 @@
   ],
   "license": "(MIT AND Apache-2.0)",
   "scripts": {
-    "test": "cd tests && yarn && yarn build && yarn test && cd .."
+    "test": "cd tests && yarn rebuild && yarn test && cd .."
   },
   "bin": {
     "near-sdk": "cli/cli.js"

src/api.js

@@ -1,6 +1,10 @@
 const U64_MAX = 2n**64n - 1n
 const EVICTED_REGISTER = U64_MAX - 1n
 
+export function log(message) {
+    env.log(message)
+}
+
 export function signerAccountId() {
     env.signer_account_id(0)
     return env.read_register(0)

src/near-contract.js

@@ -1,20 +1,21 @@
+import * as near from './api'
+
 export class NearContract {
     deserialize() {
-        let hasRead = env.jsvm_storage_read('STATE', 0)
-        if (hasRead != 0) {
-            let state = env.read_register(0)
+        let state = near.jsvmStorageRead('STATE');
+        if (state) {
             Object.assign(this, JSON.parse(state))
-        } else
+        } else {
             throw new Error('Contract state is empty')
+        }
     }
 
     serialize() {
-        env.jsvm_storage_write('STATE', JSON.stringify(this), 0)
+        near.jsvmStorageWrite('STATE', JSON.stringify(this));
     }
 
     static deserializeArgs() {
-        env.jsvm_args(0)
-        let args = env.read_register(0)
+        let args = near.jsvmArgs();
         return JSON.parse(args || '[]')
     }
 

tests/package.json

@@ -6,6 +6,7 @@
     "type": "module",
     "scripts": {
         "build": "./build.sh",
+        "rebuild": "rm -rf node_modules && rm -rf build && yarn && yarn build",
         "test": "ava"
     },
     "author": "Near Inc <hello@nearprotocol.com>",