@leofcoin/standards 0.1.4 → 0.1.6

package/exports/helpers.d.ts

@@ -0,0 +1,2 @@
+export declare const restoreBalances: (balances: any) => {};
+export declare const restoreApprovals: (approvals: any) => {};

package/exports/token.d.ts

@@ -3,11 +3,15 @@ export declare type TokenState = {
     roles: {
         [index: string]: address[];
     };
-    holders: number;
+    holders: BigNumberish;
     balances: {
-        [index: string]: BigNumberish;
+        [address: address]: BigNumberish;
+    };
+    approvals: {
+        [owner: address]: {
+            [operator: address]: BigNumberish;
+        };
     };
-    approvals: {};
     totalSupply: BigNumberish;
 };
 export default class Token extends Roles {

package/exports/token.js

@@ -1,5 +1,24 @@
 import Roles from './roles.js';
 
+// when state is stored it get encoded as a string to  so we need to reformat balances back to BigNumbers
+const restoreBalances = (balances) => {
+    const _balances = {};
+    for (const address in balances) {
+        _balances[address] = BigNumber['from'](balances[address]);
+    }
+    return _balances;
+};
+const restoreApprovals = (approvals) => {
+    const _approvals = {};
+    for (const owner in approvals) {
+        _approvals[owner] = {};
+        for (const operator in approvals[owner]) {
+            _approvals[owner][operator] = BigNumber['from'](approvals[owner][operator]);
+        }
+    }
+    return _approvals;
+};
+
 class Token extends Roles {
     /**
      * string
@@ -31,10 +50,10 @@ class Token extends Roles {
             throw new Error(`symbol undefined`);
         super(state?.roles);
         if (state) {
+            this.#balances = restoreBalances(state.balances);
+            this.#approvals = restoreApprovals(state.approvals);
             this.#holders = BigNumber['from'](state.holders);
-            this.#balances = state.balances;
-            this.#approvals = state.approvals;
-            this.#totalSupply = state.totalSupply;
+            this.#totalSupply = BigNumber['from'](state.totalSupply);
         }
         else {
             this.#name = name;
@@ -116,7 +135,7 @@ class Token extends Roles {
         const owner = msg.sender;
         if (!this.#approvals[owner])
             this.#approvals[owner] = {};
-        this.#approvals[owner][operator] = amount;
+        this.#approvals[owner][operator] = BigNumber['from'](amount);
     }
     approved(owner, operator, amount) {
         return this.#approvals[owner][operator] === amount;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/standards",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Contract standards",
   "type": "module",
   "exports": {

package/src/helpers.ts

@@ -0,0 +1,19 @@
+// when state is stored it get encoded as a string to  so we need to reformat balances back to BigNumbers
+export const restoreBalances = (balances) => {
+  const _balances = {}
+  for (const address in balances) {
+    _balances[address] = BigNumber['from'](balances[address])
+  }
+  return _balances
+}
+
+export const restoreApprovals = (approvals) => {
+  const _approvals = {}
+  for (const owner in approvals) {
+    _approvals[owner] = {}
+    for (const operator in approvals[owner]) {
+      _approvals[owner][operator] = BigNumber['from'](approvals[owner][operator])
+    }
+  }
+  return _approvals
+}

package/src/token.ts

@@ -1,10 +1,11 @@
+import { restoreApprovals, restoreBalances } from './helpers.js'
 import Roles from './roles.js'
 
 export declare type TokenState = {
   roles: { [index: string]: address[] }
-  holders: number
-  balances: { [index: string]: BigNumberish }
-  approvals: {}
+  holders: BigNumberish
+  balances: { [address: address]: BigNumberish }
+  approvals: { [owner: address]: { [operator: address]: BigNumberish } }
   totalSupply: BigNumberish
 }
 
@@ -28,11 +29,11 @@ export default class Token extends Roles {
   /**
    * Object => Object => uint
    */
-  #approvals = {}
+  #approvals: { [owner: string]: { [operator: string]: typeof BigNumber } } = {}
 
   #decimals = 18
 
-  #totalSupply = BigNumber['from'](0)
+  #totalSupply: typeof BigNumber = BigNumber['from'](0)
 
   // this.#privateField2 = 1
   constructor(name: string, symbol: string, decimals: number = 18, state?: TokenState) {
@@ -42,10 +43,10 @@ export default class Token extends Roles {
     super(state?.roles)
 
     if (state) {
+      this.#balances = restoreBalances(state.balances)
+      this.#approvals = restoreApprovals(state.approvals)
       this.#holders = BigNumber['from'](state.holders)
-      this.#balances = state.balances
-      this.#approvals = state.approvals
-      this.#totalSupply = state.totalSupply
+      this.#totalSupply = BigNumber['from'](state.totalSupply)
     } else {
       this.#name = name
       this.#symbol = symbol
@@ -138,7 +139,7 @@ export default class Token extends Roles {
   setApproval(operator: address, amount: BigNumberish) {
     const owner = msg.sender
     if (!this.#approvals[owner]) this.#approvals[owner] = {}
-    this.#approvals[owner][operator] = amount
+    this.#approvals[owner][operator] = BigNumber['from'](amount)
   }
 
   approved(owner: address, operator: address, amount: BigNumberish): boolean {