@leofcoin/standards 0.2.9 → 0.2.11

package/exports/contract-creator.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@leofcoin/types/global" />
 export type ContractCreatorState = {
     contractCreator: address;
 };

package/exports/helpers.js

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

package/exports/lock.d.ts

@@ -0,0 +1,37 @@
+/// <reference types="@leofcoin/types/global" />
+import { RolesState } from './roles.js';
+import { IVoting } from './voting/interfaces/i-voting.js';
+import PublicVoting from './voting/public-voting.js';
+export declare interface LockState extends RolesState {
+    holders: bigint;
+    balances: {
+        [address: address]: bigint;
+    };
+    totalSupply: bigint;
+}
+export default class Lock extends PublicVoting implements IVoting {
+    #private;
+    constructor(name: string, symbol: string, decimals?: number, state?: LockState);
+    /**
+     * @return {Object} {holders, balances, ...}
+     */
+    get state(): LockState;
+    get totalSupply(): bigint;
+    get name(): string;
+    get symbol(): string;
+    get holders(): LockState['holders'];
+    get balances(): LockState['balances'];
+    get approvals(): {
+        [owner: string]: {
+            [operator: string]: bigint;
+        };
+    };
+    get decimals(): number;
+    mint(to: address, amount: bigint): void;
+    burn(from: address, amount: bigint): void;
+    balance(): any;
+    balanceOf(address: address): bigint;
+    setApproval(operator: address, amount: bigint): void;
+    approved(owner: address, operator: address, amount: bigint): boolean;
+    transfer(from: address, to: address, amount: bigint): void;
+}

