Merge pull request #668 from HathorNetwork/release-candidate

Release v1.6.0

Author: pedroferreira1

__tests__/storage/leveldb/leveldb_store.test.js

@@ -405,17 +405,20 @@ test('nano contract methods', async () => {
   await store.registerNanoContract('001', {
     ncId: '001',
     blueprintId: '001',
-    blueprintName: 'Bet'
+    blueprintName: 'Bet',
+    address: 'abc',
   });
   await expect(store.getNanoContract('001')).resolves.toBeDefined();
+  await expect(store.getNanoContract('001')).resolves.toMatchObject({ address: 'abc' });
   await expect(store.isNanoContractRegistered('001')).resolves.toBeTruthy();
   await expect(asyncGenToArray(store.nanoContractIndex.registeredDB.iterator()))
         .resolves.toHaveLength(1);
 
   await store.registerNanoContract('002', {
     ncId: '002',
     blueprintId: '001',
-    blueprintName: 'Bet'
+    blueprintName: 'Bet',
+    address: 'abc',
   });
   await expect(store.getNanoContract('002')).resolves.toBeDefined();
   await expect(store.isNanoContractRegistered('002')).resolves.toBeTruthy();
@@ -429,6 +432,10 @@ test('nano contract methods', async () => {
   await expect(asyncGenToArray(store.nanoContractIndex.registeredDB.iterator()))
         .resolves.toHaveLength(1);
 
+  // Test update address of registered nano contract
+  await store.updateNanoContractRegisteredAddress('001', 'def');
+  await expect(store.getNanoContract('001')).resolves.toMatchObject({ address: 'def' });
+
   // Asserts store is cleaned only when tokens are cleaned too
   await store.cleanStorage(false, false, false); // not cleaning tokens
   await expect(asyncGenToArray(store.nanoContractIndex.registeredDB.iterator()))

__tests__/storage/memory_store.test.js

@@ -345,16 +345,19 @@ test('nano contract methods', async () => {
   await store.registerNanoContract('001', {
     ncId: '001',
     blueprintId: '001',
-    blueprintName: 'Bet'
+    blueprintName: 'Bet',
+    address: 'abc',
   });
   await expect(store.getNanoContract('001')).resolves.toBeDefined();
+  await expect(store.getNanoContract('001')).resolves.toMatchObject({ address: 'abc' });
   await expect(store.isNanoContractRegistered('001')).resolves.toBeTruthy();
   expect(store.registeredNanoContracts.size).toEqual(1);
 
   await store.registerNanoContract('002', {
     ncId: '002',
     blueprintId: '001',
-    blueprintName: 'Bet'
+    blueprintName: 'Bet',
+    address: 'abc',
   });
   await expect(store.getNanoContract('002')).resolves.toBeDefined();
   await expect(store.isNanoContractRegistered('002')).resolves.toBeTruthy();
@@ -366,6 +369,10 @@ test('nano contract methods', async () => {
   await expect(store.isNanoContractRegistered('002')).resolves.toBeFalsy();
   expect(store.registeredNanoContracts.size).toEqual(1);
 
+  // Test update address of registered nano contract
+  await store.updateNanoContractRegisteredAddress('001', 'def');
+  await expect(store.getNanoContract('001')).resolves.toMatchObject({ address: 'def' });
+
   // Asserts store is cleaned only when tokens are cleaned too
   await store.cleanStorage(false, false, false); // not cleaning tokens
   expect(store.registeredNanoContracts.size).toEqual(1);

__tests__/storage/storage.test.js

@@ -64,6 +64,15 @@ describe('handleStop', () => {
       outputs: [],
     });
     await storage.registerToken(testToken);
+    const address0 = await storage.getAddressAtIndex(0);
+    const address1 = await storage.getAddressAtIndex(1);
+    const testNano = {
+      ncId: 'abc',
+      address: address0.base58,
+      blueprintId: 'blueprintId',
+      blueprintName: 'blueprintName',
+    };
+    await storage.registerNanoContract('abc', testNano);
     // We have 1 transaction
     await expect(store.historyCount()).resolves.toEqual(1);
     // 20 addresses
@@ -72,6 +81,20 @@ describe('handleStop', () => {
     let tokens = await toArray(storage.getRegisteredTokens());
     expect(tokens).toHaveLength(1);
     expect(tokens[0]).toEqual(testToken);
+    // And 1 registered nano contract
+    let nanos = await toArray(storage.getRegisteredNanoContracts());
+    expect(nanos).toHaveLength(1);
+    expect(nanos[0]).toEqual(testNano);
+
+    // Test address update
+    await expect(store.getNanoContract('abc')).resolves.toMatchObject({ address: address0.base58 });
+    await storage.updateNanoContractRegisteredAddress('abc', address1.base58);
+    await expect(store.getNanoContract('abc')).resolves.toMatchObject({ address: address1.base58 });
+
+    await expect(storage.updateNanoContractRegisteredAddress('abc', 'abc')).rejects.toThrow(Error);
+
+    // Go back to default address
+    await storage.updateNanoContractRegisteredAddress('abc', address0.base58);
 
     storage.version = 'something';
     // handleStop with defaults
@@ -82,19 +105,27 @@ describe('handleStop', () => {
     await expect(store.historyCount()).resolves.toEqual(1);
     await expect(store.addressCount()).resolves.toEqual(20);
     await expect(store.isTokenRegistered(testToken.uid)).resolves.toBeTruthy();
+    await expect(store.isNanoContractRegistered(testNano.ncId)).resolves.toBeTruthy();
     tokens = await toArray(storage.getRegisteredTokens());
     expect(tokens).toHaveLength(1);
     expect(tokens[0]).toEqual(testToken);
+    nanos = await toArray(storage.getRegisteredNanoContracts());
+    expect(nanos).toHaveLength(1);
+    expect(nanos[0]).toEqual(testNano);
 
     // handleStop with cleanStorage = true
     await storage.handleStop({ cleanStorage: true });
     // Will clean the history bit not addresses or registered tokens
     await expect(store.historyCount()).resolves.toEqual(0);
     await expect(store.addressCount()).resolves.toEqual(20);
     await expect(store.isTokenRegistered(testToken.uid)).resolves.toBeTruthy();
+    await expect(store.isNanoContractRegistered(testNano.ncId)).resolves.toBeTruthy();
     tokens = await toArray(storage.getRegisteredTokens());
     expect(tokens).toHaveLength(1);
     expect(tokens[0]).toEqual(testToken);
+    nanos = await toArray(storage.getRegisteredNanoContracts());
+    expect(nanos).toHaveLength(1);
+    expect(nanos[0]).toEqual(testNano);
 
     await storage.addTx({
       tx_id: 'another-new-tx',
@@ -109,9 +140,13 @@ describe('handleStop', () => {
     await expect(store.historyCount()).resolves.toEqual(1);
     await expect(store.addressCount()).resolves.toEqual(0);
     await expect(store.isTokenRegistered(testToken.uid)).resolves.toBeTruthy();
+    await expect(store.isNanoContractRegistered(testNano.ncId)).resolves.toBeTruthy();
     tokens = await toArray(storage.getRegisteredTokens());
     expect(tokens).toHaveLength(1);
     expect(tokens[0]).toEqual(testToken);
+    nanos = await toArray(storage.getRegisteredNanoContracts());
+    expect(nanos).toHaveLength(1);
+    expect(nanos[0]).toEqual(testNano);
 
     // handleStop with cleanAddresses = true
     await loadAddresses(0, 20, storage);
@@ -120,6 +155,12 @@ describe('handleStop', () => {
     await expect(store.historyCount()).resolves.toEqual(1);
     await expect(store.addressCount()).resolves.toEqual(20);
     await expect(store.isTokenRegistered(testToken.uid)).resolves.toBeFalsy();
+    await expect(store.isNanoContractRegistered(testNano.ncId)).resolves.toBeFalsy();
+
+    tokens = await toArray(storage.getRegisteredTokens());
+    expect(tokens).toHaveLength(0);
+    nanos = await toArray(storage.getRegisteredNanoContracts());
+    expect(nanos).toHaveLength(0);
 
     // Access data is untouched when stopping the wallet
     // XXX: since we stringify to save on store, the optional undefined properties are removed

babel.config.js

@@ -14,6 +14,6 @@ module.exports = {
   ],
   plugins: [
     "@babel/plugin-transform-async-generator-functions",
-    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-class-properties",
   ],
 };