Skip to content

Commit 3c50732

Browse files
committed
Applied Elephant3 catbuffer codes
1 parent b0b308c commit 3c50732

File tree

68 files changed

+343
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+343
-417
lines changed

src/infrastructure/catbuffer/AccountAddressRestrictionTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AccountAddressRestrictionTransactionBuilder extends TransactionBuil
3939
* Constructor.
4040
*
4141
* @param signature Entity signature.
42-
* @param signer Entity signer's public key.
42+
* @param signerPublicKey Entity signer's public key.
4343
* @param version Entity version.
4444
* @param type Entity type.
4545
* @param fee Transaction fee.
@@ -48,8 +48,8 @@ export class AccountAddressRestrictionTransactionBuilder extends TransactionBuil
4848
* @param modifications Account restriction modifications.
4949
*/
5050
// tslint:disable-next-line: max-line-length
51-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountAddressRestrictionModificationBuilder[]) {
52-
super(signature, signer, version, type, fee, deadline);
51+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountAddressRestrictionModificationBuilder[]) {
52+
super(signature, signerPublicKey, version, type, fee, deadline);
5353
// tslint:disable-next-line: max-line-length
5454
this.accountAddressRestrictionTransactionBody = new AccountAddressRestrictionTransactionBodyBuilder(restrictionType, modifications);
5555
}
@@ -68,7 +68,7 @@ export class AccountAddressRestrictionTransactionBuilder extends TransactionBuil
6868
const accountAddressRestrictionTransactionBody = AccountAddressRestrictionTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6969
byteArray.splice(0, accountAddressRestrictionTransactionBody.getSize());
7070
// tslint:disable-next-line: max-line-length
71-
return new AccountAddressRestrictionTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountAddressRestrictionTransactionBody.restrictionType, accountAddressRestrictionTransactionBody.modifications);
71+
return new AccountAddressRestrictionTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountAddressRestrictionTransactionBody.restrictionType, accountAddressRestrictionTransactionBody.modifications);
7272
}
7373

