Skip to content

Commit fea5ac1

Browse files
fboucquezfboucquez
committed
Upgraded catbuffer library. Improved imports
1 parent 3772c4a commit fea5ac1

33 files changed

+274
-251
lines changed

‎package-lock.json‎

Lines changed: 3 additions & 3 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
@@ -59,7 +59,7 @@
5959
},
6060
"dependencies": {
6161
"bluebird": "^3.5.5",
62-
"catbuffer": "0.0.4-SNAPSHOT",
62+
"catbuffer": "0.0.5-SNAPSHOT",
6363
"crypto-js": "^3.1.9-1",
6464
"js-joda": "^1.6.2",
6565
"js-sha256": "^0.9.0",

‎src/infrastructure/transaction/CreateTransactionFromPayload.ts‎

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

17+
import {
18+
AccountAddressRestrictionTransactionBuilder,
19+
AccountLinkTransactionBuilder,
20+
AccountMetadataTransactionBuilder,
21+
AccountMosaicRestrictionTransactionBuilder,
22+
AccountOperationRestrictionTransactionBuilder,
23+
AddressAliasTransactionBuilder,
24+
AggregateBondedTransactionBuilder,
25+
AggregateCompleteTransactionBuilder,
26+
EmbeddedAccountAddressRestrictionTransactionBuilder,
27+
EmbeddedAccountLinkTransactionBuilder,
28+
EmbeddedAccountMetadataTransactionBuilder,
29+
EmbeddedAccountMosaicRestrictionTransactionBuilder,
30+
EmbeddedAccountOperationRestrictionTransactionBuilder,
31+
EmbeddedAddressAliasTransactionBuilder,
32+
EmbeddedHashLockTransactionBuilder,
33+
EmbeddedMosaicAddressRestrictionTransactionBuilder,
34+
EmbeddedMosaicAliasTransactionBuilder,
35+
EmbeddedMosaicDefinitionTransactionBuilder,
36+
EmbeddedMosaicGlobalRestrictionTransactionBuilder,
37+
EmbeddedMosaicMetadataTransactionBuilder,
38+
EmbeddedMosaicSupplyChangeTransactionBuilder,
39+
EmbeddedMultisigAccountModificationTransactionBuilder,
40+
EmbeddedNamespaceMetadataTransactionBuilder,
41+
EmbeddedNamespaceRegistrationTransactionBuilder,
42+
EmbeddedSecretLockTransactionBuilder,
43+
EmbeddedSecretProofTransactionBuilder,
44+
EmbeddedTransactionBuilder,
45+
EmbeddedTransferTransactionBuilder,
46+
HashLockTransactionBuilder,
47+
MosaicAddressRestrictionTransactionBuilder,
48+
MosaicAliasTransactionBuilder,
49+
MosaicDefinitionTransactionBuilder,
50+
MosaicGlobalRestrictionTransactionBuilder,
51+
MosaicMetadataTransactionBuilder,
52+
MosaicSupplyChangeTransactionBuilder,
53+
MultisigAccountModificationTransactionBuilder,
54+
NamespaceMetadataTransactionBuilder,
55+
NamespaceRegistrationTransactionBuilder,
56+
SecretLockTransactionBuilder,
57+
SecretProofTransactionBuilder,
58+
TransactionHelper,
59+
TransferTransactionBuilder
60+
} from 'catbuffer';
1761
import { Convert, Convert as convert } from '../../core/format';
1862
import { Deadline, PublicAccount, UInt64 } from '../../model/model';
1963
import { AccountAddressRestrictionTransaction } from '../../model/transaction/AccountAddressRestrictionTransaction';
@@ -38,48 +82,6 @@ import { SecretProofTransaction } from '../../model/transaction/SecretProofTrans
3882
import { Transaction } from '../../model/transaction/Transaction';
3983
import { TransactionType } from '../../model/transaction/TransactionType';
4084
import { TransferTransaction } from '../../model/transaction/TransferTransaction';
41-
import { TransactionHelper } from "catbuffer/dist/TransactionHelper";
42-
import { AccountAddressRestrictionTransactionBuilder } from "catbuffer/dist/AccountAddressRestrictionTransactionBuilder";
43-
import { EmbeddedTransactionBuilder } from "catbuffer/dist/EmbeddedTransactionBuilder";
44-
import { AccountMosaicRestrictionTransactionBuilder } from "catbuffer/dist/AccountMosaicRestrictionTransactionBuilder";
45-
import { AggregateCompleteTransactionBuilder } from "catbuffer/dist/AggregateCompleteTransactionBuilder";
46-
import { AggregateBondedTransactionBuilder } from "catbuffer/dist/AggregateBondedTransactionBuilder";
47-
import { AccountOperationRestrictionTransactionBuilder } from "catbuffer/dist/AccountOperationRestrictionTransactionBuilder";
48-
import { AccountLinkTransactionBuilder } from "catbuffer/dist/AccountLinkTransactionBuilder";
49-
import { AddressAliasTransactionBuilder } from "catbuffer/dist/AddressAliasTransactionBuilder";
50-
import { MosaicAliasTransactionBuilder } from "catbuffer/dist/MosaicAliasTransactionBuilder";
51-
import { MosaicDefinitionTransactionBuilder } from "catbuffer/dist/MosaicDefinitionTransactionBuilder";
52-
import { MosaicSupplyChangeTransactionBuilder } from "catbuffer/dist/MosaicSupplyChangeTransactionBuilder";
53-
import { NamespaceRegistrationTransactionBuilder } from "catbuffer/dist/NamespaceRegistrationTransactionBuilder";
54-
import { TransferTransactionBuilder } from "catbuffer/dist/TransferTransactionBuilder";
55-
import { SecretLockTransactionBuilder } from "catbuffer/dist/SecretLockTransactionBuilder";
56-
import { SecretProofTransactionBuilder } from "catbuffer/dist/SecretProofTransactionBuilder";
57-
import { MultisigAccountModificationTransactionBuilder } from "catbuffer/dist/MultisigAccountModificationTransactionBuilder";
58-
import { HashLockTransactionBuilder } from "catbuffer/dist/HashLockTransactionBuilder";
59-
import { MosaicGlobalRestrictionTransactionBuilder } from "catbuffer/dist/MosaicGlobalRestrictionTransactionBuilder";
60-
import { AccountMetadataTransactionBuilder } from "catbuffer/dist/AccountMetadataTransactionBuilder";
61-
import { MosaicAddressRestrictionTransactionBuilder } from "catbuffer/dist/MosaicAddressRestrictionTransactionBuilder";
62-
import { MosaicMetadataTransactionBuilder } from "catbuffer/dist/MosaicMetadataTransactionBuilder";
63-
import { NamespaceMetadataTransactionBuilder } from "catbuffer/dist/NamespaceMetadataTransactionBuilder";
64-
import { EmbeddedAccountAddressRestrictionTransactionBuilder } from "catbuffer/dist/EmbeddedAccountAddressRestrictionTransactionBuilder";
65-
import { EmbeddedAccountMosaicRestrictionTransactionBuilder } from "catbuffer/dist/EmbeddedAccountMosaicRestrictionTransactionBuilder";
66-
import { EmbeddedAccountOperationRestrictionTransactionBuilder } from "catbuffer/dist/EmbeddedAccountOperationRestrictionTransactionBuilder";
67-
import { EmbeddedNamespaceMetadataTransactionBuilder } from "catbuffer/dist/EmbeddedNamespaceMetadataTransactionBuilder";
68-
import { EmbeddedMosaicMetadataTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicMetadataTransactionBuilder";
69-
import { EmbeddedAccountMetadataTransactionBuilder } from "catbuffer/dist/EmbeddedAccountMetadataTransactionBuilder";
70-
import { EmbeddedMosaicAddressRestrictionTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicAddressRestrictionTransactionBuilder";
71-
import { EmbeddedMosaicGlobalRestrictionTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicGlobalRestrictionTransactionBuilder";
72-
import { EmbeddedHashLockTransactionBuilder } from "catbuffer/dist/EmbeddedHashLockTransactionBuilder";
73-
import { EmbeddedMultisigAccountModificationTransactionBuilder } from "catbuffer/dist/EmbeddedMultisigAccountModificationTransactionBuilder";
74-
import { EmbeddedSecretProofTransactionBuilder } from "catbuffer/dist/EmbeddedSecretProofTransactionBuilder";
75-
import { EmbeddedSecretLockTransactionBuilder } from "catbuffer/dist/EmbeddedSecretLockTransactionBuilder";
76-
import { EmbeddedTransferTransactionBuilder } from "catbuffer/dist/EmbeddedTransferTransactionBuilder";
77-
import { EmbeddedNamespaceRegistrationTransactionBuilder } from "catbuffer/dist/EmbeddedNamespaceRegistrationTransactionBuilder";
78-
import { EmbeddedMosaicSupplyChangeTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicSupplyChangeTransactionBuilder";
79-
import { EmbeddedMosaicDefinitionTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicDefinitionTransactionBuilder";
80-
import { EmbeddedMosaicAliasTransactionBuilder } from "catbuffer/dist/EmbeddedMosaicAliasTransactionBuilder";
81-
import { EmbeddedAddressAliasTransactionBuilder } from "catbuffer/dist/EmbeddedAddressAliasTransactionBuilder";
82-
import { EmbeddedAccountLinkTransactionBuilder } from "catbuffer/dist/EmbeddedAccountLinkTransactionBuilder";
8385

8486
/**
8587
* @internal

‎src/model/receipt/ArtifactExpiryReceipt.ts‎

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

17-
import { MosaicExpiryReceiptBuilder } from 'catbuffer/dist/MosaicExpiryReceiptBuilder';
18-
import { MosaicIdDto } from 'catbuffer/dist/MosaicIdDto';
19-
import { NamespaceExpiryReceiptBuilder } from 'catbuffer/dist/NamespaceExpiryReceiptBuilder';
20-
import { NamespaceIdDto } from 'catbuffer/dist/NamespaceIdDto';
17+
import { MosaicExpiryReceiptBuilder, MosaicIdDto, NamespaceExpiryReceiptBuilder, NamespaceIdDto } from 'catbuffer';
2118
import { MosaicId } from '../mosaic/MosaicId';
2219
import { NamespaceId } from '../namespace/NamespaceId';
2320
import { Receipt } from './Receipt';

‎src/model/receipt/BalanceChangeReceipt.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { AmountDto, BalanceChangeReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer';
1718
import { Convert } from '../../core/format/Convert';
18-
import { AmountDto } from 'catbuffer/dist/AmountDto';
19-
import { BalanceChangeReceiptBuilder } from 'catbuffer/dist/BalanceChangeReceiptBuilder';
20-
import { KeyDto } from 'catbuffer/dist/KeyDto';
21-
import { MosaicBuilder } from 'catbuffer/dist/MosaicBuilder';
22-
import { MosaicIdDto } from 'catbuffer/dist/MosaicIdDto';
2319
import { PublicAccount } from '../account/PublicAccount';
2420
import { MosaicId } from '../mosaic/MosaicId';
2521
import { UInt64 } from '../UInt64';

‎src/model/receipt/BalanceTransferReceipt.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { AddressDto, AmountDto, BalanceTransferReceiptBuilder, KeyDto, MosaicBuilder, MosaicIdDto } from 'catbuffer';
1718
import { Convert } from '../../core/format/Convert';
1819
import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
19-
import { AddressDto } from 'catbuffer/dist/AddressDto';
20-
import { AmountDto } from 'catbuffer/dist/AmountDto';
21-
import { BalanceTransferReceiptBuilder } from 'catbuffer/dist/BalanceTransferReceiptBuilder';
22-
import { KeyDto } from 'catbuffer/dist/KeyDto';
23-
import { MosaicBuilder } from 'catbuffer/dist/MosaicBuilder';
24-
import { MosaicIdDto } from 'catbuffer/dist/MosaicIdDto';
2520
import { Address } from '../account/Address';
2621
import { PublicAccount } from '../account/PublicAccount';
2722
import { MosaicId } from '../mosaic/MosaicId';

‎src/model/receipt/InflationReceipt.ts‎

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

17-
import { AmountDto } from 'catbuffer/dist/AmountDto';
18-
import { InflationReceiptBuilder } from 'catbuffer/dist/InflationReceiptBuilder';
19-
import { MosaicBuilder } from 'catbuffer/dist/MosaicBuilder';
20-
import { MosaicIdDto } from 'catbuffer/dist/MosaicIdDto';
17+
import { AmountDto, InflationReceiptBuilder, MosaicBuilder, MosaicIdDto } from 'catbuffer';
2118
import { MosaicId } from '../mosaic/MosaicId';
2219
import { UInt64 } from '../UInt64';
2320
import { Receipt } from './Receipt';

‎src/model/receipt/ReceiptSource.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Convert } from '../../core/format/Convert';
2-
import { GeneratorUtils } from 'catbuffer/dist/GeneratorUtils';
1+
import { GeneratorUtils } from 'catbuffer';
32

43
/*
54
* Copyright 2019 NEM

‎src/model/receipt/ResolutionEntry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { GeneratorUtils } from 'catbuffer';
1718
import { RawAddress } from '../../core/format/RawAddress';
18-
import { GeneratorUtils } from 'catbuffer/dist/GeneratorUtils';
1919
import { Address } from '../account/Address';
2020
import { MosaicId } from '../mosaic/MosaicId';
2121
import { UInt64 } from '../UInt64';

‎src/model/receipt/ResolutionStatement.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { GeneratorUtils } from 'catbuffer';
1718
import { sha3_256 } from 'js-sha3';
1819
import { UnresolvedMapping } from '../../core/utils/UnresolvedMapping';
19-
import { GeneratorUtils } from 'catbuffer/dist/GeneratorUtils';
2020
import { Address } from '../account/Address';
2121
import { NetworkType } from '../blockchain/NetworkType';
2222
import { MosaicId } from '../mosaic/MosaicId';

0 commit comments

Comments
 (0)