Removed old flatbuffer staffs

Author: rg911

e2e/conf/network.conf

@@ -51,4 +51,4 @@
         "publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",
         "address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"
     }
-}
+}

src/model/transaction/ModifyMultisigAccountTransaction.ts

@@ -31,7 +31,6 @@ import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
-import { EmbeddedMultisigAccountModificationTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedMultisigAccountModificationTransactionBuilder';
 
 /**
  * Modify multisig account transactions are part of the NEM's multisig account system.

src/model/transaction/MosaicDefinitionTransaction.ts

@@ -199,23 +199,4 @@ export class MosaicDefinitionTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedMosaicDefinitionTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.MOSAIC_DEFINITION.valueOf(),
-            new MosaicNonceDto(this.getMosaicNonceIntValue()),
-            new MosaicIdDto(this.mosaicId.id.toDTO()),
-            this.getMosaicFlagValue(),
-            this.mosaicProperties.divisibility,
-            new BlockDurationDto(this.mosaicProperties.duration ?
-                    this.mosaicProperties.duration.toDTO() : []),
-        );
-        return transactionBuilder.serialize();
-    }
 }

src/model/transaction/MosaicSupplyChangeTransaction.ts

@@ -32,7 +32,6 @@ import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
-import { Convert } from '../../core/format';
 
 /**
  * In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply,

src/model/transaction/Transaction.ts

@@ -112,21 +112,6 @@ export abstract class Transaction {
      */
     protected abstract generateEmbeddedBytes(): Uint8Array;
 
-    /**
-     * @internal
-     */
-    protected abstract buildTransaction(): VerifiableTransaction;
-
-    /**
-     * @internal
-     */
-    protected abstract generateBytes(): Uint8Array;
-
-    /**
-     * @internal
-     */
-    protected abstract generateEmbeddedBytes(): Uint8Array;
-
     /**
      * @internal
      * Serialize and sign transaction creating a new SignedTransaction
@@ -157,60 +142,8 @@ export abstract class Transaction {
     }
 
     /**
-     * @internal
-     * Serialize and sign transaction creating a new SignedTransaction
-     * @param account - The account to sign the transaction
-     * @param generationHash - Network generation hash hex
-     * @param {SignSchema} signSchema The Sign Schema. (KECCAK_REVERSED_KEY / SHA3)
-     * @returns {SignedTransaction}
-     */
-    public signWithCatbuffer(account: Account, generationHash: string, signSchema: SignSchema = SignSchema.SHA3): SignedTransaction {
-        const generationHashBytes = Array.from(Convert.hexToUint8(generationHash));
-        const byteBuffer = Array.from(this.generateBytes());
-        const signingBytes = generationHashBytes.concat(byteBuffer.slice(4 + 64 + 32));
-        const keyPairEncoded = KeyPair.createKeyPairFromPrivateKeyString(account.privateKey, signSchema);
-        const signature = Array.from(KeyPair.sign(account, new Uint8Array(signingBytes), signSchema));
-        const signedTransactionBuffer = byteBuffer
-            .splice(0, 4)
-            .concat(signature)
-            .concat(Array.from(keyPairEncoded.publicKey))
-            .concat(byteBuffer
-                .splice(64 + 32, byteBuffer.length));
-        const payload = Convert.uint8ToHex(signedTransactionBuffer);
-        return new SignedTransaction(
-            payload,
-            this.createTransactionHash(payload, generationHashBytes),
-            account.publicKey,
-            this.type,
-            this.networkType);
-    }
-
-    /**
-     * Generate transaction hash hex
-     * @param {string} transactionPayload HexString Payload
-     * @param {Array<number>} generationHashBuffer Network generation hash byte
-     * @returns {string} Returns Transaction Payload hash
-     */
-    public createTransactionHash(transactionPayload: string, generationHashBuffer: number[]): string {
-        const byteBuffer = Array.from(Convert.hexToUint8(transactionPayload));
-        const signingBytes = byteBuffer
-            .slice(4, 36)
-            .concat(byteBuffer
-                .slice(4 + 64, 4 + 64 + 32))
-            .concat(generationHashBuffer)
-            .concat(byteBuffer
-                .splice(4 + 64 + 32, byteBuffer.length));
-
-        const hash = new Uint8Array(32);
-
-        SHA3Hasher.func(hash, signingBytes, 32);
-
-        return Convert.uint8ToHex(hash);
-    }
-
-    /**
-     * @internal
-     * @returns {Array<number>}
+     * Converts the transaction into AggregateTransaction compatible
+     * @returns {Array.<*>} AggregateTransaction bytes
      */
     public aggregateTransaction(): number[] {
         const signer = Convert.hexToUint8(this.signer!.publicKey);

src/model/transaction/TransferTransaction.ts

@@ -224,23 +224,4 @@ export class TransferTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedTransferTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.TRANSFER.valueOf(),
-            new UnresolvedAddressDto(RawAddress.stringToAddress(this.recipientToString())),
-            this.getMessageBuffer(),
-            this.sortMosaics().map((mosaic) => {
-                return new UnresolvedMosaicBuilder(new UnresolvedMosaicIdDto(mosaic.id.id.toDTO()),
-                                                   new AmountDto(mosaic.amount.toDTO()));
-            }),
-        );
-        return transactionBuilder.serialize();
-    }
 }

test/model/transaction/AccountLinkTransaction.spec.ts

@@ -66,7 +66,7 @@ describe('AccountLinkTransaction', () => {
         expect(accountLinkTransaction.linkAction).to.be.equal(1);
         expect(accountLinkTransaction.remoteAccountKey).to.be.equal(account.publicKey);
 
-        const signedTransaction = accountLinkTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = accountLinkTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,

test/model/transaction/AccountRestrictionTransaction.spec.ts

@@ -162,7 +162,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = addressRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
@@ -204,7 +204,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = mosaicRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
@@ -246,7 +246,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = operationRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,

test/model/transaction/AddressAliasTransaction.spec.ts

@@ -80,7 +80,7 @@ describe('AddressAliasTransaction', () => {
         expect(addressAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293);
         expect(addressAliasTransaction.address.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
 
-        const signedTransaction = addressAliasTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = addressAliasTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,

test/model/transaction/AggregateTransaction.spec.ts

@@ -106,7 +106,7 @@ describe('AggregateTransaction', () => {
             NetworkType.MIJIN_TEST,
             []);
 
-        const signedTransaction = aggregateTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = aggregateTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(0, 8)).to.be.equal('CD000000');
         expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5100000051000000');