package/exports/roles.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@leofcoin/types/global" />
 import ContractCreator, { ContractCreatorState } from './contract-creator.js';
 export interface RolesState extends ContractCreatorState {
     roles: {

package/exports/staking.d.ts

@@ -1,39 +1,40 @@
+/// <reference types="@leofcoin/types/global" />
 import Roles, { RolesState } from './roles.js';
 export declare interface TokenState extends RolesState {
-    holders: BigNumberish;
+    holders: bigint;
     balances: {
-        [address: address]: BigNumberish;
+        [address: address]: bigint;
     };
     approvals: {
         [owner: address]: {
-            [operator: address]: BigNumberish;
+            [operator: address]: bigint;
         };
     };
-    totalSupply: BigNumberish;
+    totalSupply: bigint;
 }
-export default class Token extends Roles {
+export default class Staking extends Roles {
     #private;
     constructor(name: string, symbol: string, decimals?: number, state?: TokenState);
     /**
      * @return {Object} {holders, balances, ...}
      */
     get state(): TokenState;
-    get totalSupply(): BigNumberish;
+    get totalSupply(): bigint;
     get name(): string;
     get symbol(): string;
     get holders(): TokenState['holders'];
     get balances(): TokenState['balances'];
     get approvals(): {
         [owner: string]: {
-            [operator: string]: import("@ethersproject/bignumber").BigNumber;
+            [operator: string]: bigint;
         };
     };
     get decimals(): number;
-    mint(to: address, amount: BigNumberish): void;
-    burn(from: address, amount: BigNumberish): void;
+    mint(to: address, amount: bigint): void;
+    burn(from: address, amount: bigint): void;
     balance(): any;
-    balanceOf(address: address): BigNumberish;
-    setApproval(operator: address, amount: BigNumberish): void;
-    approved(owner: address, operator: address, amount: BigNumberish): boolean;
-    transfer(from: address, to: address, amount: BigNumberish): void;
+    balanceOf(address: address): bigint;
+    setApproval(operator: address, amount: bigint): void;
+    approved(owner: address, operator: address, amount: bigint): boolean;
+    transfer(from: address, to: address, amount: bigint): void;
 }

package/exports/token-receiver.d.ts

@@ -1,21 +1,22 @@
+/// <reference types="@leofcoin/types/global" />
 import { IVoting } from './voting/interfaces/i-voting.js';
 import PublicVoting, { PublicVotingState } from './voting/public-voting.js';
 export interface TokenReceiverState extends PublicVotingState {
     tokenToReceive: address;
     tokenReceiver: address;
-    tokenAmountToReceive: typeof BigNumber;
+    tokenAmountToReceive: bigint;
     voteType: 'burn' | 'transfer';
 }
 export default class TokenReceiver extends PublicVoting implements IVoting {
     #private;
-    constructor(tokenToReceive: address, tokenAmountToReceive: typeof BigNumber, burns: boolean, state?: TokenReceiverState);
+    constructor(tokenToReceive: address, tokenAmountToReceive: bigint, burns: boolean, state?: TokenReceiverState);
     get tokenToReceive(): string;
-    get tokenAmountToReceive(): import("@ethersproject/bignumber").BigNumber;
+    get tokenAmountToReceive(): bigint;
     get tokenReceiver(): string;
     get state(): {
         tokenReceiver: string;
         tokenToReceive: string;
-        tokenAmountToReceive: import("@ethersproject/bignumber").BigNumber;
+        tokenAmountToReceive: bigint;
         voteType: "burn" | "transfer";
         votes: {
             [id: string]: import("./voting/types.js").Vote;
@@ -42,7 +43,7 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
     _burnTokenToReceive(): Promise<boolean>;
     _canPay(): Promise<any>;
     changeVoteType(type: TokenReceiverState['voteType']): Promise<void>;
-    getTokensOut(amount: typeof BigNumber, receiver: address): void;
+    getTokensOut(amount: bigint, receiver: address): void;
     changeTokenAmountToReceive(): void;
     changeTokenToReceive(): Promise<void>;
 }

package/exports/token-receiver.js

@@ -12,13 +12,13 @@ class TokenReceiver extends PublicVoting {
         if (state) {
             this.#tokenReceiver = state.tokenReceiver;
             this.#tokenToReceive = state.tokenToReceive;
-            this.#tokenAmountToReceive = BigNumber['from'](state.tokenAmountToReceive);
+            this.#tokenAmountToReceive = BigInt(state.tokenAmountToReceive);
             this.#voteType = state.voteType;
         }
         else {
             this.#tokenReceiver = msg.contract;
             this.#tokenToReceive = tokenToReceive;
-            this.#tokenAmountToReceive = BigNumber['from'](tokenAmountToReceive);
+            this.#tokenAmountToReceive = BigInt(tokenAmountToReceive);
             if (burns)
                 this.#voteType = 'burn';
         }
@@ -43,7 +43,7 @@ class TokenReceiver extends PublicVoting {
     }
     async #canVote() {
         const amount = (await msg.staticCall(this.#tokenToReceive, 'balanceOf', [msg.sender]));
-        return amount.gte(this.#tokenAmountToReceive);
+        return amount >= this.#tokenAmountToReceive;
     }
     /**
      * check if sender can pay
@@ -97,7 +97,7 @@ class TokenReceiver extends PublicVoting {
     async changeVoteType(type) {
         if (!this.#canVote())
             throw new Error('not a allowed');
-        if (this.#voteType === 'transfer' && (await this.#balance()).gt(0))
+        if (this.#voteType === 'transfer' && (await this.#balance()) > 0n)
             throw new Error('get tokens out first or they be lost forever');
         else {
             this.createVote(`change the token amount to receive`, `set tokenAmountToReceive`, new Date().getTime() + this.votingDuration, '#changeVoteType', [type]);
@@ -123,7 +123,7 @@ class TokenReceiver extends PublicVoting {
     async changeTokenToReceive() {
         if (!this.#canVote())
             throw new Error('not a allowed');
-        if (!(await this.#balance()).eq(0) && this.#voteType === 'transfer')
+        if ((await this.#balance()) > 0n && this.#voteType === 'transfer')
             throw new Error('get tokens out first or they be lost forever');
         else {
             this.createVote(`change the token to receive`, `set tokenToReceive to a new address`, new Date().getTime() + this.votingDuration, '#changeTokenToReceive', []);

package/exports/token.d.ts

@@ -1,18 +1,20 @@
+/// <reference types="@leofcoin/types/global" />
 import Roles, { RolesState } from './roles.js';
 export declare interface TokenState extends RolesState {
     name: string;
     symbol: string;
     decimals: number;
-    holders: BigNumberish;
+    holders: bigint;
     balances: {
-        [address: address]: BigNumberish;
+        [address: address]: bigint;
     };
     approvals: {
         [owner: address]: {
-            [operator: address]: BigNumberish;
+            [operator: address]: bigint;
         };
     };
-    totalSupply: BigNumberish;
+    totalSupply: bigint;
+    maxSupply: bigint;
 }
 export default class Token extends Roles {
     #private;
@@ -21,22 +23,19 @@ export default class Token extends Roles {
      * @return {Object} {holders, balances, ...}
      */
     get state(): TokenState;
-    get totalSupply(): BigNumberish;
-    get name(): string;
-    get symbol(): string;
+    get maxSupply(): TokenState['maxSupply'];
+    get totalSupply(): TokenState['totalSupply'];
+    get name(): TokenState['name'];
+    get symbol(): TokenState['symbol'];
     get holders(): TokenState['holders'];
     get balances(): TokenState['balances'];
-    get approvals(): {
-        [owner: string]: {
-            [operator: string]: import("@ethersproject/bignumber").BigNumber;
-        };
-    };
-    get decimals(): number;
-    mint(to: address, amount: BigNumberish): void;
-    burn(from: address, amount: BigNumberish): void;
+    get approvals(): TokenState['approvals'];
+    get decimals(): TokenState['decimals'];
+    mint(to: address, amount: bigint): void;
+    burn(from: address, amount: bigint): void;
     balance(): any;
-    balanceOf(address: address): BigNumberish;
-    setApproval(operator: address, amount: BigNumberish): void;
-    approved(owner: address, operator: address, amount: BigNumberish): boolean;
-    transfer(from: address, to: address, amount: BigNumberish): void;
+    balanceOf(address: address): bigint;
+    setApproval(operator: address, amount: bigint): void;
+    approved(owner: address, operator: address, amount: bigint): boolean;
+    transfer(from: address, to: address, amount: bigint): void;
 }

package/exports/token.js

@@ -14,7 +14,7 @@ class Token extends Roles {
     /**
      * uint
      */
-    #holders = BigNumber['from'](0);
+    #holders = BigInt(0);
     /**
      * Object => Object => uint
      */
@@ -24,9 +24,9 @@ class Token extends Roles {
      */
     #approvals = {};
     #decimals = 18;
-    #totalSupply = BigNumber['from'](0);
+    #totalSupply = BigInt(0);
+    #maxSupply = BigInt(0);
     #stakingContract;
-    // this.#privateField2 = 1
     constructor(name, symbol, decimals = 18, state) {
         if (!name)
             throw new Error(`name undefined`);
@@ -36,11 +36,12 @@ class Token extends Roles {
         if (state) {
             this.#balances = restoreBalances(state.balances);
             this.#approvals = restoreApprovals(state.approvals);
-            this.#holders = BigNumber['from'](state.holders);
-            this.#totalSupply = BigNumber['from'](state.totalSupply);
+            this.#holders = BigInt(state.holders);
+            this.#totalSupply = BigInt(state.totalSupply);
             this.#name = name;
             this.#symbol = symbol;
             this.#decimals = decimals;
+            this.#maxSupply = BigInt(state.maxSupply);
         }
         else {
             this.#name = name;
@@ -51,6 +52,7 @@ class Token extends Roles {
     // enables snapshotting
     // needs dev attention so nothing breaks after snapshot happens
     // iow everything that is not static needs to be included in the stateObject
+    // TODO: implement snapshotting test
     /**
      * @return {Object} {holders, balances, ...}
      */
@@ -63,9 +65,13 @@ class Token extends Roles {
             holders: this.holders,
             balances: this.balances,
             approvals: { ...this.#approvals },
-            totalSupply: this.totalSupply
+            totalSupply: this.totalSupply,
+            maxSupply: this.#maxSupply
         };
     }
+    get maxSupply() {
+        return this.#maxSupply;
+    }
     get totalSupply() {
         return this.#totalSupply;
     }
@@ -90,31 +96,46 @@ class Token extends Roles {
     mint(to, amount) {
         if (!this.hasRole(msg.sender, 'MINT'))
             throw new Error('not allowed');
-        this.#totalSupply = this.#totalSupply.add(amount);
-        this.#increaseBalance(to, amount);
+        const supply = this.#totalSupply + amount;
+        if (this.#maxSupply === 0n) {
+            this.#totalSupply = supply;
+            this.#increaseBalance(to, amount);
+        }
+        else {
+            if (supply <= this.#maxSupply) {
+                this.#totalSupply = supply;
+                this.#increaseBalance(to, amount);
+            }
+            else {
+                throw new Error('amount exceeds max supply');
+            }
+        }
     }
     burn(from, amount) {
         if (!this.hasRole(msg.sender, 'BURN') || msg.sender !== from)
             throw new Error('not allowed');
-        const total = this.#totalSupply.sub(amount);
-        if (total.gte(0)) {
+        const total = this.#totalSupply - amount;
+        if (total >= 0) {
             this.#totalSupply = total;
             this.#decreaseBalance(from, amount);
         }
+        else {
+            throw new Error('amount exceeds total supply');
+        }
     }
     #beforeTransfer(from, to, amount) {
         if (!this.#balances[from] || this.#balances[from] < amount)
             throw new Error('amount exceeds balance');
     }
     #updateHolders(address, previousBalance) {
-        if (this.#balances[address].toHexString() === '0x00')
-            this.#holders.sub(1);
-        else if (this.#balances[address].toHexString() !== '0x00' && previousBalance.toHexString() === '0x00')
-            this.#holders.add(1);
+        if (this.#balances[address] === 0n)
+            this.#holders -= 1n;
+        else if (this.#balances[address] !== 0n && previousBalance === 0n)
+            this.#holders += 1n;
     }
     #increaseBalance(address, amount) {
         if (!this.#balances[address])
-            this.#balances[address] = BigNumber['from'](0);
+            this.#balances[address] = BigInt(0);
         const previousBalance = this.#balances[address];
         this.#balances[address] = this.#balances[address].add(amount);
         this.#updateHolders(address, previousBalance);
@@ -134,14 +155,14 @@ class Token extends Roles {
         const owner = msg.sender;
         if (!this.#approvals[owner])
             this.#approvals[owner] = {};
-        this.#approvals[owner][operator] = BigNumber['from'](amount);
+        this.#approvals[owner][operator] = BigInt(amount);
     }
     approved(owner, operator, amount) {
         return this.#approvals[owner][operator] === amount;
     }
     transfer(from, to, amount) {
-        // TODO: is BigNumber?
-        amount = BigNumber['from'](amount);
+        // TODO: is bigint?
+        amount = BigInt(amount);
         this.#beforeTransfer(from, to, amount);
         this.#decreaseBalance(from, amount);
         this.#increaseBalance(to, amount);

package/exports/voting/private-voting.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@leofcoin/types/global" />
 import { ContractCreatorState } from '../contract-creator.js';
 import { IVoting } from './interfaces/i-voting.js';
 import { VotingState } from './types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/standards",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Contract standards",
   "type": "module",
   "exports": {
@@ -48,7 +48,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha --require ts-node/register test/**/*.ts"
   },
   "repository": {
     "type": "git",
@@ -62,13 +62,11 @@
   },
   "homepage": "https://github.com/ArteonToken/standards#readme",
   "devDependencies": {
-    "@changesets/cli": "^2.27.7",
-    "@leofcoin/global-types": "^1.0.0",
+    "@leofcoin/types": "^1.0.17",
     "@rollup/plugin-typescript": "^11.1.6",
-    "rollup": "^4.12.0",
-    "tslib": "^2.5.0"
-  },
-  "dependencies": {
-    "@ethersproject/bignumber": "^5.7.0"
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3",
+    "rollup": "^4.22.1",
+    "tslib": "^2.7.0"
   }
 }

package/src/helpers.ts

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

package/src/interfaces/i-token.ts

@@ -0,0 +1,3 @@
+export interface IToken {
+  
+}

package/src/lock.ts

@@ -1,13 +1,15 @@
 import { restoreApprovals, restoreBalances } from './helpers.js'
 import Roles, { RolesState } from './roles.js'
+import { IVoting } from './voting/interfaces/i-voting.js'
+import PublicVoting from './voting/public-voting.js'
 
 export declare interface LockState extends RolesState {
-  holders: BigNumberish
-  balances: { [address: address]: BigNumberish }
-  totalSupply: BigNumberish
+  holders: bigint
+  balances: { [address: address]: bigint }
+  totalSupply: bigint
 }
 
-export default class Lock extends PublicVoting {
+export default class Lock extends PublicVoting implements IVoting {
   /**
    * string
    */
@@ -19,7 +21,7 @@ export default class Lock extends PublicVoting {
   /**
    * uint
    */
-  #holders: typeof BigNumber = BigNumber['from'](0)
+  #holders: bigint = BigInt(0)
   /**
    * Object => Object => uint
    */
@@ -27,16 +29,16 @@ export default class Lock extends PublicVoting {
   /**
    * Object => Object => uint
    */
-  #approvals: { [owner: string]: { [operator: string]: typeof BigNumber } } = {}
+  #approvals: { [owner: string]: { [operator: string]: bigint } } = {}
 
   #decimals = 18
 
-  #totalSupply: typeof BigNumber = BigNumber['from'](0)
+  #totalSupply: bigint = BigInt(0)
 
   #stakingContract: address
 
   // this.#privateField2 = 1
-  constructor(name: string, symbol: string, decimals: number = 18, state?: TokenState) {
+  constructor(name: string, symbol: string, decimals: number = 18, state?: LockState) {
     if (!name) throw new Error(`name undefined`)
     if (!symbol) throw new Error(`symbol undefined`)
 
@@ -45,8 +47,8 @@ export default class Lock extends PublicVoting {
     if (state) {
       this.#balances = restoreBalances(state.balances)
       this.#approvals = restoreApprovals(state.approvals)
-      this.#holders = BigNumber['from'](state.holders)
-      this.#totalSupply = BigNumber['from'](state.totalSupply)
+      this.#holders = BigInt(state.holders)
+      this.#totalSupply = BigInt(state.totalSupply)
     } else {
       this.#name = name
       this.#symbol = symbol
@@ -60,7 +62,7 @@ export default class Lock extends PublicVoting {
   /**
    * @return {Object} {holders, balances, ...}
    */
-  get state(): TokenState {
+  get state(): LockState {
     return {
       ...super.state,
       holders: this.holders,
@@ -70,7 +72,7 @@ export default class Lock extends PublicVoting {
     }
   }
 
-  get totalSupply(): BigNumberish {
+  get totalSupply(): bigint {
     return this.#totalSupply
   }
 
@@ -82,11 +84,11 @@ export default class Lock extends PublicVoting {
     return this.#symbol
   }
 
-  get holders(): TokenState['holders'] {
+  get holders(): LockState['holders'] {
     return this.#holders
   }
 
-  get balances(): TokenState['balances'] {
+  get balances(): LockState['balances'] {
     return { ...this.#balances }
   }
 
@@ -98,41 +100,40 @@ export default class Lock extends PublicVoting {
     return this.#decimals
   }
 
-  mint(to: address, amount: BigNumberish) {
+  mint(to: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'MINT')) throw new Error('not allowed')
 
-    this.#totalSupply = this.#totalSupply.add(amount)
+    this.#totalSupply = this.#totalSupply + amount
     this.#increaseBalance(to, amount)
   }
 
-  burn(from: address, amount: BigNumberish) {
+  burn(from: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'BURN') || msg.sender !== from) throw new Error('not allowed')
-    const total = this.#totalSupply.sub(amount)
-    if (total.gte(0)) {
+    const total = this.#totalSupply - amount
+    if (total > 0n) {
       this.#totalSupply = total
       this.#decreaseBalance(from, amount)
     }
   }
 
-  #beforeTransfer(from: address, to: address, amount: BigNumberish) {
+  #beforeTransfer(from: address, to: address, amount: bigint) {
     if (!this.#balances[from] || this.#balances[from] < amount) throw new Error('amount exceeds balance')
   }
 
-  #updateHolders(address: address, previousBalance: typeof BigNumber) {
-    if (this.#balances[address].toHexString() === '0x00') this.#holders.sub(1)
-    else if (this.#balances[address].toHexString() !== '0x00' && previousBalance.toHexString() === '0x00')
-      this.#holders.add(1)
+  #updateHolders(address: address, previousBalance: bigint) {
+    if (this.#balances[address] === 0n) this.#holders -= 1n
+    else if (this.#balances[address] !== 0n && previousBalance === 0n) this.#holders += 1n
   }
 
-  #increaseBalance(address: address, amount: BigNumberish) {
-    if (!this.#balances[address]) this.#balances[address] = BigNumber['from'](0)
+  #increaseBalance(address: address, amount: bigint) {
+    if (!this.#balances[address]) this.#balances[address] = BigInt(0)
     const previousBalance = this.#balances[address]
 
     this.#balances[address] = this.#balances[address].add(amount)
     this.#updateHolders(address, previousBalance)
   }
 
-  #decreaseBalance(address: address, amount: BigNumberish) {
+  #decreaseBalance(address: address, amount: bigint) {
     const previousBalance = this.#balances[address]
     this.#balances[address] = this.#balances[address].sub(amount)
     this.#updateHolders(address, previousBalance)
@@ -142,23 +143,23 @@ export default class Lock extends PublicVoting {
     return this.#balances[msg.sender]
   }
 
-  balanceOf(address: address): BigNumberish {
+  balanceOf(address: address): bigint {
     return this.#balances[address]
   }
 
-  setApproval(operator: address, amount: BigNumberish) {
+  setApproval(operator: address, amount: bigint) {
     const owner = msg.sender
     if (!this.#approvals[owner]) this.#approvals[owner] = {}
-    this.#approvals[owner][operator] = BigNumber['from'](amount)
+    this.#approvals[owner][operator] = BigInt(amount)
   }
 
-  approved(owner: address, operator: address, amount: BigNumberish): boolean {
+  approved(owner: address, operator: address, amount: bigint): boolean {
     return this.#approvals[owner][operator] === amount
   }
 
-  transfer(from: address, to: address, amount: BigNumberish) {
+  transfer(from: address, to: address, amount: bigint) {
     // TODO: is BigNumber?
-    amount = BigNumber['from'](amount)
+    amount = BigInt(amount)
     this.#beforeTransfer(from, to, amount)
     this.#decreaseBalance(from, amount)
     this.#increaseBalance(to, amount)

package/src/staking.ts

@@ -2,10 +2,10 @@ import { restoreApprovals, restoreBalances } from './helpers.js'
 import Roles, { RolesState } from './roles.js'
 
 export declare interface TokenState extends RolesState {
-  holders: BigNumberish
-  balances: { [address: address]: BigNumberish }
-  approvals: { [owner: address]: { [operator: address]: BigNumberish } }
-  totalSupply: BigNumberish
+  holders: bigint
+  balances: { [address: address]: bigint }
+  approvals: { [owner: address]: { [operator: address]: bigint } }
+  totalSupply: bigint
 }
 
 export default class Staking extends Roles {
@@ -20,7 +20,7 @@ export default class Staking extends Roles {
   /**
    * uint
    */
-  #holders: typeof BigNumber = BigNumber['from'](0)
+  #holders: bigint = BigInt(0)
   /**
    * Object => Object => uint
    */
@@ -28,11 +28,11 @@ export default class Staking extends Roles {
   /**
    * Object => Object => uint
    */
-  #approvals: { [owner: string]: { [operator: string]: typeof BigNumber } } = {}
+  #approvals: { [owner: string]: { [operator: string]: bigint } } = {}
 
   #decimals = 18
 
-  #totalSupply: typeof BigNumber = BigNumber['from'](0)
+  #totalSupply: bigint = BigInt(0)
 
   #stakingContract: address
 
@@ -46,8 +46,8 @@ export default class Staking extends Roles {
     if (state) {
       this.#balances = restoreBalances(state.balances)
       this.#approvals = restoreApprovals(state.approvals)
-      this.#holders = BigNumber['from'](state.holders)
-      this.#totalSupply = BigNumber['from'](state.totalSupply)
+      this.#holders = BigInt(state.holders)
+      this.#totalSupply = BigInt(state.totalSupply)
     } else {
       this.#name = name
       this.#symbol = symbol
@@ -71,7 +71,7 @@ export default class Staking extends Roles {
     }
   }
 
-  get totalSupply(): BigNumberish {
+  get totalSupply(): bigint {
     return this.#totalSupply
   }
 
@@ -99,41 +99,40 @@ export default class Staking extends Roles {
     return this.#decimals
   }
 
-  mint(to: address, amount: BigNumberish) {
+  mint(to: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'MINT')) throw new Error('not allowed')
 
-    this.#totalSupply = this.#totalSupply.add(amount)
+    this.#totalSupply = this.#totalSupply + amount
     this.#increaseBalance(to, amount)
   }
 
-  burn(from: address, amount: BigNumberish) {
+  burn(from: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'BURN') || msg.sender !== from) throw new Error('not allowed')
-    const total = this.#totalSupply.sub(amount)
-    if (total.gte(0)) {
+    const total = this.#totalSupply - amount
+    if (total > 0n) {
       this.#totalSupply = total
       this.#decreaseBalance(from, amount)
     }
   }
 
-  #beforeTransfer(from: address, to: address, amount: BigNumberish) {
+  #beforeTransfer(from: address, to: address, amount: bigint) {
     if (!this.#balances[from] || this.#balances[from] < amount) throw new Error('amount exceeds balance')
   }
 
-  #updateHolders(address: address, previousBalance: typeof BigNumber) {
-    if (this.#balances[address].toHexString() === '0x00') this.#holders.sub(1)
-    else if (this.#balances[address].toHexString() !== '0x00' && previousBalance.toHexString() === '0x00')
-      this.#holders.add(1)
+  #updateHolders(address: address, previousBalance: bigint) {
+    if (this.#balances[address] === 0n) this.#holders -= 1n
+    else if (this.#balances[address] !== 0n && previousBalance === 0n) this.#holders += 1n
   }
 
-  #increaseBalance(address: address, amount: BigNumberish) {
-    if (!this.#balances[address]) this.#balances[address] = BigNumber['from'](0)
+  #increaseBalance(address: address, amount: bigint) {
+    if (!this.#balances[address]) this.#balances[address] = BigInt(0)
     const previousBalance = this.#balances[address]
 
     this.#balances[address] = this.#balances[address].add(amount)
     this.#updateHolders(address, previousBalance)
   }
 
-  #decreaseBalance(address: address, amount: BigNumberish) {
+  #decreaseBalance(address: address, amount: bigint) {
     const previousBalance = this.#balances[address]
     this.#balances[address] = this.#balances[address].sub(amount)
     this.#updateHolders(address, previousBalance)
@@ -143,23 +142,23 @@ export default class Staking extends Roles {
     return this.#balances[msg.sender]
   }
 
-  balanceOf(address: address): BigNumberish {
+  balanceOf(address: address): bigint {
     return this.#balances[address]
   }
 
-  setApproval(operator: address, amount: BigNumberish) {
+  setApproval(operator: address, amount: bigint) {
     const owner = msg.sender
     if (!this.#approvals[owner]) this.#approvals[owner] = {}
-    this.#approvals[owner][operator] = BigNumber['from'](amount)
+    this.#approvals[owner][operator] = BigInt(amount)
   }
 
-  approved(owner: address, operator: address, amount: BigNumberish): boolean {
+  approved(owner: address, operator: address, amount: bigint): boolean {
     return this.#approvals[owner][operator] === amount
   }
 
-  transfer(from: address, to: address, amount: BigNumberish) {
+  transfer(from: address, to: address, amount: bigint) {
     // TODO: is BigNumber?
-    amount = BigNumber['from'](amount)
+    amount = BigInt(amount)
     this.#beforeTransfer(from, to, amount)
     this.#decreaseBalance(from, amount)
     this.#increaseBalance(to, amount)

package/src/token-receiver.ts

@@ -4,31 +4,26 @@ import PublicVoting, { PublicVotingState } from './voting/public-voting.js'
 export interface TokenReceiverState extends PublicVotingState {
   tokenToReceive: address
   tokenReceiver: address
-  tokenAmountToReceive: typeof BigNumber
+  tokenAmountToReceive: bigint
   voteType: 'burn' | 'transfer'
 }
 export default class TokenReceiver extends PublicVoting implements IVoting {
   #tokenToReceive: address
-  #tokenAmountToReceive: typeof BigNumber
+  #tokenAmountToReceive: bigint
   #tokenReceiver: address
   #voteType: TokenReceiverState['voteType'] = 'transfer'
 
-  constructor(
-    tokenToReceive: address,
-    tokenAmountToReceive: typeof BigNumber,
-    burns: boolean,
-    state?: TokenReceiverState
-  ) {
+  constructor(tokenToReceive: address, tokenAmountToReceive: bigint, burns: boolean, state?: TokenReceiverState) {
     super(state)
     if (state) {
       this.#tokenReceiver = state.tokenReceiver
       this.#tokenToReceive = state.tokenToReceive
-      this.#tokenAmountToReceive = BigNumber['from'](state.tokenAmountToReceive)
+      this.#tokenAmountToReceive = BigInt(state.tokenAmountToReceive)
       this.#voteType = state.voteType
     } else {
       this.#tokenReceiver = msg.contract
       this.#tokenToReceive = tokenToReceive
-      this.#tokenAmountToReceive = BigNumber['from'](tokenAmountToReceive)
+      this.#tokenAmountToReceive = BigInt(tokenAmountToReceive)
       if (burns) this.#voteType = 'burn'
     }
   }
@@ -56,8 +51,8 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
   }
 
   async #canVote() {
-    const amount = (await msg.staticCall(this.#tokenToReceive, 'balanceOf', [msg.sender])) as typeof BigNumber
-    return amount.gte(this.#tokenAmountToReceive)
+    const amount = (await msg.staticCall(this.#tokenToReceive, 'balanceOf', [msg.sender])) as bigint
+    return amount >= this.#tokenAmountToReceive
   }
 
   /**
@@ -106,7 +101,7 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
     this.#tokenToReceive = address
   }
 
-  #changeTokenAmountToReceive(amount: typeof BigNumber) {
+  #changeTokenAmountToReceive(amount: bigint) {
     this.#tokenAmountToReceive = amount
   }
 
@@ -114,13 +109,13 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
     this.#voteType = type
   }
 
-  #getTokensOut(amount: typeof BigNumber, receiver: address) {
+  #getTokensOut(amount: bigint, receiver: address) {
     return msg.call(this.#tokenReceiver, 'transfer', [this.#tokenReceiver, receiver, amount])
   }
 
   async changeVoteType(type: TokenReceiverState['voteType']) {
     if (!this.#canVote()) throw new Error('not a allowed')
-    if (this.#voteType === 'transfer' && (await this.#balance()).gt(0))
+    if (this.#voteType === 'transfer' && (await this.#balance()) > 0n)
       throw new Error('get tokens out first or they be lost forever')
     else {
       this.createVote(
@@ -133,7 +128,7 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
     }
   }
 
-  getTokensOut(amount: typeof BigNumber, receiver: address) {
+  getTokensOut(amount: bigint, receiver: address) {
     if (!this.#canVote()) throw new Error('not a allowed')
     else {
       this.createVote(
@@ -159,13 +154,13 @@ export default class TokenReceiver extends PublicVoting implements IVoting {
     }
   }
 
-  #balance(): Promise<typeof BigNumber> {
+  #balance(): Promise<bigint> {
     return msg.staticCall(this.#tokenToReceive, 'balanceOf', [this.#tokenReceiver])
   }
 
   async changeTokenToReceive() {
     if (!this.#canVote()) throw new Error('not a allowed')
-    if (!(await this.#balance()).eq(0) && this.#voteType === 'transfer')
+    if ((await this.#balance()) > 0n && this.#voteType === 'transfer')
       throw new Error('get tokens out first or they be lost forever')
     else {
       this.createVote(

package/src/token.ts

@@ -5,10 +5,11 @@ export declare interface TokenState extends RolesState {
   name: string
   symbol: string
   decimals: number
-  holders: BigNumberish
-  balances: { [address: address]: BigNumberish }
-  approvals: { [owner: address]: { [operator: address]: BigNumberish } }
-  totalSupply: BigNumberish
+  holders: bigint
+  balances: { [address: address]: bigint }
+  approvals: { [owner: address]: { [operator: address]: bigint } }
+  totalSupply: bigint
+  maxSupply: bigint // 0 for unlimited
 }
 
 export default class Token extends Roles {
@@ -23,7 +24,7 @@ export default class Token extends Roles {
   /**
    * uint
    */
-  #holders: typeof BigNumber = BigNumber['from'](0)
+  #holders: bigint = BigInt(0)
   /**
    * Object => Object => uint
    */
@@ -31,15 +32,16 @@ export default class Token extends Roles {
   /**
    * Object => Object => uint
    */
-  #approvals: { [owner: string]: { [operator: string]: typeof BigNumber } } = {}
+  #approvals: { [owner: string]: { [operator: string]: bigint } } = {}
 
   #decimals = 18
 
-  #totalSupply: typeof BigNumber = BigNumber['from'](0)
+  #totalSupply: bigint = BigInt(0)
+
+  #maxSupply: bigint = BigInt(0)
 
   #stakingContract: address
 
-  // this.#privateField2 = 1
   constructor(name: string, symbol: string, decimals: number = 18, state?: TokenState) {
     if (!name) throw new Error(`name undefined`)
     if (!symbol) throw new Error(`symbol undefined`)
@@ -49,11 +51,12 @@ export default class Token extends Roles {
     if (state) {
       this.#balances = restoreBalances(state.balances)
       this.#approvals = restoreApprovals(state.approvals)
-      this.#holders = BigNumber['from'](state.holders)
-      this.#totalSupply = BigNumber['from'](state.totalSupply)
+      this.#holders = BigInt(state.holders)
+      this.#totalSupply = BigInt(state.totalSupply)
       this.#name = name
       this.#symbol = symbol
       this.#decimals = decimals
+      this.#maxSupply = BigInt(state.maxSupply)
     } else {
       this.#name = name
       this.#symbol = symbol
@@ -64,6 +67,7 @@ export default class Token extends Roles {
   // enables snapshotting
   // needs dev attention so nothing breaks after snapshot happens
   // iow everything that is not static needs to be included in the stateObject
+  // TODO: implement snapshotting test
   /**
    * @return {Object} {holders, balances, ...}
    */
@@ -76,19 +80,24 @@ export default class Token extends Roles {
       holders: this.holders,
       balances: this.balances,
       approvals: { ...this.#approvals },
-      totalSupply: this.totalSupply
+      totalSupply: this.totalSupply,
+      maxSupply: this.#maxSupply
     }
   }
 
-  get totalSupply(): BigNumberish {
+  get maxSupply(): TokenState['maxSupply'] {
+    return this.#maxSupply
+  }
+
+  get totalSupply(): TokenState['totalSupply'] {
     return this.#totalSupply
   }
 
-  get name(): string {
+  get name(): TokenState['name'] {
     return this.#name
   }
 
-  get symbol(): string {
+  get symbol(): TokenState['symbol'] {
     return this.#symbol
   }
 
@@ -100,49 +109,60 @@ export default class Token extends Roles {
     return { ...this.#balances }
   }
 
-  get approvals() {
+  get approvals(): TokenState['approvals'] {
     return this.#approvals
   }
 
-  get decimals() {
+  get decimals(): TokenState['decimals'] {
     return this.#decimals
   }
 
-  mint(to: address, amount: BigNumberish) {
+  mint(to: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'MINT')) throw new Error('not allowed')
 
-    this.#totalSupply = this.#totalSupply.add(amount)
-    this.#increaseBalance(to, amount)
+    const supply = this.#totalSupply + amount
+    if (this.#maxSupply === 0n) {
+      this.#totalSupply = supply
+      this.#increaseBalance(to, amount)
+    } else {
+      if (supply <= this.#maxSupply) {
+        this.#totalSupply = supply
+        this.#increaseBalance(to, amount)
+      } else {
+        throw new Error('amount exceeds max supply')
+      }
+    }
   }
 
-  burn(from: address, amount: BigNumberish) {
+  burn(from: address, amount: bigint) {
     if (!this.hasRole(msg.sender, 'BURN') || msg.sender !== from) throw new Error('not allowed')
-    const total = this.#totalSupply.sub(amount)
-    if (total.gte(0)) {
+    const total = this.#totalSupply - amount
+    if (total >= 0) {
       this.#totalSupply = total
       this.#decreaseBalance(from, amount)
+    } else {
+      throw new Error('amount exceeds total supply')
     }
   }
 
-  #beforeTransfer(from: address, to: address, amount: BigNumberish) {
+  #beforeTransfer(from: address, to: address, amount: bigint) {
     if (!this.#balances[from] || this.#balances[from] < amount) throw new Error('amount exceeds balance')
   }
 
-  #updateHolders(address: address, previousBalance: typeof BigNumber) {
-    if (this.#balances[address].toHexString() === '0x00') this.#holders.sub(1)
-    else if (this.#balances[address].toHexString() !== '0x00' && previousBalance.toHexString() === '0x00')
-      this.#holders.add(1)
+  #updateHolders(address: address, previousBalance: bigint) {
+    if (this.#balances[address] === 0n) this.#holders -= 1n
+    else if (this.#balances[address] !== 0n && previousBalance === 0n) this.#holders += 1n
   }
 
-  #increaseBalance(address: address, amount: BigNumberish) {
-    if (!this.#balances[address]) this.#balances[address] = BigNumber['from'](0)
+  #increaseBalance(address: address, amount: bigint) {
+    if (!this.#balances[address]) this.#balances[address] = BigInt(0)
     const previousBalance = this.#balances[address]
 
     this.#balances[address] = this.#balances[address].add(amount)
     this.#updateHolders(address, previousBalance)
   }
 
-  #decreaseBalance(address: address, amount: BigNumberish) {
+  #decreaseBalance(address: address, amount: bigint) {
     const previousBalance = this.#balances[address]
     this.#balances[address] = this.#balances[address].sub(amount)
     this.#updateHolders(address, previousBalance)
@@ -152,23 +172,23 @@ export default class Token extends Roles {
     return this.#balances[msg.sender]
   }
 
-  balanceOf(address: address): BigNumberish {
+  balanceOf(address: address): bigint {
     return this.#balances[address]
   }
 
-  setApproval(operator: address, amount: BigNumberish) {
+  setApproval(operator: address, amount: bigint) {
     const owner = msg.sender
     if (!this.#approvals[owner]) this.#approvals[owner] = {}
-    this.#approvals[owner][operator] = BigNumber['from'](amount)
+    this.#approvals[owner][operator] = BigInt(amount)
   }
 
-  approved(owner: address, operator: address, amount: BigNumberish): boolean {
+  approved(owner: address, operator: address, amount: bigint): boolean {
     return this.#approvals[owner][operator] === amount
   }
 
-  transfer(from: address, to: address, amount: BigNumberish) {
-    // TODO: is BigNumber?
-    amount = BigNumber['from'](amount)
+  transfer(from: address, to: address, amount: bigint) {
+    // TODO: is bigint?
+    amount = BigInt(amount)
     this.#beforeTransfer(from, to, amount)
     this.#decreaseBalance(from, amount)
     this.#increaseBalance(to, amount)

package/tsconfig.json

@@ -5,7 +5,8 @@
     "outDir": "./exports",
     "moduleResolution": "NodeNext",
     "declaration": true,
-    "declarationDir": "./exports"
+    "declarationDir": "./exports",
+    "types": ["@leofcoin/types/global"]
   },
-  "include": ["./src/*", "./node_modules/@leofcoin/global-types/*"]
+  "include": ["./src/*"]
 }