Skip to content

Commit e61ac93

Browse files
committed
Removed old flatbuffer staffs
1 parent 12fe1b1 commit e61ac93

11 files changed

+12
-79
lines changed

e2e/conf/network.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@
5151
"publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",
5252
"address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"
5353
}
54-
}
54+
}

src/model/transaction/MosaicSupplyChangeTransaction.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import { Transaction } from './Transaction';
3434
import { TransactionInfo } from './TransactionInfo';
3535
import { TransactionType } from './TransactionType';
3636
import { TransactionVersion } from './TransactionVersion';
37-
import { Convert } from '../../core/format';
3837

3938
/**
4039
* 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

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@ export abstract class Transaction {
112112
*/
113113
protected abstract generateEmbeddedBytes(): Uint8Array;
114114

115-
/**
116-
* @internal
117-
*/
118-
protected abstract buildTransaction(): VerifiableTransaction;
119-
120-
/**
121-
* @internal
122-
*/
123-
protected abstract generateBytes(): Uint8Array;
124-
125115
/**
126116
* @internal
127117
* Serialize and sign transaction creating a new SignedTransaction
@@ -152,60 +142,8 @@ export abstract class Transaction {
152142
}
153143

154144
/**
155-
* @internal
156-
* Serialize and sign transaction creating a new SignedTransaction
157-
* @param account - The account to sign the transaction
158-
* @param generationHash - Network generation hash hex
159-
* @param {SignSchema} signSchema The Sign Schema. (KECCAK_REVERSED_KEY / SHA3)
160-
* @returns {SignedTransaction}
161-
*/
162-
public signWithCatbuffer(account: Account, generationHash: string, signSchema: SignSchema = SignSchema.SHA3): SignedTransaction {
163-
const generationHashBytes = Array.from(Convert.hexToUint8(generationHash));
164-
const byteBuffer = Array.from(this.generateBytes());
165-
const signingBytes = generationHashBytes.concat(byteBuffer.slice(4 + 64 + 32));
166-
const keyPairEncoded = KeyPair.createKeyPairFromPrivateKeyString(account.privateKey, signSchema);
167-
const signature = Array.from(KeyPair.sign(account, new Uint8Array(signingBytes), signSchema));
168-
const signedTransactionBuffer = byteBuffer
169-
.splice(0, 4)
170-
.concat(signature)
171-
.concat(Array.from(keyPairEncoded.publicKey))
172-
.concat(byteBuffer
173-
.splice(64 + 32, byteBuffer.length));
174-
const payload = Convert.uint8ToHex(signedTransactionBuffer);
175-
return new SignedTransaction(
176-
payload,
177-
this.createTransactionHash(payload, generationHashBytes),
178-
account.publicKey,
179-
this.type,
180-
this.networkType);
181-
}
182-
183-
/**
184-
* Generate transaction hash hex
185-
* @param {string} transactionPayload HexString Payload
186-
* @param {Array<number>} generationHashBuffer Network generation hash byte
187-
* @returns {string} Returns Transaction Payload hash
188-
*/
189-
public createTransactionHash(transactionPayload: string, generationHashBuffer: number[]): string {
190-
const byteBuffer = Array.from(Convert.hexToUint8(transactionPayload));
191-
const signingBytes = byteBuffer
192-
.slice(4, 36)
193-
.concat(byteBuffer
194-
.slice(4 + 64, 4 + 64 + 32))
195-
.concat(generationHashBuffer)
196-
.concat(byteBuffer
197-
.splice(4 + 64 + 32, byteBuffer.length));
198-
199-
const hash = new Uint8Array(32);
200-
201-
SHA3Hasher.func(hash, signingBytes, 32);
202-
203-
return Convert.uint8ToHex(hash);
204-
}
205-
206-
/**
207-
* @internal
208-
* @returns {Array<number>}
145+
* Converts the transaction into AggregateTransaction compatible
146+
* @returns {Array.<*>} AggregateTransaction bytes
209147
*/
210148
public aggregateTransaction(): number[] {
211149
const signer = Convert.hexToUint8(this.signer!.publicKey);

test/model/transaction/AccountLinkTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('AccountLinkTransaction', () => {
6666
expect(accountLinkTransaction.linkAction).to.be.equal(1);
6767
expect(accountLinkTransaction.remoteAccountKey).to.be.equal(account.publicKey);
6868

69-
const signedTransaction = accountLinkTransaction.signWithCatbuffer(account, generationHash);
69+
const signedTransaction = accountLinkTransaction.signWith(account, generationHash);
7070

7171
expect(signedTransaction.payload.substring(
7272
240,

test/model/transaction/AccountRestrictionTransaction.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ describe('AccountRestrictionTransaction', () => {
162162
NetworkType.MIJIN_TEST,
163163
);
164164

165-
const signedTransaction = addressRestrictionTransaction.signWithCatbuffer(account, generationHash);
165+
const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash);
166166

167167
expect(signedTransaction.payload.substring(
168168
240,
@@ -213,7 +213,7 @@ describe('AccountRestrictionTransaction', () => {
213213
NetworkType.MIJIN_TEST,
214214
);
215215

216-
const signedTransaction = mosaicRestrictionTransaction.signWithCatbuffer(account, generationHash);
216+
const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash);
217217

218218
expect(signedTransaction.payload.substring(
219219
240,
@@ -266,7 +266,7 @@ describe('AccountRestrictionTransaction', () => {
266266
NetworkType.MIJIN_TEST,
267267
);
268268

269-
const signedTransaction = operationRestrictionTransaction.signWithCatbuffer(account, generationHash);
269+
const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash);
270270

271271
expect(signedTransaction.payload.substring(
272272
240,

test/model/transaction/AddressAliasTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('AddressAliasTransaction', () => {
8080
expect(addressAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293);
8181
expect(addressAliasTransaction.address.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
8282

83-
const signedTransaction = addressAliasTransaction.signWithCatbuffer(account, generationHash);
83+
const signedTransaction = addressAliasTransaction.signWith(account, generationHash);
8484

8585
expect(signedTransaction.payload.substring(
8686
240,

test/model/transaction/AggregateTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ describe('AggregateTransaction', () => {
106106
NetworkType.MIJIN_TEST,
107107
[]);
108108

109-
const signedTransaction = aggregateTransaction.signWithCatbuffer(account, generationHash);
109+
const signedTransaction = aggregateTransaction.signWith(account, generationHash);
110110

111111
expect(signedTransaction.payload.substring(0, 8)).to.be.equal('CD000000');
112112
expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5100000051000000');

test/model/transaction/ModifyMultisigAccountTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ describe('ModifyMultisigAccountTransaction', () => {
110110
expect(modifyMultisigAccountTransaction.modifications[1].cosignatoryPublicAccount.publicKey)
111111
.to.be.equal('B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4');
112112

113-
const signedTransaction = modifyMultisigAccountTransaction.signWithCatbuffer(account, generationHash);
113+
const signedTransaction = modifyMultisigAccountTransaction.signWith(account, generationHash);
114114

115115
expect(signedTransaction.payload.substring(
116116
240,

test/model/transaction/MosaicAliasTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('MosaicAliasTransaction', () => {
8080
expect(mosaicAliasTransaction.mosaicId.id.lower).to.be.equal(2262289484);
8181
expect(mosaicAliasTransaction.mosaicId.id.higher).to.be.equal(3405110546);
8282

83-
const signedTransaction = mosaicAliasTransaction.signWithCatbuffer(account, generationHash);
83+
const signedTransaction = mosaicAliasTransaction.signWith(account, generationHash);
8484

8585
expect(signedTransaction.payload.substring(
8686
240,

test/model/transaction/MosaicDefinitionTransaction.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('MosaicDefinitionTransaction', () => {
9393
expect(mosaicDefinitionTransaction.mosaicProperties.transferable).to.be.equal(true);
9494
expect(mosaicDefinitionTransaction.mosaicProperties.restrictable).to.be.equal(true);
9595

96-
const signedTransaction = mosaicDefinitionTransaction.signWithCatbuffer(account, generationHash);
96+
const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash);
9797

9898
expect(signedTransaction.payload.substring(
9999
240,

0 commit comments

Comments
 (0)