7474
/**

src/infrastructure/catbuffer/AccountLinkTransactionBodyBuilder.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ import { KeyDto } from './KeyDto';
2525

2626
/** Binary layout for an account link transaction. */
2727
export class AccountLinkTransactionBodyBuilder {
28-
/** Remote account public key. */
29-
remoteAccountPublicKey: KeyDto;
28+
/** Remote public key. */
29+
remotePublicKey: KeyDto;
3030
/** Account link action. */
3131
linkAction: AccountLinkActionDto;
3232

3333
/**
3434
* Constructor.
3535
*
36-
* @param remoteAccountPublicKey Remote account public key.
36+
* @param remotePublicKey Remote public key.
3737
* @param linkAction Account link action.
3838
*/
39-
public constructor(remoteAccountPublicKey: KeyDto, linkAction: AccountLinkActionDto) {
40-
this.remoteAccountPublicKey = remoteAccountPublicKey;
39+
public constructor(remotePublicKey: KeyDto, linkAction: AccountLinkActionDto) {
40+
this.remotePublicKey = remotePublicKey;
4141
this.linkAction = linkAction;
4242
}
4343

@@ -49,20 +49,20 @@ export class AccountLinkTransactionBodyBuilder {
4949
*/
5050
public static loadFromBinary(payload: Uint8Array): AccountLinkTransactionBodyBuilder {
5151
const byteArray = Array.from(payload);
52-
const remoteAccountPublicKey = KeyDto.loadFromBinary(Uint8Array.from(byteArray));
53-
byteArray.splice(0, remoteAccountPublicKey.getSize());
52+
const remotePublicKey = KeyDto.loadFromBinary(Uint8Array.from(byteArray));
53+
byteArray.splice(0, remotePublicKey.getSize());
5454
const linkAction = GeneratorUtils.bufferToUint(GeneratorUtils.getBytes(Uint8Array.from(byteArray), 1));
5555
byteArray.splice(0, 1);
56-
return new AccountLinkTransactionBodyBuilder(remoteAccountPublicKey, linkAction);
56+
return new AccountLinkTransactionBodyBuilder(remotePublicKey, linkAction);
5757
}
5858

5959
/**
60-
* Gets remote account public key.
60+
* Gets remote public key.
6161
*
62-
* @return Remote account public key.
62+
* @return Remote public key.
6363
*/
64-
public getRemoteAccountPublicKey(): KeyDto {
65-
return this.remoteAccountPublicKey;
64+
public getRemotePublicKey(): KeyDto {
65+
return this.remotePublicKey;
6666
}
6767

6868
/**
@@ -81,7 +81,7 @@ export class AccountLinkTransactionBodyBuilder {
8181
*/
8282
public getSize(): number {
8383
let size = 0;
84-
size += this.remoteAccountPublicKey.getSize();
84+
size += this.remotePublicKey.getSize();
8585
size += 1; // linkAction
8686
return size;
8787
}
@@ -93,8 +93,8 @@ export class AccountLinkTransactionBodyBuilder {
9393
*/
9494
public serialize(): Uint8Array {
9595
let newArray = Uint8Array.from([]);
96-
const remoteAccountPublicKeyBytes = this.remoteAccountPublicKey.serialize();
97-
newArray = GeneratorUtils.concatTypedArrays(newArray, remoteAccountPublicKeyBytes);
96+
const remotePublicKeyBytes = this.remotePublicKey.serialize();
97+
newArray = GeneratorUtils.concatTypedArrays(newArray, remotePublicKeyBytes);
9898
const linkActionBytes = GeneratorUtils.uintToBuffer(this.linkAction, 1);
9999
newArray = GeneratorUtils.concatTypedArrays(newArray, linkActionBytes);
100100
return newArray;

src/infrastructure/catbuffer/AccountLinkTransactionBuilder.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ export class AccountLinkTransactionBuilder extends TransactionBuilder {
3838
* Constructor.
3939
*
4040
* @param signature Entity signature.
41-
* @param signer Entity signer's public key.
41+
* @param signerPublicKey Entity signer's public key.
4242
* @param version Entity version.
4343
* @param type Entity type.
4444
* @param fee Transaction fee.
4545
* @param deadline Transaction deadline.
46-
* @param remoteAccountPublicKey Remote account public key.
46+
* @param remotePublicKey Remote public key.
4747
* @param linkAction Account link action.
4848
*/
4949
// tslint:disable-next-line: max-line-length
50-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, remoteAccountPublicKey: KeyDto, linkAction: AccountLinkActionDto) {
51-
super(signature, signer, version, type, fee, deadline);
52-
this.accountLinkTransactionBody = new AccountLinkTransactionBodyBuilder(remoteAccountPublicKey, linkAction);
50+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, remotePublicKey: KeyDto, linkAction: AccountLinkActionDto) {
51+
super(signature, signerPublicKey, version, type, fee, deadline);
52+
this.accountLinkTransactionBody = new AccountLinkTransactionBodyBuilder(remotePublicKey, linkAction);
5353
}
5454

5555
/**
@@ -65,16 +65,16 @@ export class AccountLinkTransactionBuilder extends TransactionBuilder {
6565
const accountLinkTransactionBody = AccountLinkTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6666
byteArray.splice(0, accountLinkTransactionBody.getSize());
6767
// tslint:disable-next-line: max-line-length
68-
return new AccountLinkTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountLinkTransactionBody.remoteAccountPublicKey, accountLinkTransactionBody.linkAction);
68+
return new AccountLinkTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountLinkTransactionBody.remotePublicKey, accountLinkTransactionBody.linkAction);
6969
}
7070

7171
/**
72-
* Gets remote account public key.
72+
* Gets remote public key.
7373
*
74-
* @return Remote account public key.
74+
* @return Remote public key.
7575
*/
76-
public getRemoteAccountPublicKey(): KeyDto {
77-
return this.accountLinkTransactionBody.getRemoteAccountPublicKey();
76+
public getRemotePublicKey(): KeyDto {
77+
return this.accountLinkTransactionBody.getRemotePublicKey();
7878
}
7979

8080
/**

src/infrastructure/catbuffer/AccountMetadataTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class AccountMetadataTransactionBuilder extends TransactionBuilder {
3737
* Constructor.
3838
*
3939
* @param signature Entity signature.
40-
* @param signer Entity signer's public key.
40+
* @param signerPublicKey Entity signer's public key.
4141
* @param version Entity version.
4242
* @param type Entity type.
4343
* @param fee Transaction fee.
@@ -50,8 +50,8 @@ export class AccountMetadataTransactionBuilder extends TransactionBuilder {
5050
* @note when there is an existing value, new value is calculated as xor(previous-value, value).
5151
*/
5252
// tslint:disable-next-line: max-line-length
53-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, targetPublicKey: KeyDto, scopedMetadataKey: number[], valueSizeDelta: number, value: Uint8Array) {
54-
super(signature, signer, version, type, fee, deadline);
53+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, targetPublicKey: KeyDto, scopedMetadataKey: number[], valueSizeDelta: number, value: Uint8Array) {
54+
super(signature, signerPublicKey, version, type, fee, deadline);
5555
// tslint:disable-next-line: max-line-length
5656
this.accountMetadataTransactionBody = new AccountMetadataTransactionBodyBuilder(targetPublicKey, scopedMetadataKey, valueSizeDelta, value);
5757
}
@@ -69,7 +69,7 @@ export class AccountMetadataTransactionBuilder extends TransactionBuilder {
6969
const accountMetadataTransactionBody = AccountMetadataTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
7070
byteArray.splice(0, accountMetadataTransactionBody.getSize());
7171
// tslint:disable-next-line: max-line-length
72-
return new AccountMetadataTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountMetadataTransactionBody.targetPublicKey, accountMetadataTransactionBody.scopedMetadataKey, accountMetadataTransactionBody.valueSizeDelta, accountMetadataTransactionBody.value);
72+
return new AccountMetadataTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountMetadataTransactionBody.targetPublicKey, accountMetadataTransactionBody.scopedMetadataKey, accountMetadataTransactionBody.valueSizeDelta, accountMetadataTransactionBody.value);
7373
}
7474

7575
/**

src/infrastructure/catbuffer/AccountMosaicRestrictionTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AccountMosaicRestrictionTransactionBuilder extends TransactionBuild
3939
* Constructor.
4040
*
4141
* @param signature Entity signature.
42-
* @param signer Entity signer's public key.
42+
* @param signerPublicKey Entity signer's public key.
4343
* @param version Entity version.
4444
* @param type Entity type.
4545
* @param fee Transaction fee.
@@ -48,8 +48,8 @@ export class AccountMosaicRestrictionTransactionBuilder extends TransactionBuild
4848
* @param modifications Account restriction modifications.
4949
*/
5050
// tslint:disable-next-line: max-line-length
51-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountMosaicRestrictionModificationBuilder[]) {
52-
super(signature, signer, version, type, fee, deadline);
51+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountMosaicRestrictionModificationBuilder[]) {
52+
super(signature, signerPublicKey, version, type, fee, deadline);
5353
// tslint:disable-next-line: max-line-length
5454
this.accountMosaicRestrictionTransactionBody = new AccountMosaicRestrictionTransactionBodyBuilder(restrictionType, modifications);
5555
}
@@ -68,7 +68,7 @@ export class AccountMosaicRestrictionTransactionBuilder extends TransactionBuild
6868
const accountMosaicRestrictionTransactionBody = AccountMosaicRestrictionTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6969
byteArray.splice(0, accountMosaicRestrictionTransactionBody.getSize());
7070
// tslint:disable-next-line: max-line-length
71-
return new AccountMosaicRestrictionTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountMosaicRestrictionTransactionBody.restrictionType, accountMosaicRestrictionTransactionBody.modifications);
71+
return new AccountMosaicRestrictionTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountMosaicRestrictionTransactionBody.restrictionType, accountMosaicRestrictionTransactionBody.modifications);
7272
}
7373

