Fixed createSubNameapceId bug

Added registerNamespaceTransaction from payload

Author: rg911

src/infrastructure/transaction/CreateTransactionFromPayload.ts

@@ -24,6 +24,7 @@ import { MosaicId } from '../../model/mosaic/MosaicId';
 import { MosaicNonce } from '../../model/mosaic/MosaicNonce';
 import { MosaicProperties } from '../../model/mosaic/MosaicProperties';
 import { NamespaceId } from '../../model/namespace/NamespaceId';
+import { NamespaceType } from '../../model/namespace/NamespaceType';
 import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
 import { AccountPropertyModification } from '../../model/transaction/AccountPropertyModification';
 import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction';
@@ -240,6 +241,26 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N
                 UInt64.fromHex(reverse(delta)),
                 networkType,
             );
+        case TransactionType.REGISTER_NAMESPACE:
+            // read bytes
+            const namespaceType = parseInt(convert.uint8ToHex(convert.hexToUint8(transactionData.substring(0, 2)).reverse()), 16);
+            const nameSpaceDurationParentId = transactionData.substring(2, 18);
+            const nameSpaceId = transactionData.substring(18, 34);
+            const nameSize = transactionData.substring(34, 36);
+            const nameSpaceName = transactionData.substring(36);
+
+            return namespaceType === NamespaceType.RootNamespace ?
+                RegisterNamespaceTransaction.createRootNamespace(
+                    Deadline.createFromDTO(deadline),
+                    decodeHex(nameSpaceName),
+                    UInt64.fromHex(reverse(nameSpaceDurationParentId)),
+                    networkType,
+            ) : RegisterNamespaceTransaction.createSubNamespace(
+                    Deadline.createFromDTO(deadline),
+                    decodeHex(nameSpaceName),
+                    new NamespaceId(UInt64.fromHex(reverse(nameSpaceDurationParentId)).toDTO()),
+                    networkType,
+            );
         case TransactionType.TRANSFER:
             // read bytes
             const transferRecipient = transactionData.substring(0, 50);

src/model/transaction/RegisterNamespaceTransaction.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { NamespaceCreationTransaction as RegisterNamespaceTransactionLibrary, subnamespaceNamespaceId, subnamespaceParentId, VerifiableTransaction } from 'nem2-library';
+import { NamespaceCreationTransaction as RegisterNamespaceTransactionLibrary, subnamespaceNamespaceId, subnamespaceParentId, VerifiableTransaction, namespaceId } from 'nem2-library';
 import { PublicAccount } from '../account/PublicAccount';
 import { NetworkType } from '../blockchain/NetworkType';
 import { NamespaceId } from '../namespace/NamespaceId';
@@ -79,7 +79,9 @@ export class RegisterNamespaceTransaction extends Transaction {
             new UInt64([0, 0]),
             NamespaceType.SubNamespace,
             namespaceName,
-            new NamespaceId(subnamespaceNamespaceId(parentNamespace, namespaceName)),
+            typeof parentNamespace === 'string' ?
+                new NamespaceId(subnamespaceNamespaceId(parentNamespace, namespaceName)) :
+                new NamespaceId(namespaceId(namespaceName)),
             undefined,
             parentId,
         );

test/infrastructure/SerializeTransactionToJSON.spec.ts

@@ -32,11 +32,13 @@ import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMos
 import { AliasActionType } from '../../src/model/namespace/AliasActionType';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { NamespaceType } from '../../src/model/namespace/NamespaceType';
+import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
 import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction';
 import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
 import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
 import { Deadline } from '../../src/model/transaction/Deadline';
 import { HashType } from '../../src/model/transaction/HashType';
+import { LinkAction } from '../../src/model/transaction/LinkAction';
 import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction';
 import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction';
 import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
@@ -54,8 +56,6 @@ import { TransferTransaction } from '../../src/model/transaction/TransferTransac
 import { UInt64 } from '../../src/model/UInt64';
 import { TransactionMapping } from '../../src/utility/TransactionMapping';
 import { TestingAccount } from '../conf/conf.spec';
