feat(wallet-lib)!: storage layer refactoring (#232)

Co-authored-by: Igor Markin <[email protected]>
dashpay · Mar 8, 2022 · 2643791 · 2643791
1 parent a6acd1a
commit 2643791
Show file tree

Hide file tree

Showing 200 changed files with 2,967 additions and 5,165 deletions.
diff --git a/packages/js-dash-sdk/src/SDK/Client/Client.spec.ts b/packages/js-dash-sdk/src/SDK/Client/Client.spec.ts
@@ -37,7 +37,7 @@ describe('Dash - Client', function suite() {
 
   beforeEach(async function beforeEach() {
     testMnemonic = 'agree country attract master mimic ball load beauty join gentle turtle hover';
-    testHDKey = "xprv9s21ZrQH143K4PgfRZPuYjYUWRZkGfEPuWTEUESMoEZLC274ntC4G49qxgZJEPgmujsmY52eVggtwZgJPrWTMXmbYgqDVySWg46XzbGXrSZ";
+    testHDKey = "tprv8ZgxMBicQKsPeGi4CikhacVPz6UmErenu1PoD3S4XcEDSPP8auRaS8hG3DQtsQ2i9HACgohHwF5sgMVJNksoKqYoZbis8o75Pp1koCme2Yo";
 
     client = new Client({
       wallet: {
@@ -145,7 +145,7 @@ describe('Dash - Client', function suite() {
       const importedIdentityIds = account.identities.getIdentityIds();
       // Check that we've imported identities properly
       expect(importedIdentityIds.length).to.be.equal(accountIdentitiesCountBeforeTest + 1);
-      expect(importedIdentityIds[0]).to.be.equal(interceptedIdentityStateTransition.getIdentityId().toString());
+      expect(importedIdentityIds[1]).to.be.equal(interceptedIdentityStateTransition.getIdentityId().toString());
     });
 
     it('should throw TransitionBroadcastError when transport resolves error', async () => {

diff --git a/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts b/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts
@@ -36,10 +36,11 @@ export default async function register(
     await broadcastStateTransition(this, identityCreateTransition);
 
     // If state transition was broadcast without any errors, import identity to the account
-    account.storage.insertIdentityIdAtIndex(
-        account.walletId,
-        identity.getId().toString(),
-        identityIndex,
+   account.storage
+    .getWalletStore(account.walletId)
+    .insertIdentityIdAtIndex(
+      identity.getId().toString(),
+      identityIndex,
     );
 
     return identity;

diff --git a/packages/js-dash-sdk/src/SDK/SDK.ts b/packages/js-dash-sdk/src/SDK/SDK.ts
@@ -6,7 +6,7 @@ import { default as _DAPIClient } from '@dashevo/dapi-client';
 import {
     Wallet as _Wallet,
     Account as _Account,
-    KeyChain as _KeyChain,
+    DerivableKeyChain as _KeyChain,
     CONSTANTS as _WalletLibCONSTANTS,
     EVENTS as _WalletLibEVENTS,
     utils as _WalletLibUtils,

diff --git a/packages/js-dash-sdk/src/test/fixtures/createIdentityFixtureInAccount.ts b/packages/js-dash-sdk/src/test/fixtures/createIdentityFixtureInAccount.ts
@@ -4,7 +4,7 @@ const getIdentityFixture = require('@dashevo/dpp/lib/test/fixtures/getIdentityFi
 
 export function createIdentityFixtureInAccount(account) {
     const identityFixture = getIdentityFixture();
-    const identityFixtureIndex = 10000;
+    const identityFixtureIndex = 0;
     const { privateKey: identityPrivateKey } = account.identities.getIdentityHDKeyByIndex(identityFixtureIndex, 0);
 
     identityFixture.publicKeys[0] = new IdentityPublicKey({
@@ -15,8 +15,9 @@ export function createIdentityFixtureInAccount(account) {
         securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER
     });
 
-    account.storage.insertIdentityIdAtIndex(
-        account.walletId,
+    account.storage
+      .getWalletStore(account.walletId)
+      .insertIdentityIdAtIndex(
         identityFixture.getId().toString(),
         identityFixtureIndex,
     );

diff --git a/packages/js-dash-sdk/src/test/fixtures/createTransactionFixtureInAccount.ts b/packages/js-dash-sdk/src/test/fixtures/createTransactionFixtureInAccount.ts
@@ -11,7 +11,7 @@ export async function createTransactionInAccount(account) {
         }])
         .to(account.getAddress(10).address, 100000);
 
-    await account.importTransactions([walletTransaction.serialize(true)]);
+    await account.importTransactions([[walletTransaction.serialize(true)]]);
 
     return walletTransaction;
-}
+}
diff --git a/packages/platform-test-suite/test/e2e/wallet.spec.js b/packages/platform-test-suite/test/e2e/wallet.spec.js
@@ -105,13 +105,17 @@ describe('e2e', () => {
 
         restoredAccount = await restoredWallet.getWalletAccount();
 
-        // Due to the limitations of DAPI, we need to wait for a block to be mined if we connected
-        // in the moment when transaction already entered the mempool, but haven't been mined yet
-        await new Promise((resolve) => restoredAccount.once(EVENTS.BLOCKHEADER, resolve));
-
+        let transactions = restoredAccount.getTransactions();
+
+        if (Object.keys(transactions).length === 0) {
+          // Due to the limitations of DAPI, we need to wait for a block to be mined if we connected
+          // in the moment when transaction already entered the mempool, but haven't been mined yet
+          await new Promise((resolve) => restoredAccount.once(EVENTS.BLOCKHEADER, resolve));
+          transactions = restoredAccount.getTransactions();
+        }
         await waitForBalanceToChange(restoredAccount);
 
-        const transactionIds = Object.keys(restoredAccount.getTransactions());
+        const transactionIds = Object.keys(transactions);
 
         expect(transactionIds).to.have.lengthOf(1);
 

diff --git a/packages/platform-test-suite/test/functional/platform/Identity.spec.js b/packages/platform-test-suite/test/functional/platform/Identity.spec.js
@@ -15,10 +15,10 @@ const BalanceIsNotEnoughError = require('@dashevo/dpp/lib/errors/consensus/fee/B
 const DAPIClient = require('@dashevo/dapi-client/lib/DAPIClient');
 const { hash } = require('@dashevo/dpp/lib/util/hash');
 const Identifier = require('@dashevo/dpp/lib/identifier/Identifier');
+const Transaction = require('@dashevo/dashcore-lib/lib/transaction');
 const createClientWithFundedWallet = require('../../../lib/test/createClientWithFundedWallet');
 const wait = require('../../../lib/wait');
 const getDAPISeeds = require('../../../lib/test/getDAPISeeds');
-const Transaction = require('@dashevo/dashcore-lib/lib/transaction');
 
 describe('Platform', () => {
   describe('Identity', () => {
@@ -114,11 +114,12 @@ describe('Platform', () => {
         await wait(5000);
       }
 
-      walletAccount.storage.insertIdentityIdAtIndex(
-        walletAccount.walletId,
-        identityOne.getId().toString(),
-        identityOneIndex,
-      );
+      walletAccount.storage
+        .getWalletStore(walletAccount.walletId)
+        .insertIdentityIdAtIndex(
+          identityOne.getId().toString(),
+          identityOneIndex,
+        );
 
       // Creating transition that tries to spend the same transaction
       const {