Merge pull request #840 from HathorNetwork/master

Release v2.2.0

Author: pedroferreira1

.gitignore

@@ -10,4 +10,5 @@ lib
 tsconfig.tsbuildinfo
 
 // Generated test database files
-*.leveldb
+*.leveldb*
+tmp/

__tests__/__mock_helpers__/wallet-service.fixtures.ts

@@ -1,12 +1,13 @@
 import Network from '../../src/models/network';
 import HathorWalletServiceWallet from '../../src/wallet/wallet';
+import { JSONBigInt } from '../../src/utils/bigint';
 
 export const defaultWalletSeed =
   'purse orchard camera cloud piece joke hospital mechanic timber horror shoulder rebuild you decrease garlic derive rebuild random naive elbow depart okay parrot cliff';
 export const buildSuccessTxByIdTokenDataResponse = (): string => {
   const txTokens = [
     {
-      balance: 10,
+      balance: 10n,
       height: 1,
       timestamp: 10,
       tokenId: 'token1',
@@ -18,7 +19,7 @@ export const buildSuccessTxByIdTokenDataResponse = (): string => {
       weight: 65.4321,
     },
     {
-      balance: 7,
+      balance: 7n,
       height: 1,
       timestamp: 10,
       tokenId: 'token2',
@@ -30,7 +31,7 @@ export const buildSuccessTxByIdTokenDataResponse = (): string => {
       weight: 65.4321,
     },
   ];
-  return JSON.stringify({
+  return JSONBigInt.stringify({
     success: true,
     txTokens,
   });

__tests__/integration/storage/leveldb.test.ts

@@ -12,8 +12,7 @@ import {
 import HathorWallet from '../../../src/new/wallet';
 import { loggers } from '../utils/logger.util';
 import SendTransaction from '../../../src/new/sendTransaction';
-import { LevelDBStore, MemoryStore, Storage } from '../../../src/storage';
-import walletUtils from '../../../src/utils/wallet';
+import { MemoryStore, Storage } from '../../../src/storage';
 import transactionUtils from '../../../src/utils/transaction';
 import { NATIVE_TOKEN_UID } from '../../../src/constants';
 import { IHathorWallet } from '../../../src/wallet/types';
@@ -101,17 +100,6 @@ describe('locked utxos', () => {
     const storeMem = new MemoryStore();
     const storageMem = new Storage(storeMem);
     await testUnlockWhenSpent(storageMem, walletDataMem);
-
-    // LevelDB test
-    const DATA_DIR = './testdata.leveldb';
-    const walletDataLDB = precalculationHelpers.test.getPrecalculatedWallet();
-    const xpubkeyLDB = walletUtils.getXPubKeyFromSeed(walletDataLDB.words, {
-      accountDerivationIndex: "0'/0",
-    });
-    const walletId = walletUtils.getWalletIdFromXPub(xpubkeyLDB);
-    const storeLDB = new LevelDBStore(walletId, DATA_DIR);
-    const storageLDB = new Storage(storeLDB);
-    await testUnlockWhenSpent(storageLDB, walletDataLDB);
   });
 });
 

__tests__/integration/storage/storage.test.ts

@@ -5,13 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { HDPrivateKey } from 'bitcore-lib';
-import { LevelDBStore, MemoryStore, Storage } from '../../src/storage';
+import { MemoryStore, Storage } from '../../src/storage';
 import { TOKEN_AUTHORITY_MASK, TOKEN_MINT_MASK, GAP_LIMIT } from '../../src/constants';
-import walletUtils from '../../src/utils/wallet';
-import { ILockedUtxo, IUtxo, OutputValueType } from '../../src/types';
-
-const DATA_DIR = './testdata.leveldb';
+import { ILockedUtxo, IStore, IUtxo, OutputValueType } from '../../src/types';
 
 describe('locked utxo methods', () => {
   const spyDate = jest.spyOn(Date, 'now');
@@ -33,16 +29,9 @@ describe('locked utxo methods', () => {
     await testLockedUtxoMethods(store);
   });
 
-  it('should work with leveldb store', async () => {
-    const xpriv = new HDPrivateKey();
-    const walletId = walletUtils.getWalletIdFromXPub(xpriv.xpubkey);
-    const store = new LevelDBStore(walletId, DATA_DIR);
-    await testLockedUtxoMethods(store);
-  });
-
   // helper functions
 
-  async function countUtxos(store: LevelDBStore) {
+  async function countUtxos(store: IStore) {
     let utxoCount = 0;
     let lutxoCount = 0;
     for await (const _ of store.utxoIter()) {
@@ -115,7 +104,7 @@ describe('locked utxo methods', () => {
 
   // actual test body
 
-  async function testLockedUtxoMethods(store: LevelDBStore) {
+  async function testLockedUtxoMethods(store: IStore) {
     const lockedUtxos = [
       // utxo to be unlocked by time
       getLockedUtxo(
@@ -190,13 +179,6 @@ describe('registered tokens', () => {
     await testRegisteredTokens(store);
   });
 
-  it('should work with leveldb store', async () => {
-    const xpriv = new HDPrivateKey();
-    const walletId = walletUtils.getWalletIdFromXPub(xpriv.xpubkey);
-    const store = new LevelDBStore(walletId, DATA_DIR);
-    await testRegisteredTokens(store);
-  });
-
   async function testRegisteredTokens(store) {
     const storage = new Storage(store);
     await storage.registerToken({ uid: 'abc1', name: 'test token 1', symbol: 'TST1' });
@@ -211,13 +193,6 @@ describe('scanning policy methods', () => {
     await testScanningPolicies(store);
   });
 
-  it('should work with leveldb store', async () => {
-    const xpriv = new HDPrivateKey();
-    const walletId = walletUtils.getWalletIdFromXPub(xpriv.xpubkey);
-    const store = new LevelDBStore(walletId, DATA_DIR);
-    await testScanningPolicies(store);
-  });
-
   async function testScanningPolicies(store) {
     const storage = new Storage(store);
     // Default is gap-limit