-import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
-import { LinkAction } from '../../src/model/transaction/LinkAction';
 
 describe('SerializeTransactionToJSON', () => {
     let account: Account;

test/model/transaction/RegisterNamespaceTransaction.spec.ts

@@ -21,6 +21,7 @@ import {Deadline} from '../../../src/model/transaction/Deadline';
 import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction';
 import {UInt64} from '../../../src/model/UInt64';
 import {TestingAccount} from '../../conf/conf.spec';
+import { NamespaceId } from '../../../src/model/namespace/NamespaceId';
 
 describe('RegisterNamespaceTransaction', () => {
     let account: Account;
@@ -65,4 +66,21 @@ describe('RegisterNamespaceTransaction', () => {
         )).to.be.equal('014DF55E7F6D8FB7FF924207DF2CA1BBF313726F6F742D746573742D6E616D657370616365');
 
     });
+
+    it('should createComplete an sub RegisterNamespaceTransaction object and sign it - ParentId', () => {
+        const registerNamespaceTransaction = RegisterNamespaceTransaction.createSubNamespace(
+            Deadline.create(),
+            'root-test-namespace',
+            new NamespaceId([929036875, 2226345261]),
+            NetworkType.MIJIN_TEST,
+        );
+
+        const signedTransaction = registerNamespaceTransaction.signWith(account);
+
+        expect(signedTransaction.payload.substring(
+            240,
+            signedTransaction.payload.length,
+        )).to.be.equal('014BFA5F372D55B384CFCBE72D994BE69B13726F6F742D746573742D6E616D657370616365');
+
+    });
 });

test/utility/TransactionMapping.spec.ts

@@ -32,11 +32,13 @@ import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMos
 import { AliasActionType } from '../../src/model/namespace/AliasActionType';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
 import { NamespaceType } from '../../src/model/namespace/NamespaceType';
+import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
 import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction';
 import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
 import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
 import { Deadline } from '../../src/model/transaction/Deadline';
 import { HashType } from '../../src/model/transaction/HashType';
+import { LinkAction } from '../../src/model/transaction/LinkAction';
 import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction';
 import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction';
 import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
@@ -54,8 +56,6 @@ import { TransferTransaction } from '../../src/model/transaction/TransferTransac
 import { UInt64 } from '../../src/model/UInt64';
 import { TransactionMapping } from '../../src/utility/TransactionMapping';
 import { TestingAccount } from '../conf/conf.spec';
-import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
-import { LinkAction } from '../../src/model/transaction/LinkAction';
 
 describe('TransactionMapping', () => {
     let account: Account;
@@ -396,4 +396,37 @@ describe('TransactionMapping', () => {
         expect(transaction.linkAction).to.be.equal(0);
         expect(transaction.remoteAccountKey).to.be.equal(account.publicKey);
     });
+
+    it('should create RegisterNamespaceTransaction - Root', () => {
+        const registerNamespaceTransaction = RegisterNamespaceTransaction.createRootNamespace(
+            Deadline.create(),
+            'root-test-namespace',
+            UInt64.fromUint(1000),
+            NetworkType.MIJIN_TEST,
+        );
+
+        const signedTransaction = registerNamespaceTransaction.signWith(account);
+
+        const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as RegisterNamespaceTransaction;
+
+        expect(transaction.namespaceType).to.be.equal(NamespaceType.RootNamespace);
+        expect(transaction.namespaceName).to.be.equal('root-test-namespace');
+
+    });
+
+    it('should create RegisterNamespaceTransaction - Sub', () => {
+        const registerNamespaceTransaction = RegisterNamespaceTransaction.createSubNamespace(
+            Deadline.create(),
+            'root-test-namespace',
+            'parent-test-namespace',
+            NetworkType.MIJIN_TEST,
+        );
+
+        const signedTransaction = registerNamespaceTransaction.signWith(account);
+
+        const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as RegisterNamespaceTransaction;
+
+        expect(transaction.namespaceType).to.be.equal(NamespaceType.SubNamespace);
+        expect(transaction.namespaceName).to.be.equal('root-test-namespace');
+    });
 });