Skip to content

Commit 1ef0033

Browse files
rg911rg911
committed
Fixed merge errors
1 parent 3275736 commit 1ef0033

10 files changed

+37
-47
lines changed

‎src/model/transaction/AccountAddressRestrictionTransaction.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
2424
import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
2525
import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
2626
import { UnresolvedAddressDto } from '../../infrastructure/catbuffer/UnresolvedAddressDto';
27+
import { AccountRestrictionType } from '../account/AccountRestrictionType';
2728
import { Address } from '../account/Address';
2829
import { PublicAccount } from '../account/PublicAccount';
29-
import { RestrictionType } from '../account/RestrictionType';
3030
import { NetworkType } from '../blockchain/NetworkType';
3131
import { UInt64 } from '../UInt64';
3232
import { AccountRestrictionModification } from './AccountRestrictionModification';
@@ -49,7 +49,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
4949
* @returns {AccountAddressRestrictionTransaction}
5050
*/
5151
public static create(deadline: Deadline,
52-
restrictionType: RestrictionType,
52+
restrictionType: AccountRestrictionType,
5353
modifications: Array<AccountRestrictionModification<string>>,
5454
networkType: NetworkType,
5555
maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionTransaction {
@@ -76,7 +76,7 @@ export class AccountAddressRestrictionTransaction extends Transaction {
7676
version: number,
7777
deadline: Deadline,
7878
maxFee: UInt64,
79-
public readonly restrictionType: RestrictionType,
79+
public readonly restrictionType: AccountRestrictionType,
8080
public readonly modifications: Array<AccountRestrictionModification<string>>,
8181
signature?: string,
8282
signer?: PublicAccount,

‎src/model/transaction/AccountMosaicRestrictionTransaction.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
2424
import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
2525
import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
2626
import { UnresolvedMosaicIdDto } from '../../infrastructure/catbuffer/UnresolvedMosaicIdDto';
27+
import { AccountRestrictionType } from '../account/AccountRestrictionType';
2728
import { PublicAccount } from '../account/PublicAccount';
28-
import { RestrictionType } from '../account/RestrictionType';
2929
import { NetworkType } from '../blockchain/NetworkType';
3030
import { MosaicId } from '../mosaic/MosaicId';
3131
import { UInt64 } from '../UInt64';
@@ -49,7 +49,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
4949
* @returns {AccountAddressRestrictionTransaction}
5050
*/
5151
public static create(deadline: Deadline,
52-
restrictionType: RestrictionType,
52+
restrictionType: AccountRestrictionType,
5353
modifications: Array<AccountRestrictionModification<number[]>>,
5454
networkType: NetworkType,
5555
maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionTransaction {
@@ -76,7 +76,7 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
7676
version: number,
7777
deadline: Deadline,
7878
maxFee: UInt64,
79-
public readonly restrictionType: RestrictionType,
79+
public readonly restrictionType: AccountRestrictionType,
8080
public readonly modifications: Array<AccountRestrictionModification<number[]>>,
8181
signature?: string,
8282
signer?: PublicAccount,

‎src/model/transaction/AccountOperationRestrictionTransaction.ts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import { EmbeddedAccountOperationRestrictionTransactionBuilder } from '../../inf
2323
import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
2424
import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
2525
import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
26+
import { AccountRestrictionType } from '../account/AccountRestrictionType';
2627
import { PublicAccount } from '../account/PublicAccount';
27-
import { RestrictionType } from '../account/RestrictionType';
2828
import { NetworkType } from '../blockchain/NetworkType';
2929
import { UInt64 } from '../UInt64';
3030
import { AccountRestrictionModification } from './AccountRestrictionModification';
@@ -34,13 +34,6 @@ import { Transaction } from './Transaction';
3434
import { TransactionInfo } from './TransactionInfo';
3535
import { TransactionType } from './TransactionType';
3636
import { TransactionVersion } from './TransactionVersion';
37-
import { AccountOperationRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountOperationRestrictionModificationBuilder';
38-
import { AccountOperationRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountOperationRestrictionTransactionBuilder';
39-
import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
40-
import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
41-
import { EntityTypeDto } from '../../infrastructure/catbuffer/EntityTypeDto';
42-
import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
43-
import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
4437

4538
export class AccountOperationRestrictionTransaction extends Transaction {
4639

@@ -54,7 +47,7 @@ export class AccountOperationRestrictionTransaction extends Transaction {
5447
* @returns {AccountOperationRestrictionTransaction}
5548
*/
5649
public static create(deadline: Deadline,
57-
restrictionType: RestrictionType,
50+
restrictionType: AccountRestrictionType,
5851
modifications: Array<AccountRestrictionModification<TransactionType>>,
5952
networkType: NetworkType,
6053
maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionTransaction {
@@ -81,7 +74,7 @@ export class AccountOperationRestrictionTransaction extends Transaction {
8174
version: number,
8275
deadline: Deadline,
8376
maxFee: UInt64,
84-
public readonly restrictionType: RestrictionType,
77+
public readonly restrictionType: AccountRestrictionType,
8578
public readonly modifications: Array<AccountRestrictionModification<TransactionType>>,
8679
signature?: string,
8780
signer?: PublicAccount,

‎src/model/transaction/AccountRestrictionTransaction.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class AccountRestrictionTransaction {
4040
modifications: Array<AccountRestrictionModification<string>>,
4141
networkType: NetworkType,
4242
maxFee: UInt64 = new UInt64([0, 0]),
43-
): AccountAddressRestrictionModificationTransaction {
43+
): AccountAddressRestrictionTransaction {
4444
if (![AccountRestrictionType.AllowIncomingAddress,
4545
AccountRestrictionType.AllowOutgoingAddress,
4646
AccountRestrictionType.BlockOutgoingAddress,
@@ -71,7 +71,7 @@ export class AccountRestrictionTransaction {
7171
modifications: Array<AccountRestrictionModification<number[]>>,
7272
networkType: NetworkType,
7373
maxFee: UInt64 = new UInt64([0, 0]),
74-
): AccountMosaicRestrictionModificationTransaction {
74+
): AccountMosaicRestrictionTransaction {
7575
if (![AccountRestrictionType.AllowMosaic,AccountRestrictionType.BlockMosaic].includes(restrictionType)) {
7676
throw new Error ('Restriction type is not allowed.');
7777
}
@@ -91,15 +91,15 @@ export class AccountRestrictionTransaction {
9191
* @param modification - array of operation modifications
9292
* @param networkType - The network type.
9393
* @param maxFee - (Optional) Max fee defined by the sender
94-
* @returns {createOperationRestrictionModificationTransaction}
94+
* @returns {AccountOperationRestrictionTransaction}
9595
*/
9696
public static createOperationRestrictionModificationTransaction(
9797
deadline: Deadline,
9898
restrictionType: AccountRestrictionType,
9999
modifications: Array<AccountRestrictionModification<TransactionType>>,
100100
networkType: NetworkType,
101101
maxFee: UInt64 = new UInt64([0, 0]),
102-
): AccountOperationRestrictionModificationTransaction {
102+
): AccountOperationRestrictionTransaction {
103103
if (![AccountRestrictionType.AllowIncomingTransactionType,
104104
AccountRestrictionType.AllowOutgoingTransactionType,
105105
AccountRestrictionType.BlockOutgoingTransactionType,

‎src/model/transaction/AddressAliasTransaction.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { Transaction } from './Transaction';
3636
import { TransactionInfo } from './TransactionInfo';
3737
import { TransactionType } from './TransactionType';
3838
import { TransactionVersion } from './TransactionVersion';
39-
import { RawAddress } from '../../core/format';
4039

4140
/**
4241
* In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply,

‎src/model/transaction/AggregateTransaction.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,17 @@ export class AggregateTransaction extends Transaction {
124124
);
125125
}
126126

127+
/**
128+
* @description add inner transactions to current list
129+
* @param {InnerTransaction[]} transaction
130+
* @returns {AggregateTransaction}
131+
* @memberof AggregateTransaction
132+
*/
133+
public addTransactions(transactions: InnerTransaction[]): AggregateTransaction {
134+
const innerTransactions = this.innerTransactions.concat(transactions);
135+
return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {innerTransactions});
136+
}
137+
127138
/**
128139
* Create a transaction object from payload
129140
* @param {string} payload Binary payload

‎src/model/transaction/MosaicDefinitionTransaction.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ import { Transaction } from './Transaction';
3939
import { TransactionInfo } from './TransactionInfo';
4040
import { TransactionType } from './TransactionType';
4141
import { TransactionVersion } from './TransactionVersion';
42-
import { MosaicDefinitionTransactionBuilder } from '../../infrastructure/catbuffer/MosaicDefinitionTransactionBuilder';
43-
import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
44-
import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
45-
import { EntityTypeDto } from '../../infrastructure/catbuffer/EntityTypeDto';
46-
import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
47-
import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
48-
import { MosaicNonceDto } from '../../infrastructure/catbuffer/MosaicNonceDto';
49-
import { MosaicIdDto } from '../../infrastructure/catbuffer/MosaicIdDto';
50-
import { MosaicFlagsDto } from '../../infrastructure/catbuffer/MosaicFlagsDto';
51-
import { MosaicFlags } from '../mosaic/MosaicFlag';
52-
import { BlockDurationDto } from '../../infrastructure/catbuffer/BlockDurationDto';
53-
import { Convert } from '../../core/format';
54-
import { GeneratorUtils } from '../../infrastructure/catbuffer/GeneratorUtils';
5542

5643
/**
5744
* Before a mosaic can be created or transferred, a corresponding definition of the mosaic has to be created and published to the network.

‎test/core/utils/TransactionMapping.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { Address } from '../../../src/model/account/Address';
2525
import { PublicAccount } from '../../../src/model/account/PublicAccount';
2626
import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType';
2727
import { NetworkType } from '../../../src/model/blockchain/NetworkType';
28-
import { EncryptedMessage } from '../../../src/model/model';
2928
import { MosaicId } from '../../../src/model/mosaic/MosaicId';
3029
import { MosaicNonce } from '../../../src/model/mosaic/MosaicNonce';
3130
import { MosaicProperties } from '../../../src/model/mosaic/MosaicProperties';
@@ -35,14 +34,15 @@ import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrency
3534
import { AliasAction } from '../../../src/model/namespace/AliasAction';
3635
import { NamespaceId } from '../../../src/model/namespace/NamespaceId';
3736
import { NamespaceType } from '../../../src/model/namespace/NamespaceType';
38-
import { AccountAddressRestrictionModificationTransaction } from'../../../src/model/transaction/AccountAddressRestrictionModificationTransaction';
37+
import { AccountAddressRestrictionTransaction } from '../../../src/model/transaction/AccountAddressRestrictionTransaction';
3938
import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction';
4039
import { AccountMosaicRestrictionTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionTransaction';
4140
import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification';
4241
import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction';
4342
import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction';
4443
import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction';
4544
import { Deadline } from '../../../src/model/transaction/Deadline';
45+
import { EncryptedMessage } from '../../../src/model/transaction/EncryptedMessage';
4646
import { HashType } from '../../../src/model/transaction/HashType';
4747
import { LinkAction } from '../../../src/model/transaction/LinkAction';
4848
import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction';
@@ -110,7 +110,7 @@ describe('TransactionMapping - createFromPayload', () => {
110110
const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash);
111111

112112
const transaction = TransactionMapping
113-
.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction;
113+
.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionTransaction;
114114
expect(transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowMosaic);
115115
expect(transaction.modifications[0].value[0]).to.be.equal(2262289484);
116116
expect(transaction.modifications[0].value[1]).to.be.equal(3405110546);
@@ -133,7 +133,7 @@ describe('TransactionMapping - createFromPayload', () => {
133133
const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash);
134134

135135
const transaction = TransactionMapping
136-
.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction;
136+
.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionTransaction;
137137
expect(transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowIncomingTransactionType);
138138
expect(transaction.modifications[0].value).to.be.equal(operation);
139139
expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add);
@@ -697,7 +697,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () =>
697697
const transaction =
698698
TransactionMapping.createFromDTO(mosaicRestrictionTransaction.toJSON()) as AccountMosaicRestrictionTransaction;
699699

700-
expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC);
700+
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_RESTRICTION_MOSAIC);
701701
expect(transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowMosaic);
702702
expect(transaction.modifications.length).to.be.equal(1);
703703
});
@@ -718,7 +718,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () =>
718718
const transaction =
719719
TransactionMapping.createFromDTO(operationRestrictionTransaction.toJSON()) as AccountMosaicRestrictionTransaction;
720720

721-
expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION);
721+
expect(transaction.type).to.be.equal(TransactionType.ACCOUNT_RESTRICTION_OPERATION);
722722
expect(transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowIncomingTransactionType);
723723
expect(transaction.modifications.length).to.be.equal(1);
724724
});

‎test/infrastructure/SerializeTransactionToJSON.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('SerializeTransactionToJSON', () => {
9090

9191
const json = addressRestrictionTransaction.toJSON();
9292

93-
expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS);
93+
expect(json.transaction.type).to.be.equal(TransactionType.ACCOUNT_RESTRICTION_ADDRESS);
9494
expect(json.transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowIncomingAddress);
9595
expect(json.transaction.modifications.length).to.be.equal(1);
9696
});
@@ -110,7 +110,7 @@ describe('SerializeTransactionToJSON', () => {
110110

111111
const json = mosaicRestrictionTransaction.toJSON();
112112

113-
expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC);
113+
expect(json.transaction.type).to.be.equal(TransactionType.ACCOUNT_RESTRICTION_MOSAIC);
114114
expect(json.transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowMosaic);
115115
expect(json.transaction.modifications.length).to.be.equal(1);
116116
});
@@ -130,7 +130,7 @@ describe('SerializeTransactionToJSON', () => {
130130

131131
const json = operationRestrictionTransaction.toJSON();
132132

133-
expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION);
133+
expect(json.transaction.type).to.be.equal(TransactionType.ACCOUNT_RESTRICTION_OPERATION);
134134
expect(json.transaction.restrictionType).to.be.equal(AccountRestrictionType.AllowIncomingTransactionType);
135135
expect(json.transaction.modifications.length).to.be.equal(1);
136136
});

‎test/model/transaction/AccountRestrictionTransaction.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ describe('AccountRestrictionTransaction', () => {
322322
expect(signedTransaction.payload.substring(
323323
240,
324324
signedTransaction.payload.length,
325-
)).to.be.equal('4101009050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142');
325+
)).to.be.equal('4101019050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142');
326326

327327
addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
328328
Deadline.create(),
@@ -336,7 +336,7 @@ describe('AccountRestrictionTransaction', () => {
336336
expect(signedTransaction.payload.substring(
337337
240,
338338
signedTransaction.payload.length,
339-
)).to.be.equal('C101009050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142');
339+
)).to.be.equal('C101019050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142');
340340

341341
});
342342

@@ -359,7 +359,7 @@ describe('AccountRestrictionTransaction', () => {
359359
expect(signedTransaction.payload.substring(
360360
240,
361361
signedTransaction.payload.length,
362-
)).to.be.equal('4401004E42');
362+
)).to.be.equal('4401014E42');
363363

364364
operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction(
365365
Deadline.create(),
@@ -373,7 +373,7 @@ describe('AccountRestrictionTransaction', () => {
373373
expect(signedTransaction.payload.substring(
374374
240,
375375
signedTransaction.payload.length,
376-
)).to.be.equal('C401004E42');
376+
)).to.be.equal('C401014E42');
377377

378378
});
379379
});

0 commit comments

Comments
 (0)