Patched with latest catbuffer and openAPI (#576)

* Fixed #575
- Patched with latest catbuffer and openAPI

* Fixed typo

Author: rg911

e2e/infrastructure/TransactionHttp.spec.ts

@@ -596,7 +596,7 @@ describe('TransactionHttp', () => {
             const signedTransaction = accountLinkTransaction.signWith(account, generationHash);
 
             return helper.announce(signedTransaction).then((transaction: AccountKeyLinkTransaction) => {
-                expect(transaction.remotePublicKey, 'RemotePublicKey').not.to.be.undefined;
+                expect(transaction.linkedPublicKey, 'linkedPublicKey').not.to.be.undefined;
                 expect(transaction.linkAction, 'LinkAction').not.to.be.undefined;
                 return signedTransaction;
             });

package-lock.json

@@ -73,7 +73,7 @@
     },
     "dependencies": {
         "bluebird": "^3.7.2",
-        "catbuffer-typescript": "0.0.18",
+        "catbuffer-typescript": "0.0.19",
         "crypto-js": "^4.0.0",
         "diff": "^4.0.2",
         "futoin-hkdf": "^1.3.1",
@@ -89,7 +89,7 @@
         "ripemd160": "^2.0.2",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3",
-        "symbol-openapi-typescript-node-client": "0.8.10",
+        "symbol-openapi-typescript-node-client": "0.8.11",
         "tweetnacl": "^1.0.3",
         "utf8": "^3.0.0",
         "ws": "^7.2.3"

package.json

@@ -349,7 +349,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             transactionDTO.version,
             Deadline.createFromDTO(transactionDTO.deadline),
             UInt64.fromNumericString(transactionDTO.maxFee || '0'),
-            transactionDTO.remotePublicKey,
+            transactionDTO.linkedPublicKey,
             transactionDTO.linkAction,
             transactionDTO.signature,
             transactionDTO.signerPublicKey

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -52,7 +52,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => {
         case TransactionType.ACCOUNT_KEY_LINK:
             const accountLinkTx = transaction as AccountKeyLinkTransaction;
             return {
-                remotePublicKey: accountLinkTx.remotePublicKey,
+                linkedPublicKey: accountLinkTx.linkedPublicKey,
                 linkAction: accountLinkTx.linkAction,
             };
         case TransactionType.ADDRESS_ALIAS:

src/infrastructure/transaction/SerializeTransactionToJSON.ts

@@ -44,7 +44,7 @@ export class AccountKeyLinkTransaction extends Transaction {
     /**
      * Create a link account transaction object
      * @param deadline - The deadline to include the transaction.
-     * @param remotePublicKey - The public key of the remote account.
+     * @param linkedPublicKey - The public key of the remote account.
      * @param linkAction - The account link action.
      * @param maxFee - (Optional) Max fee defined by the sender
      * @param signature - (Optional) Transaction signature
@@ -53,7 +53,7 @@ export class AccountKeyLinkTransaction extends Transaction {
      */
     public static create(
         deadline: Deadline,
-        remotePublicKey: string,
+        linkedPublicKey: string,
         linkAction: LinkAction,
         networkType: NetworkType,
         maxFee: UInt64 = new UInt64([0, 0]),
@@ -65,7 +65,7 @@ export class AccountKeyLinkTransaction extends Transaction {
             TransactionVersion.ACCOUNT_KEY_LINK,
             deadline,
             maxFee,
-            remotePublicKey,
+            linkedPublicKey,
             linkAction,
             signature,
             signer,
@@ -77,7 +77,7 @@ export class AccountKeyLinkTransaction extends Transaction {
      * @param version
      * @param deadline
      * @param maxFee
-     * @param remotePublicKey
+     * @param linkedPublicKey
      * @param linkAction
      * @param signature
      * @param signer
@@ -91,7 +91,7 @@ export class AccountKeyLinkTransaction extends Transaction {
         /**
          * The public key of the remote account.
          */
-        public readonly remotePublicKey: string,
+        public readonly linkedPublicKey: string,
         /**
          * The account link action.
          */
@@ -118,7 +118,7 @@ export class AccountKeyLinkTransaction extends Transaction {
         const signature = payload.substring(16, 144);
         const transaction = AccountKeyLinkTransaction.create(
             isEmbedded ? Deadline.create() : Deadline.createFromDTO((builder as AccountKeyLinkTransactionBuilder).getDeadline().timestamp),
-            Convert.uint8ToHex(builder.getRemotePublicKey().key),
+            Convert.uint8ToHex(builder.getLinkedPublicKey().key),
             builder.getLinkAction().valueOf(),
             networkType,
             isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountKeyLinkTransactionBuilder).fee.amount),
@@ -160,7 +160,7 @@ export class AccountKeyLinkTransaction extends Transaction {
             TransactionType.ACCOUNT_KEY_LINK.valueOf(),
             new AmountDto(this.maxFee.toDTO()),
             new TimestampDto(this.deadline.toDTO()),
-            new KeyDto(Convert.hexToUint8(this.remotePublicKey)),
+            new KeyDto(Convert.hexToUint8(this.linkedPublicKey)),
             this.linkAction.valueOf(),
         );
         return transactionBuilder.serialize();
@@ -176,7 +176,7 @@ export class AccountKeyLinkTransaction extends Transaction {
             this.versionToDTO(),
             this.networkType.valueOf(),
             TransactionType.ACCOUNT_KEY_LINK.valueOf(),
-            new KeyDto(Convert.hexToUint8(this.remotePublicKey)),
+            new KeyDto(Convert.hexToUint8(this.linkedPublicKey)),
             this.linkAction.valueOf(),
         );
     }
@@ -196,6 +196,6 @@ export class AccountKeyLinkTransaction extends Transaction {
      * @returns {boolean}
      */
     public shouldNotifyAccount(address: Address): boolean {
-        return super.isSigned(address) || Address.createFromPublicKey(this.remotePublicKey, this.networkType).equals(address);
+        return super.isSigned(address) || Address.createFromPublicKey(this.linkedPublicKey, this.networkType).equals(address);
     }
 }

src/model/transaction/AccountKeyLinkTransaction.ts

@@ -571,7 +571,7 @@ describe('TransactionMapping - createFromPayload', () => {
         const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountKeyLinkTransaction;
 
         expect(transaction.linkAction).to.be.equal(1);
-        expect(transaction.remotePublicKey).to.be.equal(account.publicKey);
+        expect(transaction.linkedPublicKey).to.be.equal(account.publicKey);
     });
 
     it('should create an VrfKeyLinkTransaction object with link action', () => {
@@ -867,7 +867,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () =>
 
         const transaction = TransactionMapping.createFromDTO(accountLinkTransaction.toJSON()) as AccountKeyLinkTransaction;
 
-        expect(transaction.remotePublicKey).to.be.equal(account.publicKey);
+        expect(transaction.linkedPublicKey).to.be.equal(account.publicKey);
         expect(transaction.linkAction).to.be.equal(LinkAction.Link);
     });
 

test/core/utils/TransactionMapping.spec.ts

@@ -691,7 +691,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign
         let transaction = TransactionMapping.createFromPayload(signedTransaction) as AccountKeyLinkTransaction;
 
         expect(transaction.linkAction).to.be.equal(1);
-        expect(transaction.remotePublicKey).to.be.equal(account.publicKey);
+        expect(transaction.linkedPublicKey).to.be.equal(account.publicKey);
         expect(transaction.signature).to.be.equal(testSignature);
         expect(transaction.signer?.publicKey).to.be.equal(account.publicKey);
 

test/core/utils/TransactionMappingWithSignatures.spec.ts

@@ -71,7 +71,7 @@ describe('SerializeTransactionToJSON', () => {
 
         const json = accountLinkTransaction.toJSON();
 
-        expect(json.transaction.remotePublicKey).to.be.equal(account.publicKey);
+        expect(json.transaction.linkedPublicKey).to.be.equal(account.publicKey);
         expect(json.transaction.linkAction).to.be.equal(LinkAction.Link);
     });
 

test/infrastructure/SerializeTransactionToJSON.spec.ts

@@ -76,7 +76,7 @@ describe('TransactionHttp', () => {
     it('Test getTransactionStatus method', async () => {
         const hash = 'abc';
         const transactionStatusDTO = new TransactionStatusDTO();
-        transactionStatusDTO.code = TransactionStatusTypeEnum.FailureAccountLinkInvalidAction;
+        transactionStatusDTO.code = TransactionStatusTypeEnum.FailureAccountLinkInconsistentUnlinkData;
         transactionStatusDTO.deadline = '1234';
         transactionStatusDTO.hash = hash;
         transactionStatusDTO.group = TransactionStateTypeEnum.Failed;
@@ -90,14 +90,14 @@ describe('TransactionHttp', () => {
 
         expect(transactionStatus.deadline.toString()).to.be.equal('1234');
         expect(transactionStatus.hash).to.be.equal(hash);
-        expect(transactionStatus.code).to.be.equal('Failure_AccountLink_Invalid_Action');
+        expect(transactionStatus.code).to.be.equal('Failure_AccountLink_Inconsistent_Unlink_Data');
         expect(transactionStatus.group).to.be.equal('failed');
     });
 
     it('Test getTransactionsStatuses method', async () => {
         const hash = 'abc';
         const transactionStatusDTO = new TransactionStatusDTO();
-        transactionStatusDTO.code = TransactionStatusTypeEnum.FailureAccountLinkInvalidAction;
+        transactionStatusDTO.code = TransactionStatusTypeEnum.FailureAccountLinkInconsistentUnlinkData;
         transactionStatusDTO.deadline = '1234';
         transactionStatusDTO.hash = hash;
         transactionStatusDTO.group = TransactionStateTypeEnum.Failed;
@@ -112,7 +112,7 @@ describe('TransactionHttp', () => {
 
         expect(transactionStatus.deadline.toString()).to.be.equal('1234');
         expect(transactionStatus.hash).to.be.equal(hash);
-        expect(transactionStatus.code).to.be.equal('Failure_AccountLink_Invalid_Action');
+        expect(transactionStatus.code).to.be.equal('Failure_AccountLink_Inconsistent_Unlink_Data');
         expect(transactionStatus.group).to.be.equal('failed');
     });
 });