Skip to content

Commit 0f4f4f3

Browse files
fboucquezFernando
fboucquez
and
Fernando
authored
fix: Upgraded catbuffer to generated classes using the latest schemas names (#822)
Co-authored-by: Fernando <[email protected]>
1 parent f8fe7d8 commit 0f4f4f3

34 files changed

+77
-77
lines changed

‎package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"dependencies": {
9696
"@js-joda/core": "^3.2.0",
97-
"catbuffer-typescript": "1.0.0",
97+
"catbuffer-typescript": "^1.0.1-alpha-202111091444",
9898
"crypto-js": "^4.0.0",
9999
"futoin-hkdf": "^1.3.2",
100100
"js-sha256": "^0.9.0",

‎src/model/account/AccountInfo.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import {
2727
ImportanceDto,
2828
ImportanceHeightDto,
2929
ImportanceSnapshotBuilder,
30-
KeyDto,
3130
MosaicBuilder,
3231
PinnedVotingKeyBuilder,
33-
VotingKeyDto,
32+
PublicKeyDto,
33+
VotingPublicKeyDto,
3434
} from 'catbuffer-typescript';
3535
import { Convert } from '../../core/format';
3636
import { Mosaic, MosaicId } from '../mosaic';
@@ -112,16 +112,16 @@ export class AccountInfo {
112112
public serialize(): Uint8Array {
113113
const address: AddressDto = this.address.toBuilder();
114114
const addressHeight: HeightDto = new HeightDto(this.addressHeight.toDTO());
115-
const publicKey: KeyDto = new KeyDto(Convert.hexToUint8(this.publicKey));
115+
const publicKey: PublicKeyDto = new PublicKeyDto(Convert.hexToUint8(this.publicKey));
116116
const publicKeyHeight: HeightDto = new HeightDto(this.publicKeyHeight.toDTO());
117117
const accountType = this.accountType.valueOf();
118118
const supplementalPublicKeysMask = this.getAccountKeyTypeFlags();
119119
const votingPublicKeys: PinnedVotingKeyBuilder[] =
120120
this.supplementalPublicKeys.voting?.map((key) => AccountInfo.toPinnedVotingKeyBuilder(key)) || [];
121121
const balances: MosaicBuilder[] = this.mosaics.map((m) => AccountInfo.toMosaicBuilder(m));
122-
const linkedPublicKey: KeyDto | undefined = AccountInfo.toKeyDto(this?.supplementalPublicKeys?.linked?.publicKey);
123-
const nodePublicKey = AccountInfo.toKeyDto(this?.supplementalPublicKeys?.node?.publicKey);
124-
const vrfPublicKey = AccountInfo.toKeyDto(this?.supplementalPublicKeys?.vrf?.publicKey);
122+
const linkedPublicKey: PublicKeyDto | undefined = AccountInfo.toPublicKeyDto(this?.supplementalPublicKeys?.linked?.publicKey);
123+
const nodePublicKey = AccountInfo.toPublicKeyDto(this?.supplementalPublicKeys?.node?.publicKey);
124+
const vrfPublicKey = AccountInfo.toPublicKeyDto(this?.supplementalPublicKeys?.vrf?.publicKey);
125125
const importanceSnapshots: ImportanceSnapshotBuilder = new ImportanceSnapshotBuilder(
126126
new ImportanceDto(this.importance.toDTO()),
127127
new ImportanceHeightDto(this.importanceHeight.toDTO()),
@@ -179,21 +179,21 @@ export class AccountInfo {
179179
}
180180

181181
private static toPinnedVotingKeyBuilder(key: AccountLinkVotingKey): PinnedVotingKeyBuilder {
182-
const votingKeyDto = new VotingKeyDto(Convert.hexToUint8(key.publicKey).slice(0, 32));
182+
const votingPublicKeyDto = new VotingPublicKeyDto(Convert.hexToUint8(key.publicKey).slice(0, 32));
183183
const startEpoch: FinalizationEpochDto = new FinalizationEpochDto(key.startEpoch);
184184
const endEpoch: FinalizationEpochDto = new FinalizationEpochDto(key.endEpoch);
185-
return new PinnedVotingKeyBuilder(votingKeyDto, startEpoch, endEpoch);
185+
return new PinnedVotingKeyBuilder(votingPublicKeyDto, startEpoch, endEpoch);
186186
}
187187

188188
private static toMosaicBuilder(m: Mosaic): MosaicBuilder {
189189
return new MosaicBuilder((m.id as MosaicId).toBuilder(), new AmountDto(m.amount.toDTO()));
190190
}
191191

192-
private static toKeyDto(publicKey: string | undefined): KeyDto | undefined {
192+
private static toPublicKeyDto(publicKey: string | undefined): PublicKeyDto | undefined {
193193
if (!publicKey) {
194194
return undefined;
195195
}
196-
return new KeyDto(Convert.hexToUint8(publicKey));
196+
return new PublicKeyDto(Convert.hexToUint8(publicKey));
197197
}
198198

199199
private static toHeightActivityBucketsBuilder(b: ActivityBucket): HeightActivityBucketBuilder {

‎src/model/account/PublicAccount.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { KeyDto } from 'catbuffer-typescript';
17+
import { PublicKeyDto } from 'catbuffer-typescript';
1818
import { KeyPair } from '../../core/crypto';
1919
import { Convert } from '../../core/format';
2020
import { NetworkType } from '../network/NetworkType';
@@ -101,7 +101,7 @@ export class PublicAccount {
101101
/**
102102
* Create Builder object
103103
*/
104-
toBuilder(): KeyDto {
105-
return new KeyDto(Convert.hexToUint8(this.publicKey));
104+
toBuilder(): PublicKeyDto {
105+
return new PublicKeyDto(Convert.hexToUint8(this.publicKey));
106106
}
107107
}

‎src/model/transaction/AccountAddressRestrictionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
112112
const builder = isEmbedded
113113
? EmbeddedAccountAddressRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
114114
: AccountAddressRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
115-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
115+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
116116
const networkType = builder.getNetwork().valueOf();
117117
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
118118
const transaction = AccountAddressRestrictionTransaction.create(

‎src/model/transaction/AccountKeyLinkTransaction.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
AmountDto,
2020
EmbeddedAccountKeyLinkTransactionBuilder,
2121
EmbeddedTransactionBuilder,
22-
KeyDto,
22+
PublicKeyDto,
2323
TimestampDto,
2424
TransactionBuilder,
2525
} from 'catbuffer-typescript';
@@ -114,14 +114,14 @@ export class AccountKeyLinkTransaction extends Transaction {
114114
const builder = isEmbedded
115115
? EmbeddedAccountKeyLinkTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
116116
: AccountKeyLinkTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
117-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
117+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
118118
const networkType = builder.getNetwork().valueOf();
119119
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
120120
const transaction = AccountKeyLinkTransaction.create(
121121
isEmbedded
122122
? Deadline.createEmtpy()
123123
: Deadline.createFromDTO((builder as AccountKeyLinkTransactionBuilder).getDeadline().timestamp),
124-
Convert.uint8ToHex(builder.getLinkedPublicKey().key),
124+
Convert.uint8ToHex(builder.getLinkedPublicKey().publicKey),
125125
builder.getLinkAction().valueOf(),
126126
networkType,
127127
isEmbedded ? new UInt64([0, 0]) : new UInt64((builder as AccountKeyLinkTransactionBuilder).fee.amount),
@@ -144,7 +144,7 @@ export class AccountKeyLinkTransaction extends Transaction {
144144
TransactionType.ACCOUNT_KEY_LINK.valueOf(),
145145
new AmountDto(this.maxFee.toDTO()),
146146
new TimestampDto(this.deadline.toDTO()),
147-
new KeyDto(Convert.hexToUint8(this.linkedPublicKey)),
147+
new PublicKeyDto(Convert.hexToUint8(this.linkedPublicKey)),
148148
this.linkAction.valueOf(),
149149
);
150150
}
@@ -159,7 +159,7 @@ export class AccountKeyLinkTransaction extends Transaction {
159159
this.versionToDTO(),
160160
this.networkType.valueOf(),
161161
TransactionType.ACCOUNT_KEY_LINK.valueOf(),
162-
new KeyDto(Convert.hexToUint8(this.linkedPublicKey)),
162+
new PublicKeyDto(Convert.hexToUint8(this.linkedPublicKey)),
163163
this.linkAction.valueOf(),
164164
);
165165
}

‎src/model/transaction/AccountMetadataTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class AccountMetadataTransaction extends Transaction {
132132
const builder = isEmbedded
133133
? EmbeddedAccountMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
134134
: AccountMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
135-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
135+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
136136
const networkType = builder.getNetwork().valueOf();
137137
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
138138
const transaction = AccountMetadataTransaction.create(

‎src/model/transaction/AccountMosaicRestrictionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
115115
const builder = isEmbedded
116116
? EmbeddedAccountMosaicRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
117117
: AccountMosaicRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
118-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
118+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
119119
const networkType = builder.getNetwork().valueOf();
120120
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
121121
const transaction = AccountMosaicRestrictionTransaction.create(

‎src/model/transaction/AccountOperationRestrictionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export class AccountOperationRestrictionTransaction extends Transaction {
110110
const builder = isEmbedded
111111
? EmbeddedAccountOperationRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
112112
: AccountOperationRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
113-
const signer = Convert.uint8ToHex(builder.getSignerPublicKey().key);
113+
const signer = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
114114
const networkType = builder.getNetwork().valueOf();
115115
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
116116
const transaction = AccountOperationRestrictionTransaction.create(

‎src/model/transaction/AddressAliasTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export class AddressAliasTransaction extends Transaction {
123123
const builder = isEmbedded
124124
? EmbeddedAddressAliasTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
125125
: AddressAliasTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
126-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
126+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
127127
const networkType = builder.getNetwork().valueOf();
128128
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
129129
const transaction = AddressAliasTransaction.create(

‎src/model/transaction/AggregateTransaction.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
EmbeddedTransactionBuilder,
2323
GeneratorUtils,
2424
Hash256Dto,
25-
KeyDto,
25+
PublicKeyDto,
2626
SignatureDto,
2727
TimestampDto,
2828
TransactionBuilder,
@@ -162,12 +162,12 @@ export class AggregateTransaction extends Transaction {
162162
const type = (builder.type as number) as TransactionType;
163163
const innerTransactions = builder.getTransactions();
164164
const networkType = builder.getNetwork().valueOf();
165-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
165+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
166166
const signature = Transaction.getSignatureFromPayload(payload, false);
167167
const consignatures = builder.getCosignatures().map((cosig) => {
168168
return new AggregateTransactionCosignature(
169169
Convert.uint8ToHex(cosig.signature.signature),
170-
PublicAccount.createFromPublicKey(Convert.uint8ToHex(cosig.signerPublicKey.key), networkType),
170+
PublicAccount.createFromPublicKey(Convert.uint8ToHex(cosig.signerPublicKey.publicKey), networkType),
171171
new UInt64(cosig.version),
172172
);
173173
});
@@ -302,7 +302,7 @@ export class AggregateTransaction extends Transaction {
302302
const cosignatures = this.cosignatures.map((cosignature) => {
303303
const signerBytes = Convert.hexToUint8(cosignature.signer.publicKey);
304304
const signatureBytes = Convert.hexToUint8(cosignature.signature);
305-
return new CosignatureBuilder(cosignature.version.toDTO(), new KeyDto(signerBytes), new SignatureDto(signatureBytes));
305+
return new CosignatureBuilder(cosignature.version.toDTO(), new PublicKeyDto(signerBytes), new SignatureDto(signatureBytes));
306306
});
307307

308308
const builder =

‎src/model/transaction/LockFundsTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class LockFundsTransaction extends Transaction {
129129
const builder = isEmbedded
130130
? EmbeddedHashLockTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
131131
: HashLockTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
132-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
132+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
133133
const networkType = builder.getNetwork().valueOf();
134134
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
135135
const transaction = LockFundsTransaction.create(

‎src/model/transaction/MosaicAddressRestrictionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
150150
const builder = isEmbedded
151151
? EmbeddedMosaicAddressRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
152152
: MosaicAddressRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
153-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
153+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
154154
const networkType = builder.getNetwork().valueOf();
155155
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
156156
const transaction = MosaicAddressRestrictionTransaction.create(

‎src/model/transaction/MosaicAliasTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class MosaicAliasTransaction extends Transaction {
119119
const builder = isEmbedded
120120
? EmbeddedMosaicAliasTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
121121
: MosaicAliasTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
122-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
122+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
123123
const networkType = builder.getNetwork().valueOf();
124124
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
125125
const transaction = MosaicAliasTransaction.create(

‎src/model/transaction/MosaicDefinitionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class MosaicDefinitionTransaction extends Transaction {
143143
const builder = isEmbedded
144144
? EmbeddedMosaicDefinitionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
145145
: MosaicDefinitionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
146-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
146+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
147147
const networkType = builder.getNetwork().valueOf();
148148
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
149149
const transaction = MosaicDefinitionTransaction.create(

‎src/model/transaction/MosaicGlobalRestrictionTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
166166
const builder = isEmbedded
167167
? EmbeddedMosaicGlobalRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
168168
: MosaicGlobalRestrictionTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
169-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
169+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
170170
const networkType = builder.getNetwork().valueOf();
171171
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
172172
const transaction = MosaicGlobalRestrictionTransaction.create(

‎src/model/transaction/MosaicMetadataTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class MosaicMetadataTransaction extends Transaction {
144144
const builder = isEmbedded
145145
? EmbeddedMosaicMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
146146
: MosaicMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
147-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
147+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
148148
const networkType = builder.getNetwork().valueOf();
149149
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
150150
const transaction = MosaicMetadataTransaction.create(

‎src/model/transaction/MosaicSupplyChangeTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export class MosaicSupplyChangeTransaction extends Transaction {
126126
const builder = isEmbedded
127127
? EmbeddedMosaicSupplyChangeTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
128128
: MosaicSupplyChangeTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
129-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
129+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
130130
const networkType = builder.getNetwork().valueOf();
131131
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
132132
const transaction = MosaicSupplyChangeTransaction.create(

‎src/model/transaction/MultisigAccountModificationTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export class MultisigAccountModificationTransaction extends Transaction {
134134
const builder = isEmbedded
135135
? EmbeddedMultisigAccountModificationTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
136136
: MultisigAccountModificationTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
137-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
137+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
138138
const networkType = builder.getNetwork().valueOf();
139139
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
140140
const transaction = MultisigAccountModificationTransaction.create(

‎src/model/transaction/NamespaceMetadataTransaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export class NamespaceMetadataTransaction extends Transaction {
141141
const builder = isEmbedded
142142
? EmbeddedNamespaceMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload))
143143
: NamespaceMetadataTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
144-
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().key);
144+
const signerPublicKey = Convert.uint8ToHex(builder.getSignerPublicKey().publicKey);
145145
const networkType = builder.getNetwork().valueOf();
146146
const signature = Transaction.getSignatureFromPayload(payload, isEmbedded);
147147
const transaction = NamespaceMetadataTransaction.create(

0 commit comments

Comments
 (0)