fix lookup map return behavior proposed by Daniyar

near · May 18, 2022 · 12400ef · 12400ef
1 parent 3c4171d
commit 12400ef
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/sdk/api.js b/sdk/api.js
@@ -1,3 +1,6 @@
+const U64_MAX = 2n**64n - 1n
+const EVICTED_REGISTER = U64_MAX - 1n
+
 export function signerAccountId() {
     env.signer_account_id(0)
     return env.read_register(0)
@@ -88,7 +91,7 @@ export function jsvmArgs() {
 }
 
 export function jsvmStorageWrite(key, value) {
-    let exist = env.jsvm_storage_write(key, value, 0)
+    let exist = env.jsvm_storage_write(key, value, EVICTED_REGISTER)
     if (exist === 1n) {
         return true
     }
@@ -104,7 +107,7 @@ export function jsvmStorageRead(key) {
 }
 
 export function jsvmStorageRemove(key) {
-    let exist = env.jsvm_storage_remove(key, 0)
+    let exist = env.jsvm_storage_remove(key, EVICTED_REGISTER)
     if (exist === 1n) {
         return true
     }
@@ -122,4 +125,8 @@ export function jsvmStorageHasKey(key) {
 export function jsvmCall(contractName, method, args) {
     env.jsvm_call(contractName, method, JSON.stringify(args), 0)
     return JSON.parse(env.read_register(0) || 'null')
+}
+
+export function storageGetEvicted() {
+    return env.read_register(EVICTED_REGISTER)
 }
diff --git a/sdk/collections/lookup-map.js b/sdk/collections/lookup-map.js
@@ -17,12 +17,18 @@ export class LookupMap {
 
     remove(key) {
         let storageKey = this.keyPrefix + key
-        return near.jsvmStorageRemove(storageKey)
+        if (near.jsvmStorageRemove(storageKey)) {
+            return near.storageGetEvicted()
+        }
+        return null
     }
 
     set(key, value) {
         let storageKey = this.keyPrefix + key
-        return near.jsvmStorageWrite(storageKey, value)
+        if (near.jsvmStorageWrite(storageKey, value)) {
+            return near.storageGetEvicted()
+        }
+        return null
     }
 
     extend(kvs) {