Merge pull request #227 from rg911/ts-catbuffer

Catbuffer applied on Schemas and Buffers generation

Author: rg911

e2e/conf/network.conf

@@ -1,54 +1,54 @@
 {
     "apiUrl": "http://localhost:3000",
-    "generationHash": "57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6",
+    "generationHash": "5E34C898234E17E8553359D4DEAA123742C323F4C42758C511E6CC805934853E",
     "testAccount": {
-        "privateKey": "D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D",
-        "address": "SBMYYFIM6VGG45KWGSZLSXFHP74WVT7MOF6UYBHT",
-        "publicKey": "2FC3872A792933617D70E02AFF8FBDE152821A0DF0CA5FB04CB56FC3D21C8863"
+        "privateKey": "C422CC3C9257A1568036E1726E64EB5923C8363A13D4344F9E66CD89C8789BC7",
+        "address": "SAMA2UEQNAQ45DWYDNJVLPWKQJDAHFZIVLWACIGN",
+        "publicKey": "8A78C9E9B0E59D0F74C0D47AB29FBD523C706293A3FA9CD9FE0EEB2C10EA924A"
     },
     "multisigAccount": {
-        "privateKey": "6EBE2AB0584C816771B494B36B40EC6CE1A0024C37DC6056D89D570A21A70262",
-        "address": "SCJAK5N6ICIE3JGHV5SVDSSNM5RUZZVDWQJ5G76N",
-        "publicKey": "224556169645EFAB772BFE1B5665490334428017E5D86FB3C9DFC4070B2F16A6"
+        "privateKey": "F6815438AE34F95F2CF364B4679D16F3602CA2107073C0709738BAB457B09A45",
+        "publicKey": "FAF3F9FD3E32EB43273E5351BAE705D0179D37CBDCC4DD78A0C73232DD3EF32C",
+        "address": "SDC4BXKIIDBQA2CY6RPRFO3WLC5OZHLKLJJ3NFEH"
     },
     "cosignatoryAccount": {
-        "privateKey": "44C0044B36AEF44C7743C407CEE4B6FD801BF6B0652AB7799B0991FFD3A81E71",
-        "address": "SCPL4YCGZYCML5WUSCIVN5MQF5YZAAF4GMZJIEL4",
-        "publicKey": "76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F"
+       "privateKey": "F48EA053D7D2B47DC518FDD69B338D34C819D9AC51E8754378F2D86FC29783C7",
+        "publicKey": "D9FB51DDFA64CC56D7AEBB32976DA8A3A72C8C7D02838AA1041046FA0883EBC6",
+        "address": "SCHNSELDJ7JN5MPHBOKHNBR2QRST4GOGEMS4XZNE"
     },
     "cosignatory2Account": {
-        "privateKey": "F7B3A64652BAE6DB00D8B7C45F9D1C9BE0DB9E02002111A0B547AE1E220B7DDC",
-        "address": "SBISV4QCGJ7SSOLG64DBNPWU6J7SSY64R22D2L3Q",
-        "publicKey": "B5C2611E32E16482B0B9811ABF906A1DE84184DED1D343790482F517C02FB01C"
+        "privateKey": "E697E9E0D849ACD3BD9379E80C4E953B23375112C28D983AF94160AD269BE327",
+        "publicKey": "2B4598150E66B26D991FA56FAF691C539FD1A92EBEA99E2AF91808B9C7C4316F",
+        "address": "SAWZITCY4TCOFBSSINFO4DQZTRBSB5W5OBSQE237"
     },
     "cosignatory3Account": {
-        "privateKey": "A7D6ED74CDDECBF621DDC63558433DB604FA800D138810B3DF9B4EC880D0705F",
-        "address": "SD2UY5LHIAAZDVKRHBOYSS4MTLHVTJVUTQPEGV2U",
-        "publicKey": "3A33DA75E00F643C49C57E8BD3282149911B06FF107C37F7AEDFED5532166BDA"
+        "privateKey": "3F42F4308B3EA912A9FE482D6DD04CCFD8D37E4397BF9655AA2EF36894491CAB",
+        "publicKey": "26A339827614E7AEE9DB427323AA3A49A48456AA5656D9A2E1B50FF93DE90756",
+        "address": "SCGYYXGL3TLZBOA5TUCCQYIM6NSYSLVCBVHGYKKW"
     },
      "cosignatory4Account": {
-        "privateKey": "D2A12301F5595869EFD5374B3372F0ED7EC26BF73A71D310950CC018D3FA0B03",
-        "address": "SD7PYMM2BTT4SGSITZ2MBQBK4SXIQQQV4ZOP46VF",
-        "publicKey": "FDE589878756C2287056EC8D7B2829D9C1FA6D389EBDC808034813FE7810AAB0"
+       "privateKey": "53D6A6659A200DAF4930AD4C8A3B5B28ECAAA1F643E990C0A41C0B8EC9B3D05A",
+        "publicKey": "F721863CC533C3DF4429A957F822B986C81E62A91726A3E3BD0B861FA42F757D",
+        "address": "SD3JPQ2KXMQKLVOHJV7GTOYV73CL72ZSEOW7RIWE"
     },
     "testAccount2": {
-        "privateKey": "E5DCCEBDB01A8B03A7DB7BA5888E2E33FD4617B5F6FED48C4C09C0780F422713",
-        "address": "SBSBLBT7CIOQG6XUI7TRDMHV4TKS5O7QM3MWQYHL",
-        "publicKey": "5F14CD455A1C0B08073C657EFA09365921736C1ADAF0F0685848678AE966EE09"
+        "privateKey": "F0AB1010EFEE19EE5373719881DF5123C13E643C519655F7E97347BFF77175BF",
+        "publicKey": "9DBF67474D6E1F8B131B4EB1F5BA0595AFFAE1123607BC1048F342193D7E669F",
+        "address": "SDBC4JE7GTJAKN2XJCQWWRJMYA35AFOYQBATXOUA"
     },
     "testAccount3": {
-        "privateKey": "CA95470BEFF4487D692D501E5C41F86FAE9CE6DD15B7B64E150E42A18BDE9CF8",
-        "address": "SBCFDASM35I6JSLUPQMSX2WGJG55WOCNB53NNVPH",
-        "publicKey": "E97077A656D9E7F5679880D4950BBF2B3638B7ACE17C82CCB7881DE9BAF396C6"
+        "privateKey": "61C3C8F24E3708CFE17A64B66EBD29D747326DBF7962EBEE9340439725C04F11",
+        "publicKey": "399C1D18FDE3293DCF7BF522626266663C83453BDF7D38C9E96AFC795C07E0A2",
+        "address": "SC7PPZRJMEMQ7S32PURJTTNHOATDYQ4NPRFOAOUO"
     },
     "testAccountNoBalance": {
-        "privateKey": "A0591F79F588758280DFB4823A47FCEEC6A551344F794FFDE3760A9D7E1DE348",
-        "address": "SC5NTT5APX2FAUS4VQUII3UTMAD7GHRFTLDQOEDW",
-        "publicKey": "6D652E480E5B2997A19D0C7485724693D79A63FCD591A948B40240BD196BA7D6"
+        "privateKey": "6530E5ED4B6D32CB9AF2EE09D2889DC781C569B83C137854EDC7773B057074A1",
+        "publicKey": "559019D82C4CACAAE616A024544251D58BB4464CD36407224475A577F9649E78",
+        "address": "SCQP4B6BDNH5MZHTLL2ZNXIPYSLD5BU4NDXBZXNK"
     },
     "harvestingAccount": {
-        "privateKey": "0B9802C011DA2D61BCD203F4DC76C012898EE38BA54A7E030B86630A8FD43CA6",
-        "address": "SAALWHKCWH72J53M3M4LB6UYFGLQMAOXJACWJX2U",
-        "publicKey": "092CAAFEBCB51C64A7CE423050964492407B264CA306D063DBA927A2304C4DD8"
+       "privateKey": "AF39DCC819388A2CE9DC0922730D7579588571A63F349A0FB1BC44807C926E53",
+        "publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",
+        "address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"
     }
 }

