funcgible-toke-lockable example fixed

near · Aug 31, 2022 · 589f789 · 589f789
1 parent f4499e5
commit 589f789
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/examples/src/fungible-token-lockable.js b/examples/src/fungible-token-lockable.js
@@ -51,10 +51,15 @@ class Account {
 
 @NearBindgen({ initRequired: true })
 class LockableFungibleToken {
+    constructor() {
+        this.accounts = new LookupMap('a') // Account ID -> Account mapping
+        this.totalSupply = 0 // Total supply of the all tokens
+    }
+
     @initialize
     init({ prefix, totalSupply }) {
-        this.accounts = new LookupMap(prefix) // Account ID -> Account mapping
-        this.totalSupply = totalSupply // Total supply of the all tokens
+        this.accounts = new LookupMap(prefix)
+        this.totalSupply = totalSupply
         let ownerId = near.signerAccountId()
         let ownerAccount = this.getAccount(ownerId)
         ownerAccount.balance = this.totalSupply

diff --git a/lib/build-tools/near-bindgen-exporter.js b/lib/build-tools/near-bindgen-exporter.js
diff --git a/lib/near-bindgen.d.ts b/lib/near-bindgen.d.ts
diff --git a/lib/near-bindgen.js b/lib/near-bindgen.js
diff --git a/src/build-tools/near-bindgen-exporter.js b/src/build-tools/near-bindgen-exporter.js
@@ -39,7 +39,8 @@ export default function () {
               t.variableDeclaration('let', [t.variableDeclarator(t.identifier('_contract'), t.callExpression(t.memberExpression(classId, t.identifier('_create')), []))]),
               contractMethods[method] === 'call' || contractMethods[method] === 'view' ?
                 // if (_state) { Object.assign(_contract, state); }
-                t.ifStatement(t.identifier('_state'), t.blockStatement([t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('Object'), t.identifier('assign')), [t.identifier('_contract'), t.identifier('_state')]))])) : t.emptyStatement(),
+                t.ifStatement(t.identifier('_state'), t.blockStatement([t.expressionStatement(
+                  t.callExpression(t.memberExpression(classId, t.identifier('_reconstruct')), [t.identifier('_contract'), t.identifier('_state')]))])) : t.emptyStatement(),
               // let _args = Counter._getArgs();
               t.variableDeclaration('let', [t.variableDeclarator(t.identifier('_args'), t.callExpression(t.memberExpression(classId, t.identifier('_getArgs')), []))]),
               // let _result = _contract.method(args);

diff --git a/src/near-bindgen.ts b/src/near-bindgen.ts
@@ -37,6 +37,17 @@ export function NearBindgen({ requireInit = false }: { requireInit: boolean }) {
                 return JSON.parse(value);
             }
 
+            static _reconstruct(classObject: any, plainObject: JSON) {
+                for (const item in classObject) {
+                    if (classObject[item].constructor?.deserialize !== undefined) {
+                        classObject[item] = classObject[item].constructor.deserialize(plainObject[item])
+                    } else {
+                        classObject[item] = plainObject[item]
+                    }
+                }
+                return classObject
+            }
+
             static _requireInit(): boolean {
                 return requireInit;
             }