Added AccountLInkTransaction

Author: rg911

src/infrastructure/transaction/CreateTransactionFromPayload.ts

@@ -19,12 +19,12 @@ import {decode} from 'utf8';
 import { Address } from '../../model/account/Address';
 import { PublicAccount } from '../../model/account/PublicAccount';
 import { NetworkType } from '../../model/blockchain/NetworkType';
-import { NamespaceType } from '../../model/model';
 import { Mosaic } from '../../model/mosaic/Mosaic';
 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 { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
 import { AccountPropertyModification } from '../../model/transaction/AccountPropertyModification';
 import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction';
 import { AggregateTransaction } from '../../model/transaction/AggregateTransaction';
@@ -143,6 +143,17 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N
                     );
             }
             throw new Error ('Account property transaction type not recognised.');
+        case TransactionType.LINK_ACCOUNT:
+            // read bytes
+            const remoteAccountKey = transactionData.substring(0, 64);
+            const linkAction = transactionData.substring(64, 66);
+
+            return AccountLinkTransaction.create(
+                Deadline.createFromDTO(deadline),
+                remoteAccountKey,
+                parseInt(convert.uint8ToHex(convert.hexToUint8(linkAction).reverse()), 16),
+                networkType,
+            );
         case TransactionType.ADDRESS_ALIAS:
             // read bytes
             const addressAliasAction = transactionData.substring(0, 2);
@@ -364,7 +375,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N
                         networkType,
                         deadline,
                         );
-                    return transaction.toAggregate(PublicAccount.createFromPublicKey(innerTransaction.substring(0, 64), networkType))
+                    return transaction.toAggregate(PublicAccount.createFromPublicKey(innerTransaction.substring(0, 64), networkType));
                 }),
                 networkType,
                 bondedConsignatureArray ? bondedConsignatureArray.map((cosignature) => new AggregateTransactionCosignature(

src/infrastructure/transaction/SerializeTransactionToJSON.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
 import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction';
 import { AggregateTransaction } from '../../model/transaction/AggregateTransaction';
 import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction';
@@ -39,6 +40,11 @@ import { TransferTransaction } from '../../model/transaction/TransferTransaction
  */
 export const SerializeTransactionToJSON = (transaction: Transaction): any => {
     switch (transaction.type) {
+        case TransactionType.LINK_ACCOUNT:
+            return {
+                remoteAccountKey: (transaction as AccountLinkTransaction).remoteAccountKey,
+                linkAction: (transaction as AccountLinkTransaction).linkAction,
+            };
         case TransactionType.ADDRESS_ALIAS:
             return {
                 actionType: (transaction as AddressAliasTransaction).actionType,
@@ -149,6 +155,8 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
                 }),
                 message: (transaction as TransferTransaction).message.toDTO(),
             };
+        default:
+            throw new Error ('Transaction type not implemented yet.');
     }
 
 };

test/infrastructure/SerializeTransactionToJSON.spec.ts

@@ -54,6 +54,8 @@ 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;
@@ -62,6 +64,20 @@ describe('SerializeTransactionToJSON', () => {
         account = TestingAccount;
     });
 
+    it('should create AccountLinkTransaction', () => {
+        const accountLinkTransaction = AccountLinkTransaction.create(
+            Deadline.create(),
+            account.publicKey,
+            LinkAction.Link,
+            NetworkType.MIJIN_TEST,
+        );
+
+        const json = accountLinkTransaction.toJSON();
+
+        expect(json.remoteAccountKey).to.be.equal(account.publicKey);
+        expect(json.linkAction).to.be.equal(LinkAction.Link);
+    });
+
     it('should create AccountPropertyAddressTransaction', () => {
         const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
         const addressPropertyFilter = AccountPropertyTransaction.createAddressFilter(

test/utility/TransactionMapping.spec.ts

@@ -54,6 +54,8 @@ 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;
@@ -237,7 +239,7 @@ describe('TransactionMapping', () => {
 
         expect(transaction.message.payload).to.be.equal('test-message');
         expect(transaction.mosaics.length).to.be.equal(1);
-        expect(transaction.recipient.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
+        expect(transaction.recipientToString()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
 
     });
 
@@ -379,4 +381,19 @@ describe('TransactionMapping', () => {
         expect(transaction.mosaic.amount.compact()).to.be.equal(10000000);
         expect(transaction.hash).to.be.equal(signedTransaction.hash);
     });
+
+    it('should create an AccountLinkTransaction object with link action', () => {
+        const accountLinkTransaction = AccountLinkTransaction.create(
+            Deadline.create(),
+            account.publicKey,
+            LinkAction.Link,
+            NetworkType.MIJIN_TEST,
+        );
+
+        const signedTransaction = accountLinkTransaction.signWith(account);
+        const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountLinkTransaction;
+
+        expect(transaction.linkAction).to.be.equal(0);
+        expect(transaction.remoteAccountKey).to.be.equal(account.publicKey);
+    });
 });