e2e/infrastructure/TransactionHttp.spec.ts

@@ -37,10 +37,10 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
 import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
 import { AliasAction } from '../../src/model/namespace/AliasAction';
 import { NamespaceId } from '../../src/model/namespace/NamespaceId';
-import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
+import { AccountAddressRestrictionTransaction } from '../../src/model/transaction/AccountAddressRestrictionTransaction';
 import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction';
-import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction';
-import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction';
+import { AccountMosaicRestrictionTransaction } from '../../src/model/transaction/AccountMosaicRestrictionTransaction';
+import { AccountOperationRestrictionTransaction } from '../../src/model/transaction/AccountOperationRestrictionTransaction';
 import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification';
 import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
 import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
@@ -410,7 +410,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account, generationHash);
 
-            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => {
+            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -486,7 +486,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account, generationHash);
 
-            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => {
+            listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -561,7 +561,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account, generationHash);
 
-            listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => {
+            listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -636,7 +636,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account3, generationHash);
 
-            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => {
+            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;
@@ -712,7 +712,7 @@ describe('TransactionHttp', () => {
             );
             const signedTransaction = addressModification.signWith(account3, generationHash);
 
-            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => {
+            listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionTransaction) => {
                 expect(transaction.modifications, 'Modifications').not.to.be.undefined;
                 expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined;
                 expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined;

src/core/format/Convert.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { decode } from 'utf8';
 import * as utilities from './Utilities';
 
 export class Convert {
@@ -172,4 +173,21 @@ export class Convert {
         }
         return result;
     }
+
+    /**
+     * @internal decode hex to uft8 string
+     * @param hex - Hex input
+     * @returns {string}
+     */
+    public static decodeHex = (hex: string): string => {
+        let str = '';
+        for (let i = 0; i < hex.length; i += 2) {
+            str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+        }
+        try {
+            return decode(str);
+        } catch (e) {
+            return str;
+        }
+    }
 }

src/core/utils/TransactionMapping.ts

@@ -16,7 +16,9 @@
 
 import { CreateTransactionFromDTO } from '../../infrastructure/transaction/CreateTransactionFromDTO';
 import { CreateTransactionFromPayload } from '../../infrastructure/transaction/CreateTransactionFromPayload';
+import { InnerTransaction } from '../../model/transaction/InnerTransaction';
 import { Transaction } from '../../model/transaction/Transaction';
+import { SignSchema } from '../crypto/SignSchema';
 
 export class TransactionMapping {
 
@@ -31,10 +33,14 @@ export class TransactionMapping {
 
     /**
      * Create transaction class from payload binary.
-     * @param {string} dataBytes The transaction json object.
-     * @returns {module: model/transaction/transaction} The transaction class.
+     * @param {string} payload The transaction binary payload
+     * @param {Boolean} isEmbedded Is embedded transaction (Default: false)
+     * @param {SignSchema} signSchema The Sign Schema. (KECCAK_REVERSED_KEY / SHA3)
+     * @returns {Transaction | InnerTransaction} The transaction class.
      */
-    public static createFromPayload(dataBytes: string): Transaction {
-        return CreateTransactionFromPayload(dataBytes);
+    public static createFromPayload(payload: string,
+                                    isEmbedded = false,
+                                    signSchema = SignSchema.SHA3): Transaction | InnerTransaction {
+        return CreateTransactionFromPayload(payload, isEmbedded, signSchema);
     }
 }

src/infrastructure/QueryParams.ts

@@ -22,7 +22,6 @@ export enum Order {
     DESC = '-id',
 }
 
-
 /**
  * The query params structure describes pagination params for requests.
  *