7474
/**

src/infrastructure/catbuffer/AccountOperationRestrictionTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AccountOperationRestrictionTransactionBuilder extends TransactionBu
3939
* Constructor.
4040
*
4141
* @param signature Entity signature.
42-
* @param signer Entity signer's public key.
42+
* @param signerPublicKey Entity signer's public key.
4343
* @param version Entity version.
4444
* @param type Entity type.
4545
* @param fee Transaction fee.
@@ -48,8 +48,8 @@ export class AccountOperationRestrictionTransactionBuilder extends TransactionBu
4848
* @param modifications Account restriction modifications.
4949
*/
5050
// tslint:disable-next-line: max-line-length
51-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountOperationRestrictionModificationBuilder[]) {
52-
super(signature, signer, version, type, fee, deadline);
51+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, restrictionType: AccountRestrictionTypeDto, modifications: AccountOperationRestrictionModificationBuilder[]) {
52+
super(signature, signerPublicKey, version, type, fee, deadline);
5353
// tslint:disable-next-line: max-line-length
5454
this.accountOperationRestrictionTransactionBody = new AccountOperationRestrictionTransactionBodyBuilder(restrictionType, modifications);
5555
}
@@ -68,7 +68,7 @@ export class AccountOperationRestrictionTransactionBuilder extends TransactionBu
6868
const accountOperationRestrictionTransactionBody = AccountOperationRestrictionTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6969
byteArray.splice(0, accountOperationRestrictionTransactionBody.getSize());
7070
// tslint:disable-next-line: max-line-length
71-
return new AccountOperationRestrictionTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountOperationRestrictionTransactionBody.restrictionType, accountOperationRestrictionTransactionBody.modifications);
71+
return new AccountOperationRestrictionTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, accountOperationRestrictionTransactionBody.restrictionType, accountOperationRestrictionTransactionBody.modifications);
7272
}
7373

7474
/**

src/infrastructure/catbuffer/AddressAliasTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class AddressAliasTransactionBuilder extends TransactionBuilder {
4040
* Constructor.
4141
*
4242
* @param signature Entity signature.
43-
* @param signer Entity signer's public key.
43+
* @param signerPublicKey Entity signer's public key.
4444
* @param version Entity version.
4545
* @param type Entity type.
4646
* @param fee Transaction fee.
@@ -50,8 +50,8 @@ export class AddressAliasTransactionBuilder extends TransactionBuilder {
5050
* @param address Aliased address.
5151
*/
5252
// tslint:disable-next-line: max-line-length
53-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, aliasAction: AliasActionDto, namespaceId: NamespaceIdDto, address: AddressDto) {
54-
super(signature, signer, version, type, fee, deadline);
53+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, aliasAction: AliasActionDto, namespaceId: NamespaceIdDto, address: AddressDto) {
54+
super(signature, signerPublicKey, version, type, fee, deadline);
5555
this.addressAliasTransactionBody = new AddressAliasTransactionBodyBuilder(aliasAction, namespaceId, address);
5656
}
5757

@@ -68,7 +68,7 @@ export class AddressAliasTransactionBuilder extends TransactionBuilder {
6868
const addressAliasTransactionBody = AddressAliasTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6969
byteArray.splice(0, addressAliasTransactionBody.getSize());
7070
// tslint:disable-next-line: max-line-length
71-
return new AddressAliasTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, addressAliasTransactionBody.aliasAction, addressAliasTransactionBody.namespaceId, addressAliasTransactionBody.address);
71+
return new AddressAliasTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, addressAliasTransactionBody.aliasAction, addressAliasTransactionBody.namespaceId, addressAliasTransactionBody.address);
7272
}
7373

7474
/**

src/infrastructure/catbuffer/AggregateBondedTransactionBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
3737
* Constructor.
3838
*
3939
* @param signature Entity signature.
40-
* @param signer Entity signer's public key.
40+
* @param signerPublicKey Entity signer's public key.
4141
* @param version Entity version.
4242
* @param type Entity type.
4343
* @param fee Transaction fee.
@@ -46,8 +46,8 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
4646
* @param cosignatures Cosignatures data (fills remaining body space after transactions).
4747
*/
4848
// tslint:disable-next-line: max-line-length
49-
public constructor(signature: SignatureDto, signer: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, transactions: Uint8Array, cosignatures: Uint8Array) {
50-
super(signature, signer, version, type, fee, deadline);
49+
public constructor(signature: SignatureDto, signerPublicKey: KeyDto, version: number, type: EntityTypeDto, fee: AmountDto, deadline: TimestampDto, transactions: Uint8Array, cosignatures: Uint8Array) {
50+
super(signature, signerPublicKey, version, type, fee, deadline);
5151
this.aggregateTransactionBody = new AggregateTransactionBodyBuilder(transactions, cosignatures);
5252
}
5353

@@ -64,7 +64,7 @@ export class AggregateBondedTransactionBuilder extends TransactionBuilder {
6464
const aggregateTransactionBody = AggregateTransactionBodyBuilder.loadFromBinary(Uint8Array.from(byteArray));
6565
byteArray.splice(0, aggregateTransactionBody.getSize());
6666
// tslint:disable-next-line: max-line-length
67-
return new AggregateBondedTransactionBuilder(superObject.signature, superObject.signer, superObject.version, superObject.type, superObject.fee, superObject.deadline, aggregateTransactionBody.transactions, aggregateTransactionBody.cosignatures);
67+
return new AggregateBondedTransactionBuilder(superObject.signature, superObject.signerPublicKey, superObject.version, superObject.type, superObject.fee, superObject.deadline, aggregateTransactionBody.transactions, aggregateTransactionBody.cosignatures);
6868
}
6969

7070
/**

0 commit comments

Comments
 (0)