From 062cd9511807dc33e4f6abbe8b0565804ec9f4de Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 001/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3b7bb1567e..46839f6e0c 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -20,6 +20,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -141,6 +142,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index fe9017cf1d..2fad803616 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 7048b25cbb..d2a738ec78 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From 0bfebd1151db79ad951b9c021e17956b32a04fbe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 002/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 9 +++++---- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 2fad803616..d5dd9ebd8d 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {CosignatureTransaction as CosignaturetransactionLibrary} from 'nem2-library'; +import {CosignatureTransaction as CosignaturetransactionLibrary, VerifiableTransaction} from 'nem2-library'; import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d2a738ec78..380349e1dd 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 2a6921b981daf51c5b2061fa34dc0c724a488f89 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 003/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 46839f6e0c..69f76f173a 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -150,11 +150,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 380349e1dd..c0ea3066e8 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From b61577f981cf29a1f4312efc63bb57e56756a8fb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 004/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 69f76f173a..f7eb599ea7 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -147,14 +147,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 8880b88e69dfad900ec40f3919d70d02dd7448eb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 2 May 2019 14:37:46 +0100 Subject: [PATCH 005/208] updated nem2-lib version --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9dc37b8920..82207abd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1213,9 +1213,9 @@ "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" }, "nem2-library": { - "version": "0.9.14", - "resolved": "https://registry.npmjs.org/nem2-library/-/nem2-library-0.9.14.tgz", - "integrity": "sha512-WTWycF01RwDj9UIn0B3Gb7BIhOQszYVKi7/IzfR4mGGrxsJcmMoJ71oB0OUtjHyHv47lM6g5sk2QGu58u376sw==", + "version": "0.9.15", + "resolved": "https://registry.npmjs.org/nem2-library/-/nem2-library-0.9.15.tgz", + "integrity": "sha512-yVzU5V+Q3H1vhip5jX9mCzcdAii2NRlWmPmlQXye9ScYwQjEyEqrkHS73WN47vD/7RRz0AHfJqmxxoDlOq81NA==", "requires": { "bufferutil": "^3.0.5", "crypto-browserify": "3.12.0", diff --git a/package.json b/package.json index 471ddd3e7f..bcc4c28924 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/crypto-js": "^3.1.43", "crypto-js": "^3.1.9-1", "js-joda": "^1.6.2", - "nem2-library": "^0.9.14", + "nem2-library": "0.9.15", "request": "^2.83.0", "request-promise-native": "^1.0.5", "rxjs": "^6.2.1", From 281945b5fbfb0cb7a9cdc67d529fc1da5a71daf3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 006/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b6cf37736c..20684ca55f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -21,6 +21,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -143,6 +144,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e783dd6659..9778e16666 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From 17b7bda5c87c8637359ad331e76618480d96effb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 007/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 9778e16666..7d5b4c5d1a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 7808a68f2eb60338d6d06fab8c71ee99996ec0a2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 008/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 20684ca55f..3e0e99620b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -152,11 +152,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From 1249d546eb9968f632ea4a54b2331ba1d935c396 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 009/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3e0e99620b..5a6f7c4d49 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -149,14 +149,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 03cf6b8248f127c62295c5157f1300e51341b396 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 010/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 24 ++++--------------- .../transaction/CosignatureTransaction.ts | 6 +++-- .../transaction/AggregateTransaction.spec.ts | 7 +++--- .../CosignatureTransaction.spec.ts | 5 ++-- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 60dbceddef..4cf5ed8fb3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -150,30 +150,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 7d5b4c5d1a..75a0c4250a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -18,6 +18,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -50,13 +51,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..0a83b37b05 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From e5bc363b9ae3fccaa2bcc20dee3314b00dc1e1df Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 011/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b6cf37736c..20684ca55f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -21,6 +21,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -143,6 +144,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e783dd6659..9778e16666 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From 9303995e9623a09d50636d29d298a9438103ff5a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 012/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 9778e16666..7d5b4c5d1a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 1d1305c21555a7db97c98ed131a55b565bb4e4aa Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 013/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 20684ca55f..3e0e99620b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -152,11 +152,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From 9d765ac4b6dde646c0e796781fcdc561d2eb8741 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 014/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3e0e99620b..5a6f7c4d49 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -149,14 +149,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 53a536d74024166c0261bbedf7864831be28d03b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 015/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 11 +++++++---- src/model/transaction/CosignatureTransaction.ts | 8 +++++--- test/model/transaction/AggregateTransaction.spec.ts | 9 ++++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 +++---- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 5a6f7c4d49..7c4f8614ca 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -96,7 +96,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -150,13 +150,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } @@ -191,4 +194,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 7d5b4c5d1a..1b77cce32e 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -18,6 +18,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -50,13 +51,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, @@ -77,4 +79,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..e3aa269d77 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); @@ -466,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,9 +124,9 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From b169e0438eed4aa7b9e02598650f0125a68c969e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 016/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b6cf37736c..20684ca55f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -21,6 +21,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -143,6 +144,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e783dd6659..9778e16666 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From ce2fd0409612417ad3932751a2c20e0f0fa8875d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 017/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 9778e16666..7d5b4c5d1a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 227567b56036b24cca8b3535f63ca906d50cf393 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 018/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 20684ca55f..3e0e99620b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -152,11 +152,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From 1e5adfaacdaeafc257cadea16aa832c0e015468e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 019/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3e0e99620b..5a6f7c4d49 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -149,14 +149,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From f875202065673fffc172f04a3b454b6dc456cf05 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 020/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- src/model/transaction/CosignatureTransaction.ts | 6 ++++-- test/model/transaction/AggregateTransaction.spec.ts | 7 +++---- test/model/transaction/CosignatureTransaction.spec.ts | 5 ++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 5a6f7c4d49..4cf5ed8fb3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -150,13 +150,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 7d5b4c5d1a..75a0c4250a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -18,6 +18,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -50,13 +51,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..0a83b37b05 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From 23bed5c061ab5ace5772fe6bd8310339e71f2e0a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 021/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From fc5003981b214baab442cbb5ce654c9d2038ffd6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 022/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 4 ++-- src/model/transaction/CosignatureTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 4cf5ed8fb3..7c4f8614ca 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -96,7 +96,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -194,4 +194,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 75a0c4250a..1b77cce32e 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -79,4 +79,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0a83b37b05..e3aa269d77 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -465,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 4ca819f5f000e2d6e87f5e5a1c82f1f54d140a2f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 023/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b6cf37736c..20684ca55f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -21,6 +21,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -143,6 +144,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e783dd6659..9778e16666 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From e1a36d29cb3f393b9f6f6f602af06e94027d0713 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 024/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 9778e16666..7d5b4c5d1a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From eb05e25c898a1c4f8f5c90d05aa6c7d437c15f61 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 025/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 20684ca55f..3e0e99620b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -152,11 +152,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From 2ec055f3fdd748d41de78dd6da47584c39337252 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 026/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3e0e99620b..5a6f7c4d49 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -149,14 +149,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 5e9ba53cdc22873219b755b5332bf6b205040ffa Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 027/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- src/model/transaction/CosignatureTransaction.ts | 6 ++++-- test/model/transaction/AggregateTransaction.spec.ts | 7 +++---- test/model/transaction/CosignatureTransaction.spec.ts | 5 ++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 5a6f7c4d49..4cf5ed8fb3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -150,13 +150,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 7d5b4c5d1a..75a0c4250a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -18,6 +18,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -50,13 +51,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..0a83b37b05 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From a3ae31a58e3318856186f4b29013811fd766bcf6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 028/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 8204596b65154f1b5402cd4457cc7179c9ec9aa3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 029/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 4 ++-- src/model/transaction/CosignatureTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 4cf5ed8fb3..7c4f8614ca 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -96,7 +96,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -194,4 +194,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 75a0c4250a..1b77cce32e 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -79,4 +79,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0a83b37b05..e3aa269d77 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -465,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 007751887f003bf16ba7d2ca2ef4559827539b47 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 030/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From a760a6f1fac6a984f2737654f4260b40ffb3505f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 031/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 320043ebb16eeade6f0ca9da0e39064662cb0fc6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 032/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 9bbb70d1947e0220b2436bc3cf32844d9ce89580 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 033/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 29d4e13cd8644ece797d08189226936da36318c9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 034/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b6cf37736c..20684ca55f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -21,6 +21,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -143,6 +144,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e783dd6659..9778e16666 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -45,6 +45,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From 35404f91e946d23653d88d32dbab27aba2d124c5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 035/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 9778e16666..7d5b4c5d1a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,16 +46,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 7ad6fd73dd94101aac2f5e605ea2b3b469d65133 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 036/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 20684ca55f..3e0e99620b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -152,11 +152,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From 9d2d7873e7cce04297e81f586a2eeb7153811eaa Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 037/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 3e0e99620b..5a6f7c4d49 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -149,14 +149,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From ad15f6cb60a4c111a546786ba01930fb7366fb83 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 038/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- src/model/transaction/CosignatureTransaction.ts | 6 ++++-- test/model/transaction/AggregateTransaction.spec.ts | 7 +++---- test/model/transaction/CosignatureTransaction.spec.ts | 5 ++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 5a6f7c4d49..4cf5ed8fb3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -150,13 +150,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 7d5b4c5d1a..75a0c4250a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -18,6 +18,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -50,13 +51,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..0a83b37b05 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From 989e01e241f2dc57c05842661872741d09bc50ac Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 039/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 5e19731dd21b4076420ba2e26310255ed8641087 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 040/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 4 ++-- src/model/transaction/CosignatureTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 4cf5ed8fb3..7c4f8614ca 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -96,7 +96,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -194,4 +194,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 75a0c4250a..1b77cce32e 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -79,4 +79,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0a83b37b05..e3aa269d77 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -465,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 824f425ad0783ae2653589b1818b31cd7222ecfe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 041/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 1ec3ecda738e16431375577d5ad39faf8b9a2ba9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 042/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 14894ac9d2a48c41ff141ad15860f2e46c45b902 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 043/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From ca47b97775ee54b63c750e04d7c2e59ffabfaaea Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 044/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From d1092a35a015048e19134c6ca483ab5a5c2dd547 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 045/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From f1ee787f4635ffc1949ac447d93bcafedcd356cf Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 046/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From dfc7a8332732e7c08bcd83d77efc3a476900d3d2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 047/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From a753b8b5b5229a2ff7e83c490368aef533608fbe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 048/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From b2ef1a22e33c09788d4225416524334ba1295ebc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 049/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 47b6cc960b789a5a41e336235ade64dc497e366d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 050/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c1126bea614fb1fd2bb688f8507656b019ad0f37 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 051/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From aa4c4d257f33322b985678579f356f3ef0201ff9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 052/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 51bdce06901aa08e51a5f83569da406ca0c7fdd2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 10:53:59 +0100 Subject: [PATCH 053/208] Added #192 Updated AccountPropertyTransaction Names --- e2e/infrastructure/AccountHttp.spec.ts | 16 ++--- e2e/infrastructure/TransactionHttp.spec.ts | 52 ++++++++--------- .../transaction/CreateTransactionFromDTO.ts | 20 +++---- .../CreateTransactionFromPayload.ts | 20 +++---- .../transaction/SerializeTransactionToJSON.ts | 18 +++--- src/model/model.ts | 10 ++-- ...ressRestrictionModificationTransaction.ts} | 18 +++--- ...TypeRestrictionModificationTransaction.ts} | 18 +++--- ...saicRestrictionModificationTransaction.ts} | 18 +++--- ...n.ts => AccountRestrictionModification.ts} | 20 +++---- ...on.ts => AccountRestrictionTransaction.ts} | 40 ++++++------- test/core/utils/TransactionMapping.spec.ts | 44 +++++++------- .../SerializeTransactionToJSON.spec.ts | 16 ++--- .../AccountPropertyTransaction.spec.ts | 58 +++++++++---------- 14 files changed, 184 insertions(+), 184 deletions(-) rename src/model/transaction/{ModifyAccountPropertyAddressTransaction.ts => AccountAddressRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyEntityTypeTransaction.ts => AccountEntityTypeRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyMosaicTransaction.ts => AccountMosaicRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{AccountPropertyModification.ts => AccountRestrictionModification.ts} (76%) rename src/model/transaction/{AccountPropertyTransaction.ts => AccountRestrictionTransaction.ts} (70%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5dcf195e29..5baaa5dc03 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -27,8 +27,8 @@ import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -193,12 +193,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -419,12 +419,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index dfd5019b00..8c3d213fba 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -37,9 +37,12 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType'; import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction'; import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction'; @@ -49,9 +52,6 @@ import { HashLockTransaction } from '../../src/model/transaction/HashLockTransac import {HashType} from '../../src/model/transaction/HashType'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../src/model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction'; @@ -272,7 +272,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -283,11 +283,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -295,7 +295,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyAddressTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -310,7 +310,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -320,11 +320,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -347,7 +347,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -358,11 +358,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -370,7 +370,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyMosaicTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -385,7 +385,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -395,11 +395,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Remove, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -422,7 +422,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -433,11 +433,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: ModifyAccountPropertyEntityTypeTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -460,7 +460,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -470,11 +470,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Remove, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index eb6c258a62..3adc8b71f4 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -25,7 +25,7 @@ import {MosaicProperties} from '../../model/mosaic/MosaicProperties'; import { MosaicPropertyType } from '../../model/mosaic/MosaicPropertyType'; import {NamespaceId} from '../../model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification'; +import {AccountRestrictionModification} from '../../model/transaction/AccountRestrictionModification'; import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../model/transaction/AggregateTransaction'; import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature'; @@ -34,9 +34,9 @@ import {Deadline} from '../../model/transaction/Deadline'; import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; -import {ModifyAccountPropertyAddressTransaction} from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import {ModifyAccountPropertyEntityTypeTransaction} from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import {ModifyAccountPropertyMosaicTransaction} from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction'; @@ -277,13 +277,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) { - return new ModifyAccountPropertyAddressTransaction( + return new AccountAddressRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -293,13 +293,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new ModifyAccountPropertyEntityTypeTransaction( + return new AccountEntityTypeRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -309,13 +309,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) { - return new ModifyAccountPropertyMosaicTransaction( + return new AccountMosaicRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index c042e778e7..2d6a79adf1 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -26,7 +26,7 @@ import { MosaicProperties } from '../../model/mosaic/MosaicProperties'; import { NamespaceId } from '../../model/namespace/NamespaceId'; import { NamespaceType } from '../../model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../model/transaction/AccountPropertyModification'; +import { AccountRestrictionModification } from '../../model/transaction/AccountRestrictionModification'; import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { AggregateTransactionCosignature } from '../../model/transaction/AggregateTransactionCosignature'; @@ -36,9 +36,9 @@ import { HashType } from '../../model/transaction/HashType'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -113,10 +113,10 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N switch (type) { case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: - const t = ModifyAccountPropertyAddressTransaction.create( + const t = AccountAddressRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), Address.createFromEncoded(modification.substring(2, modification.length)).plain(), )) : [], @@ -124,20 +124,20 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N ); return t; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), UInt64.fromHex(reverse(modification.substring(2, modification.length))).toDTO(), )) : [], networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), parseInt(convert.uint8ToHex(convert.hexToUint8( modification.substring(2, modification.length)).reverse()), 16), diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index b3245a0ca8..d379334222 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -18,9 +18,9 @@ import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTrans import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -70,24 +70,24 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as ModifyAccountPropertyAddressTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyAddressTransaction). + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as ModifyAccountPropertyEntityTypeTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyEntityTypeTransaction). + propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as ModifyAccountPropertyMosaicTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyMosaicTransaction).modifications.map((modification) => { + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), }; diff --git a/src/model/model.ts b/src/model/model.ts index 47c8471340..9a1911b91d 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -91,11 +91,11 @@ export * from './receipt/Statement'; // Transaction export * from './transaction/AccountLinkTransaction'; -export * from './transaction/AccountPropertyTransaction'; -export * from './transaction/ModifyAccountPropertyAddressTransaction'; -export * from './transaction/ModifyAccountPropertyEntityTypeTransaction'; -export * from './transaction/ModifyAccountPropertyMosaicTransaction'; -export * from './transaction/AccountPropertyModification'; +export * from './transaction/AccountRestrictionTransaction'; +export * from './transaction/AccountAddressRestrictionModificationTransaction'; +export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountMosaicRestrictionModificationTransaction'; +export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; export * from './transaction/AggregateTransaction'; export * from './transaction/AggregateTransactionCosignature'; diff --git a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyAddressTransaction.ts rename to src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index 4cfa610839..cbca21f656 100644 --- a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyAddressTransaction extends Transaction { +export class AccountAddressRestrictionModificationTransaction extends Transaction { /** * Create a modify account property address transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyAddressTransaction { - return new ModifyAccountPropertyAddressTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { + return new AccountAddressRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyAddressTransaction + * @description get the byte size of a AccountAddressRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyAddressTransaction + * @memberof AccountAddressRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts rename to src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts index a49c4873a9..4b84cf9938 100644 --- a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts +++ b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { +export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyEntityTypeTransaction { - return new ModifyAccountPropertyEntityTypeTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { + return new AccountEntityTypeRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyEntityTypeTransaction + * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyEntityTypeTransaction + * @memberof AccountEntityTypeRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts rename to src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 1ec9770ae7..05ad838718 100644 --- a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyMosaicTransaction extends Transaction { +export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** * Create a modify account property mosaic transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyMosaicTransaction { - return new ModifyAccountPropertyMosaicTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { + return new AccountMosaicRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyMosaicTransaction + * @description get the byte size of a AccountMosaicRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyMosaicTransaction + * @memberof AccountMosaicRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountPropertyModification.ts b/src/model/transaction/AccountRestrictionModification.ts similarity index 76% rename from src/model/transaction/AccountPropertyModification.ts rename to src/model/transaction/AccountRestrictionModification.ts index d003dc7fa2..9fbedb9b3c 100644 --- a/src/model/transaction/AccountPropertyModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -19,7 +19,7 @@ import { PropertyModificationType } from '../account/PropertyModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; -export class AccountPropertyModification { +export class AccountRestrictionModification { /** * Constructor @@ -42,32 +42,32 @@ export class AccountPropertyModification { * Create an address filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param address - modification value (Address) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForAddress(modificationType: PropertyModificationType, - address: Address): AccountPropertyModification { - return new AccountPropertyModification(modificationType, address.plain()); + address: Address): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, address.plain()); } /** * Create an mosaic filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param mosaicId - modification value (Mosaic) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForMosaic(modificationType: PropertyModificationType, - mosaicId: MosaicId): AccountPropertyModification { - return new AccountPropertyModification(modificationType, mosaicId.id.toDTO()); + mosaicId: MosaicId): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } /** * Create an entity type filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param entityType - modification value (Transaction Type) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForEntityType(modificationType: PropertyModificationType, - entityType: number): AccountPropertyModification { - return new AccountPropertyModification(modificationType, entityType); + entityType: number): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, entityType); } /** diff --git a/src/model/transaction/AccountPropertyTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts similarity index 70% rename from src/model/transaction/AccountPropertyTransaction.ts rename to src/model/transaction/AccountRestrictionTransaction.ts index a75ac8ff80..f38a2b1a65 100644 --- a/src/model/transaction/AccountPropertyTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -17,14 +17,14 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; -import { ModifyAccountPropertyAddressTransaction } from './ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from './ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from './ModifyAccountPropertyMosaicTransaction'; import { TransactionType } from './TransactionType'; -export class AccountPropertyTransaction { +export class AccountRestrictionTransaction { /** * Create an address modification transaction object * @param deadline - The deadline to include the transaction. @@ -32,19 +32,19 @@ export class AccountPropertyTransaction { * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static createAddressPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyAddressTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountAddressRestrictionModificationTransaction { if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyAddressTransaction.create( + return AccountAddressRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -60,19 +60,19 @@ export class AccountPropertyTransaction { * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyMosaicTransaction} + * @returns {AccountMosaicRestrictionModificationTransaction} */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyMosaicTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountMosaicRestrictionModificationTransaction { if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -88,19 +88,19 @@ export class AccountPropertyTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyEntityTypeTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountEntityTypeRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index c7bc986b01..f4a5424aa1 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -35,8 +35,8 @@ import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; @@ -44,8 +44,8 @@ import { HashType } from '../../../src/model/transaction/HashType'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MessageType } from '../../../src/model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -70,11 +70,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -83,7 +83,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -92,11 +92,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -105,7 +105,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); @@ -114,11 +114,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -127,7 +127,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -599,11 +599,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -611,7 +611,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as ModifyAccountPropertyAddressTransaction; + TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); @@ -620,11 +620,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -632,7 +632,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); @@ -641,11 +641,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -653,7 +653,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index 3c2d1bcdf9..fd6d38d14d 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -31,8 +31,8 @@ import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMos import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -77,11 +77,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -97,11 +97,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -117,11 +117,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 80eb1ff029..5f66adc21f 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -21,14 +21,14 @@ import { PropertyModificationType } from '../../../src/model/account/PropertyMod import { PropertyType } from '../../../src/model/account/PropertyType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import {AccountPropertyTransaction} from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import {AccountRestrictionTransaction} from '../../../src/model/transaction/AccountRestrictionTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {UInt64} from '../../../src/model/UInt64'; import {TestingAccount} from '../../conf/conf.spec'; -describe('AccountPropertyTransaction', () => { +describe('AccountRestrictionTransaction', () => { let account: Account; const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { @@ -36,7 +36,7 @@ describe('AccountPropertyTransaction', () => { }); it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); @@ -46,7 +46,7 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); @@ -57,7 +57,7 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); @@ -66,13 +66,13 @@ describe('AccountPropertyTransaction', () => { }); describe('size', () => { - it('should return 148 for ModifyAccountPropertyAddressTransaction transaction byte size with 1 modification', () => { + it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -82,13 +82,13 @@ describe('AccountPropertyTransaction', () => { expect(addressPropertyTransaction.size).to.be.equal(148); }); - it('should return 131 for ModifyAccountPropertyMosaicTransaction transaction byte size with 1 modification', () => { + it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -97,13 +97,13 @@ describe('AccountPropertyTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for ModifyAccountPropertyEntityTypeTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -115,11 +115,11 @@ describe('AccountPropertyTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -132,11 +132,11 @@ describe('AccountPropertyTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -151,11 +151,11 @@ describe('AccountPropertyTransaction', () => { it('should create address property transaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -174,13 +174,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create address property transaction with wrong type', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); expect(() => { - AccountPropertyTransaction.createAddressPropertyModificationTransaction( + AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [addressPropertyFilter], @@ -193,11 +193,11 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property transaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -216,13 +216,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create mosaic property transaction with wrong type', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); expect(() => { - AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [mosaicPropertyFilter], @@ -235,11 +235,11 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property transaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], From 65eff2cc28ce16cb9678fe5ae43c6a907f465681 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 20:54:15 +0100 Subject: [PATCH 054/208] Renamed accountEntityType to accountOperation --- e2e/infrastructure/TransactionHttp.spec.ts | 4 ++-- .../transaction/CreateTransactionFromDTO.ts | 4 ++-- .../transaction/CreateTransactionFromPayload.ts | 4 ++-- .../transaction/SerializeTransactionToJSON.ts | 6 +++--- src/model/model.ts | 2 +- ...ntOperationRestrictionModificationTransaction.ts} | 12 ++++++------ .../transaction/AccountRestrictionTransaction.ts | 8 ++++---- .../transaction/AccountPropertyTransaction.spec.ts | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename src/model/transaction/{AccountEntityTypeRestrictionModificationTransaction.ts => AccountOperationRestrictionModificationTransaction.ts} (89%) diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8c3d213fba..8321e3784f 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -38,7 +38,7 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 3adc8b71f4..24ec79df98 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -35,7 +35,7 @@ import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountOperationRestrictionModificationTransaction} from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; @@ -293,7 +293,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new AccountEntityTypeRestrictionModificationTransaction( + return new AccountOperationRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 2d6a79adf1..7deb62836c 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -37,7 +37,7 @@ import { LockFundsTransaction } from '../../model/transaction/LockFundsTransacti import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -134,7 +134,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index d379334222..a4d39321b4 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -19,7 +19,7 @@ import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTra import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -78,8 +78,8 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, - modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/model.ts b/src/model/model.ts index 9a1911b91d..66cb725b2f 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -93,7 +93,7 @@ export * from './receipt/Statement'; export * from './transaction/AccountLinkTransaction'; export * from './transaction/AccountRestrictionTransaction'; export * from './transaction/AccountAddressRestrictionModificationTransaction'; -export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountOperationRestrictionModificationTransaction'; export * from './transaction/AccountMosaicRestrictionModificationTransaction'; export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; diff --git a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts similarity index 89% rename from src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts rename to src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4b84cf9938..4c62d32999 100644 --- a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -27,7 +27,7 @@ import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { +export class AccountOperationRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { - return new AccountEntityTypeRestrictionModificationTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { + return new AccountOperationRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -77,9 +77,9 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac /** * @override Transaction.size() - * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction + * @description get the byte size of a AccountOperationRestrictionModificationTransaction * @returns {number} - * @memberof AccountEntityTypeRestrictionModificationTransaction + * @memberof AccountOperationRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index f38a2b1a65..91a4dbaa88 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -18,8 +18,8 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from './AccountOperationRestrictionModificationTransaction'; import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { TransactionType } from './TransactionType'; @@ -88,7 +88,7 @@ export class AccountRestrictionTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, @@ -96,11 +96,11 @@ export class AccountRestrictionTransaction { modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), - ): AccountEntityTypeRestrictionModificationTransaction { + ): AccountOperationRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 5f66adc21f..4c78bdc7e2 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -97,7 +97,7 @@ describe('AccountRestrictionTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, From 07217d491e3013408239d43ead2123a1ade87d8c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 21:40:21 +0100 Subject: [PATCH 055/208] More renames --- e2e/infrastructure/AccountHttp.spec.ts | 16 +++--- e2e/infrastructure/TransactionHttp.spec.ts | 34 +++++------ src/core/utils/DtoMapping.ts | 32 +++++------ src/infrastructure/AccountHttp.ts | 6 +- src/infrastructure/AccountRepository.ts | 6 +- .../transaction/SerializeTransactionToJSON.ts | 6 +- ...countProperty.ts => AccountRestriction.ts} | 14 ++--- ...ntProperties.ts => AccountRestrictions.ts} | 12 ++-- ...tiesInfo.ts => AccountRestrictionsInfo.ts} | 12 ++-- ...Type.ts => RestrictionModificationType.ts} | 4 +- .../{PropertyType.ts => RestrictionType.ts} | 14 ++--- src/model/model.ts | 10 ++-- ...dressRestrictionModificationTransaction.ts | 17 +++--- ...osaicRestrictionModificationTransaction.ts | 17 +++--- ...ationRestrictionModificationTransaction.ts | 17 +++--- .../AccountRestrictionModification.ts | 10 ++-- .../AccountRestrictionTransaction.ts | 32 +++++------ test/core/utils/TransactionMapping.spec.ts | 48 ++++++++-------- .../SerializeTransactionToJSON.spec.ts | 22 ++++---- ...rty.spec.ts => AccountRestriction.spec.ts} | 12 ++-- ...es.spec.ts => AccountRestrictions.spec.ts} | 17 ++++-- ...pec.ts => AccountRestrictionsInfo.spec.ts} | 26 ++++----- .../AccountPropertyTransaction.spec.ts | 56 +++++++++---------- 23 files changed, 221 insertions(+), 219 deletions(-) rename src/model/account/{AccountProperty.ts => AccountRestriction.ts} (71%) rename src/model/account/{AccountProperties.ts => AccountRestrictions.ts} (74%) rename src/model/account/{AccountPropertiesInfo.ts => AccountRestrictionsInfo.ts} (71%) rename src/model/account/{PropertyModificationType.ts => RestrictionModificationType.ts} (88%) rename src/model/account/{PropertyType.ts => RestrictionType.ts} (72%) rename test/model/account/{AccountProperty.spec.ts => AccountRestriction.spec.ts} (71%) rename test/model/account/{AccountProperties.spec.ts => AccountRestrictions.spec.ts} (74%) rename test/model/account/{AccountPropertiesInfo.spec.ts => AccountRestrictionsInfo.spec.ts} (60%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5baaa5dc03..c6eabef382 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -20,8 +20,8 @@ import {AccountHttp} from '../../src/infrastructure/AccountHttp'; import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure'; import { Account } from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; @@ -195,12 +195,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -286,7 +286,7 @@ describe('AccountHttp', () => { it('should call getAccountProperty successfully', (done) => { setTimeout(() => { accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => { - deepEqual(accountProperty.accountProperties.address, accountAddress); + deepEqual(accountProperty.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -297,7 +297,7 @@ describe('AccountHttp', () => { it('should call getAccountProperties successfully', (done) => { setTimeout(() => { accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => { - deepEqual(accountProperties[0]!.accountProperties.address, accountAddress); + deepEqual(accountProperties[0]!.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -421,12 +421,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8321e3784f..9e9ab624b2 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -25,8 +25,8 @@ import {Listener} from '../../src/infrastructure/Listener'; import {TransactionHttp} from '../../src/infrastructure/TransactionHttp'; import {Account} from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; @@ -284,12 +284,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -299,7 +299,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -321,12 +321,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -359,12 +359,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -374,7 +374,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -396,12 +396,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -434,12 +434,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -449,7 +449,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account3.address).subscribe((error) => { @@ -471,12 +471,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 282ecc6029..20b184e8ad 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { AccountProperties } from '../../model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../model/account/AccountProperty'; +import { AccountRestrictions } from '../../model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../model/account/AccountRestriction'; import { Address } from '../../model/account/Address'; -import { PropertyType } from '../../model/account/PropertyType'; +import { RestrictionType } from '../../model/account/RestrictionType'; import { MosaicId } from '../../model/mosaic/MosaicId'; export class DtoMapping { @@ -28,23 +28,23 @@ export class DtoMapping { * @param {object} dataJson The account property json object. * @returns {module: model/Account/AccountPropertiesInfo} The AccountPropertiesInfo class. */ - public static extractAccountPropertyFromDto(accountProperties): AccountPropertiesInfo { - return new AccountPropertiesInfo( + public static extractAccountPropertyFromDto(accountProperties): AccountRestrictionsInfo { + return new AccountRestrictionsInfo( accountProperties.meta, - new AccountProperties(Address.createFromEncoded(accountProperties.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountProperties.accountProperties.address), accountProperties.accountProperties.properties.map((prop) => { switch (prop.propertyType) { - case PropertyType.AllowAddress: - case PropertyType.BlockAddress: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowAddress: + case RestrictionType.BlockAddress: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => Address.createFromEncoded(value))); - case PropertyType.AllowMosaic: - case PropertyType.BlockMosaic: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowMosaic: + case RestrictionType.BlockMosaic: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => new MosaicId(value))); - case PropertyType.AllowTransaction: - case PropertyType.BlockTransaction: - return new AccountProperty(prop.propertyType, prop.values); + case RestrictionType.AllowTransaction: + case RestrictionType.BlockTransaction: + return new AccountRestriction(prop.propertyType, prop.values); default: throw new Error(`Invalid property type: ${prop.propertyType}`); } diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index 7c53b58c7d..a174f27a81 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -19,7 +19,7 @@ import {map, mergeMap} from 'rxjs/operators'; import { DtoMapping } from '../core/utils/DtoMapping'; import {AccountInfo} from '../model/account/AccountInfo'; import { AccountNames } from '../model/account/AccountNames'; -import { AccountPropertiesInfo } from '../model/account/AccountPropertiesInfo'; +import { AccountRestrictionsInfo } from '../model/account/AccountRestrictionsInfo'; import {Address} from '../model/account/Address'; import {MultisigAccountGraphInfo} from '../model/account/MultisigAccountGraphInfo'; import {MultisigAccountInfo} from '../model/account/MultisigAccountInfo'; @@ -97,7 +97,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param publicAccount public account * @returns Observable */ - public getAccountProperties(address: Address): Observable { + public getAccountProperties(address: Address): Observable { return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())) .pipe(map((accountProperties: AccountPropertiesInfoDTO) => { return DtoMapping.extractAccountPropertyFromDto(accountProperties); @@ -109,7 +109,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param address list of addresses * @returns Observable */ - public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { + public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { const accountIds = { addresses: addresses.map((address) => address.plain()), }; diff --git a/src/infrastructure/AccountRepository.ts b/src/infrastructure/AccountRepository.ts index da8d02c988..1fe6fa5e94 100644 --- a/src/infrastructure/AccountRepository.ts +++ b/src/infrastructure/AccountRepository.ts @@ -23,7 +23,7 @@ import {PublicAccount} from '../model/account/PublicAccount'; import {AggregateTransaction} from '../model/transaction/AggregateTransaction'; import {Transaction} from '../model/transaction/Transaction'; import {QueryParams} from './QueryParams'; -import {AccountPropertiesInfo} from "../model/account/AccountPropertiesInfo"; +import {AccountRestrictionsInfo} from "../model/account/AccountRestrictionsInfo"; import { AccountNames } from '../model/account/AccountNames'; /** @@ -60,14 +60,14 @@ export interface AccountRepository { * @param publicAccount public account * @returns Observable */ - getAccountProperties(address: Address): Observable; + getAccountProperties(address: Address): Observable; /** * Gets Account properties. * @param address list of addresses * @returns Observable */ - getAccountPropertiesFromAccounts(addresses: Address[]): Observable; + getAccountPropertiesFromAccounts(addresses: Address[]): Observable; /** * Gets a MultisigAccountInfo for an account. diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index a4d39321b4..9f97dc3f60 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -70,7 +70,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -78,7 +78,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -86,7 +86,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/account/AccountProperty.ts b/src/model/account/AccountRestriction.ts similarity index 71% rename from src/model/account/AccountProperty.ts rename to src/model/account/AccountRestriction.ts index 96774e1b9f..7eb6928f11 100644 --- a/src/model/account/AccountProperty.ts +++ b/src/model/account/AccountRestriction.ts @@ -14,24 +14,24 @@ * limitations under the License. */ -import { PropertyType } from './PropertyType'; +import { RestrictionType } from './RestrictionType'; /** - * Account property structure describes property information. + * Account restriction structure describes restriction information. */ -export class AccountProperty { +export class AccountRestriction { /** * Constructor - * @param propertyType + * @param restrictionType * @param values */ constructor( /** - * Account property type + * Account restriction type */ - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, /** - * Property values. + * Restriction values. */ public readonly values: object[]) { diff --git a/src/model/account/AccountProperties.ts b/src/model/account/AccountRestrictions.ts similarity index 74% rename from src/model/account/AccountProperties.ts rename to src/model/account/AccountRestrictions.ts index 80035e71e8..419f174166 100644 --- a/src/model/account/AccountProperties.ts +++ b/src/model/account/AccountRestrictions.ts @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperty } from './AccountProperty'; +import { AccountRestriction } from './AccountRestriction'; import { Address } from './Address'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountProperties { +export class AccountRestrictions { /** * Constructor * @param address - * @param properties + * @param restrictions */ constructor( /** @@ -31,9 +31,9 @@ export class AccountProperties { */ public readonly address: Address, /** - * Properties. + * Restrictions. */ - public readonly properties: AccountProperty[]) { + public readonly restrictions: AccountRestriction[]) { } } diff --git a/src/model/account/AccountPropertiesInfo.ts b/src/model/account/AccountRestrictionsInfo.ts similarity index 71% rename from src/model/account/AccountPropertiesInfo.ts rename to src/model/account/AccountRestrictionsInfo.ts index b1c3040968..5e6de8a8ba 100644 --- a/src/model/account/AccountPropertiesInfo.ts +++ b/src/model/account/AccountRestrictionsInfo.ts @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperties } from './AccountProperties'; +import { AccountRestrictions } from './AccountRestrictions'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountPropertiesInfo { +export class AccountRestrictionsInfo { /** * Constructor * @param meta - * @param accountProperties + * @param accountRestrictions */ constructor( /** @@ -30,9 +30,9 @@ export class AccountPropertiesInfo { */ public readonly meta: any, /** - * Properties. + * Restrictions. */ - public readonly accountProperties: AccountProperties) { + public readonly accountRestrictions: AccountRestrictions) { } } diff --git a/src/model/account/PropertyModificationType.ts b/src/model/account/RestrictionModificationType.ts similarity index 88% rename from src/model/account/PropertyModificationType.ts rename to src/model/account/RestrictionModificationType.ts index 6ba3b7d9db..b4aabd8151 100644 --- a/src/model/account/PropertyModificationType.ts +++ b/src/model/account/RestrictionModificationType.ts @@ -15,9 +15,9 @@ */ /** - * Account property modification type + * Account restriction modification type */ -export enum PropertyModificationType { +export enum RestrictionModificationType { Add = 0x00, Remove = 0x01, } diff --git a/src/model/account/PropertyType.ts b/src/model/account/RestrictionType.ts similarity index 72% rename from src/model/account/PropertyType.ts rename to src/model/account/RestrictionType.ts index 1b13f72113..aa7d236ed0 100644 --- a/src/model/account/PropertyType.ts +++ b/src/model/account/RestrictionType.ts @@ -15,15 +15,15 @@ */ /** - * Account property type - * 0x01 The property type is an address. - * 0x02 The property type is mosaic id. - * 0x03 The property type is a transaction type. - * 0x04 Property type sentinel. - * 0x80 + type The property is interpreted as a blocking operation. + * Account restriction type + * 0x01 The restriction type is an address. + * 0x02 The restriction type is mosaic id. + * 0x03 The restriction type is a transaction type. + * 0x04 restriction type sentinel. + * 0x80 + type The restriction is interpreted as a blocking operation. */ -export enum PropertyType { +export enum RestrictionType { AllowAddress = 0x01, AllowMosaic = 0x02, AllowTransaction = 0x04, diff --git a/src/model/model.ts b/src/model/model.ts index 66cb725b2f..62bb27f331 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -24,11 +24,11 @@ export * from './account/Address'; export * from './account/MultisigAccountGraphInfo'; export * from './account/MultisigAccountInfo'; export * from './account/PublicAccount'; -export * from './account/AccountProperties'; -export * from './account/AccountPropertiesInfo'; -export * from './account/AccountProperty'; -export * from './account/PropertyModificationType'; -export * from './account/PropertyType'; +export * from './account/AccountRestrictions'; +export * from './account/AccountRestrictionsInfo'; +export * from './account/AccountRestriction'; +export * from './account/RestrictionModificationType'; +export * from './account/RestrictionType'; export * from './account/AccountNames'; // Blockchain diff --git a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index cbca21f656..3d3859b116 100644 --- a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesAddressTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountAddressRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property address transaction object + * Create a modify account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 05ad838718..ea0f25213a 100644 --- a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesMosaicTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property mosaic transaction object + * Create a modify account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4c62d32999..946dd024ed 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountOperationRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property entity type transaction object + * Create a modify account operation restriction type transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountRestrictionModification.ts b/src/model/transaction/AccountRestrictionModification.ts index 9fbedb9b3c..8cbecf298a 100644 --- a/src/model/transaction/AccountRestrictionModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -15,7 +15,7 @@ */ import { Address } from '../account/Address'; -import { PropertyModificationType } from '../account/PropertyModificationType'; +import { RestrictionModificationType } from '../account/RestrictionModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; @@ -30,7 +30,7 @@ export class AccountRestrictionModification { /** * Modification type. */ - public readonly modificationType: PropertyModificationType, + public readonly modificationType: RestrictionModificationType, /** * Modification value (Address, Mosaic or Transaction Type). */ @@ -44,7 +44,7 @@ export class AccountRestrictionModification { * @param address - modification value (Address) * @returns {AccountRestrictionModification} */ - public static createForAddress(modificationType: PropertyModificationType, + public static createForAddress(modificationType: RestrictionModificationType, address: Address): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, address.plain()); } @@ -54,7 +54,7 @@ export class AccountRestrictionModification { * @param mosaicId - modification value (Mosaic) * @returns {AccountRestrictionModification} */ - public static createForMosaic(modificationType: PropertyModificationType, + public static createForMosaic(modificationType: RestrictionModificationType, mosaicId: MosaicId): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } @@ -65,7 +65,7 @@ export class AccountRestrictionModification { * @param entityType - modification value (Transaction Type) * @returns {AccountRestrictionModification} */ - public static createForEntityType(modificationType: PropertyModificationType, + public static createForEntityType(modificationType: RestrictionModificationType, entityType: number): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, entityType); } diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index 91a4dbaa88..e5de1db525 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; @@ -26,9 +26,9 @@ import { TransactionType } from './TransactionType'; export class AccountRestrictionTransaction { /** - * Create an address modification transaction object + * Create an account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -36,17 +36,17 @@ export class AccountRestrictionTransaction { */ public static createAddressPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountAddressRestrictionModificationTransaction { - if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { + if (![RestrictionType.AllowAddress, RestrictionType.BlockAddress].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountAddressRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -54,9 +54,9 @@ export class AccountRestrictionTransaction { } /** - * Create an mosaic modification transaction object + * Create an account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -64,17 +64,17 @@ export class AccountRestrictionTransaction { */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountMosaicRestrictionModificationTransaction { - if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { + if (![RestrictionType.AllowMosaic, RestrictionType.BlockMosaic].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountMosaicRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -82,9 +82,9 @@ export class AccountRestrictionTransaction { } /** - * Create an entity type modification transaction object + * Create an account operation restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account property transaction * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -92,17 +92,17 @@ export class AccountRestrictionTransaction { */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountOperationRestrictionModificationTransaction { - if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { + if (![RestrictionType.AllowTransaction, RestrictionType.BlockTransaction].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountOperationRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index f4a5424aa1..4d2c31247a 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -21,8 +21,8 @@ import {Convert as convert} from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import { EncryptedMessage } from '../../../src/model/model'; @@ -71,12 +71,12 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,20 +85,20 @@ describe('TransactionMapping - createFromPayload', () => { const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -106,21 +106,21 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -128,9 +128,9 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AddressAliasTransaction', () => { @@ -600,12 +600,12 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -614,19 +614,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -635,19 +635,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -656,7 +656,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications.length).to.be.equal(1); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index fd6d38d14d..c2a3ab5b1c 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -19,8 +19,8 @@ import { sha3_256 } from 'js-sha3'; import {Convert as convert} from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import { PublicAccount } from '../../src/model/account/PublicAccount'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -78,12 +78,12 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -91,19 +91,19 @@ describe('SerializeTransactionToJSON', () => { const json = addressPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowAddress); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowAddress); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -111,19 +111,19 @@ describe('SerializeTransactionToJSON', () => { const json = mosaicPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowMosaic); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -131,7 +131,7 @@ describe('SerializeTransactionToJSON', () => { const json = entityTypePropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowTransaction); expect(json.transaction.modifications.length).to.be.equal(1); }); diff --git a/test/model/account/AccountProperty.spec.ts b/test/model/account/AccountRestriction.spec.ts similarity index 71% rename from test/model/account/AccountProperty.spec.ts rename to test/model/account/AccountRestriction.spec.ts index ffa7fa4eb6..4f8481fc0e 100644 --- a/test/model/account/AccountProperty.spec.ts +++ b/test/model/account/AccountRestriction.spec.ts @@ -16,25 +16,25 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { Address } from '../../../src/model/account/Address'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountProperty', () => { it('should createComplete an AccountProperty object', () => { const accountPropertyDTO = { - propertyType: PropertyType.AllowAddress, + propertyType: RestrictionType.AllowAddress, values: ['906415867F121D037AF447E711B0F5E4D52EBBF066D96860EB'], }; - const accountProperty = new AccountProperty( + const accountRestriction = new AccountRestriction( accountPropertyDTO.propertyType, accountPropertyDTO.values.map((value) => { return Address.createFromEncoded(value); }), ); - expect(accountProperty.propertyType).to.be.equal(accountPropertyDTO.propertyType); - deepEqual(accountProperty.values.length, accountPropertyDTO.values.length); + expect(accountRestriction.restrictionType).to.be.equal(accountPropertyDTO.propertyType); + deepEqual(accountRestriction.values.length, accountPropertyDTO.values.length); }); }); diff --git a/test/model/account/AccountProperties.spec.ts b/test/model/account/AccountRestrictions.spec.ts similarity index 74% rename from test/model/account/AccountProperties.spec.ts rename to test/model/account/AccountRestrictions.spec.ts index 0ffbf09aae..5f6d15059c 100644 --- a/test/model/account/AccountProperties.spec.ts +++ b/test/model/account/AccountRestrictions.spec.ts @@ -17,7 +17,7 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; import {Address} from '../../../src/model/account/Address'; -import { AccountProperties, PropertyModificationType, PropertyType } from '../../../src/model/model'; +import { AccountRestrictions, RestrictionModificationType, RestrictionType, AccountRestriction } from '../../../src/model/model'; describe('AccountProperties', () => { @@ -25,19 +25,24 @@ describe('AccountProperties', () => { const accountPropertiesDTO = { address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'), properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }; - const accountProperties = new AccountProperties( + const accountRestrictions = new AccountRestrictions( accountPropertiesDTO.address, - accountPropertiesDTO.properties, + accountPropertiesDTO.properties.map((r) => { + return new AccountRestriction( + r.propertyType, + r.values, + ); + }), ); - expect(accountProperties.address).to.be.equal(accountPropertiesDTO.address); + expect(accountRestrictions.address).to.be.equal(accountPropertiesDTO.address); deepEqual(accountPropertiesDTO.properties.length, accountPropertiesDTO.properties.length); deepEqual(accountPropertiesDTO.properties[0].propertyType, accountPropertiesDTO.properties[0].propertyType); deepEqual(accountPropertiesDTO.properties[0].values.length, accountPropertiesDTO.properties[0].values.length); diff --git a/test/model/account/AccountPropertiesInfo.spec.ts b/test/model/account/AccountRestrictionsInfo.spec.ts similarity index 60% rename from test/model/account/AccountPropertiesInfo.spec.ts rename to test/model/account/AccountRestrictionsInfo.spec.ts index dd6d298986..04d5f6f2fb 100644 --- a/test/model/account/AccountPropertiesInfo.spec.ts +++ b/test/model/account/AccountRestrictionsInfo.spec.ts @@ -15,12 +15,12 @@ */ import {deepEqual} from 'assert'; -import { AccountProperties } from '../../../src/model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../../src/model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestrictions } from '../../../src/model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../../src/model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountPropertiesInfo', () => { @@ -31,27 +31,27 @@ describe('AccountPropertiesInfo', () => { accountProperties: { address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142', properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }, }; - const accountPropertiesInfo = new AccountPropertiesInfo( + const accountPropertiesInfo = new AccountRestrictionsInfo( accountPropertiesInfoDTO.meta, - new AccountProperties(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), accountPropertiesInfoDTO.accountProperties.properties.map((prop) => - new AccountProperty(prop.propertyType, prop.values))), + new AccountRestriction(prop.propertyType, prop.values))), ); deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id); - deepEqual(accountPropertiesInfo.accountProperties.address, + deepEqual(accountPropertiesInfo.accountRestrictions.address, Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address)); - deepEqual(accountPropertiesInfo.accountProperties.properties.length, + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions.length, accountPropertiesInfoDTO.accountProperties.properties.length); - deepEqual(accountPropertiesInfo.accountProperties.properties[0].values[0], + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions[0].values[0], accountPropertiesInfoDTO.accountProperties.properties[0].values[0]); }); }); diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 4c78bdc7e2..de24268e9d 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -17,8 +17,8 @@ import {expect} from 'chai'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; @@ -37,20 +37,20 @@ describe('AccountRestrictionTransaction', () => { it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); - expect(addressPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(addressPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(addressPropertyFilter.value).to.be.equal(address.plain()); }); it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); - expect(mosaicPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(mosaicPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(mosaicPropertyFilter.value[0]).to.be.equal(mosaicId.id.lower); expect(mosaicPropertyFilter.value[1]).to.be.equal(mosaicId.id.higher); }); @@ -58,10 +58,10 @@ describe('AccountRestrictionTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); - expect(entityTypePropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(entityTypePropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(entityTypePropertyFilter.value).to.be.equal(entityType); }); @@ -69,12 +69,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,12 +85,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -100,12 +100,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -116,12 +116,12 @@ describe('AccountRestrictionTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -133,12 +133,12 @@ describe('AccountRestrictionTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, new UInt64([1, 0]), @@ -152,12 +152,12 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -175,14 +175,14 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); expect(() => { AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -194,12 +194,12 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -217,14 +217,14 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); expect(() => { AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -236,12 +236,12 @@ describe('AccountRestrictionTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); From 0551bad0ef7c35c752f0bc569555e4a390df0b35 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 056/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 60b39e0db9..190a6ab28b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -22,6 +22,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -149,6 +150,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 3b64fbe117..b3918dbb25 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,6 +46,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0e809f47fa..18207787ea 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index edf8c18c3c..ccf021275b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From 2102d928a31e254426a28c7f52d34e55ebd380bb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 057/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index b3918dbb25..e0462de449 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -47,16 +47,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 18207787ea..d11908f1f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index ccf021275b..343aef610c 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From 330b2535506125533a74c7bb4631ba8cff580125 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 058/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 190a6ab28b..8fd864d1a8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -158,11 +158,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d11908f1f3..8a0550266b 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From b038c2ef9691b133b528bd2488888d1a3c11fb12 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 059/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 8fd864d1a8..16dacf2170 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -155,14 +155,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From c84837589eae90050a190a0b995f92f4aa2b3d77 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 060/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 16dacf2170..d21b4d1135 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -167,6 +167,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account From 7f74088e687e883f0ad1d1c19b17c7a360b61baf Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 061/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index d21b4d1135..fbc445878d 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -175,11 +175,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 961dfcc9bb0d66c742c4658008cbde5e72f6b14f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 062/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index fbc445878d..be0b053463 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -172,14 +172,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 2f5286d33327e7c1743525fa921503831a51f626 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 063/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 24 ++++--------------- .../transaction/CosignatureTransaction.ts | 6 +++-- .../transaction/AggregateTransaction.spec.ts | 7 +++--- .../CosignatureTransaction.spec.ts | 5 ++-- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index be0b053463..b63db47e02 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -156,30 +156,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e0462de449..a324c15073 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -19,6 +19,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -51,13 +52,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 8a0550266b..0a83b37b05 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 343aef610c..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From d5208d38ea7c7a8e1c71747467531b4faca915a9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 064/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 1 + 2 files changed, 18 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b63db47e02..54b611d0d8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -170,6 +170,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c5f946c07a2fc8c5c7865719498fb7f7778a132c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 065/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 54b611d0d8..f9c6ae2b71 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -178,11 +178,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From cbc51e6ffc85ac9e09d5f26fbe2fb333edfd3d12 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 066/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index f9c6ae2b71..d17f9bd3a6 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -175,14 +175,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 550daef61b35fb411d5242ae0d796f13669304a5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 067/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 11 +++++++---- src/model/transaction/CosignatureTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index d17f9bd3a6..2cdf0b8d89 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -97,7 +97,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -176,13 +176,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } @@ -217,4 +220,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index a324c15073..1eb021e01a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -81,4 +81,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 0a83b37b05..e3aa269d77 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -465,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From a7799523ab4b164e873e1b3d9fdac1ff3a74c0c4 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 068/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 2cdf0b8d89..4ef1dd77b1 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -190,6 +190,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 8a088dc87f30c276f4095fb386d20eef9fa7154a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 069/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 4ef1dd77b1..bd93b7464d 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -198,11 +198,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From eff9e6da3ad8c20822635ff5d52385527e2c7560 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 070/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index bd93b7464d..1bcc4e7e59 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -195,14 +195,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From af82d309c9af733250d2288b95c2dcd31e661097 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 071/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 1bcc4e7e59..9b42989d64 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -196,13 +196,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From a601653cd7847da0886df2d05c82479e993ace07 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 072/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 995ec2859d7fae6b489fea9428299c98ecf61c98 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 073/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 56a9cb1e8f201400de464d1e5a6ffa79f97bc727 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 074/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9b42989d64..ddc0dab557 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -210,6 +210,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 8287e79541345b4416e17e8aaa27ffccff860ebe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 075/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index ddc0dab557..9f0a4cc4b1 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -218,11 +218,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From fa060b19bc4f9ecf90fa4ac7944ab40e04fdf678 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 076/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9f0a4cc4b1..1db56380d3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -215,14 +215,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 8b5ecb5085fa67726042df99c4cd9c4c1844b413 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 077/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 1db56380d3..f7b02c3173 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -216,13 +216,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c3a6a1ae03041eec71dc0474fd7964aabc7a0608 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 078/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From e531026d612166560960895450574de5572535b0 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 079/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From b5c401452b7de9e78517b9ba6f6dd1da2b0481b4 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 080/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From c8fffad59459445a4277aa11e010a28fdf346249 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 081/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 904a7d638d2c8988c993e7dc1c16f2e9793d66fd Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 082/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From e3a798eef42166efdf62972fa134604e6a251d79 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 083/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 1af30045fdb62daae40f68979916739263bba2f3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 084/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index f7b02c3173..b424b4e786 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -230,6 +230,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 56a6708c096165d81c41eba83f1c3b805511c17a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 085/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b424b4e786..34e4c04f00 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -238,11 +238,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 1ccb690e0c92da78fd2be68381b1d73fad1023cc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 086/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 34e4c04f00..c1d46307c4 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -235,14 +235,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 9db55dc7d1e52dd77144ede0d98a82a6cfb52e2e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 087/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index c1d46307c4..a975ce14f5 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -236,13 +236,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 55a406059e49a605cf2325f347f1472ef378558b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 088/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From f5d3f11d644326e3434ece5058d696c61fea1f13 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 089/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 015a85ad799924a1ba88578d5367eed131bcc3ca Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 090/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 7aba5f7b20a33c53e2ad682de8f32c6245a0ef81 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 091/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 13ce53b2a579c7e38a69ef56c25009f5724a6180 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 092/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 2359c3cb745edfa286a87c4e54339eb7b69905b6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 093/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From da85be0852c11c3064d8b65b462a7aff0586e596 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 094/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 92ca1312f7d472095cba5ae775030c1a74d30f36 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 095/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 4e5c52f763e525c1c8dd18daea43559e81050969 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 096/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 9af1a6728dc7843199adc9a56ed9ac5a9072b1f2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 097/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 90ff59d8db78fb5decd2c936d2109ba8ed7a34f3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 098/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 3594551951..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From a5886440965e95ff414e1bc137aa4b8b07488a88 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 099/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..22eeda4a71 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From badc3c7760c882c25aa8efd0ff150e7d0f563dad Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 100/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 22eeda4a71..00ec44af00 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 50810b81f40a7080296b6ee8850c8e9896968917 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 101/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 00ec44af00..3594551951 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From beb76fc0221376e23ef895363162635efcbaf0da Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Wed, 3 Jul 2019 11:59:02 +0100 Subject: [PATCH 102/208] Updated signSchema --- src/model/transaction/AggregateTransaction.ts | 87 ++----------------- 1 file changed, 5 insertions(+), 82 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index a975ce14f5..495ba89fb8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -157,95 +157,18 @@ export class AggregateTransaction extends Transaction { * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @param generationHash - Network generation hash hex + * @param {SignSchema} signSchema The Sign Schema. (KECCAK_REVERSED_KEY / SHA3) * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { + generationHash: string, + signSchema: SignSchema= SignSchema.SHA3) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, cosignatureSignedTransactions, - generationHash); + generationHash, + signSchema); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 5f960610f15c695ea8fdcd38a84b9526fb460d34 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Wed, 3 Jul 2019 12:00:48 +0100 Subject: [PATCH 103/208] fixed merged conflict issue --- src/model/transaction/AggregateTransaction.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 35cbed12b3..495ba89fb8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -173,26 +173,6 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - /** * Check if account has signed transaction * @param publicAccount - Signer public account From f6f598e4f33caaf7195f1c1760e9eadc56f13908 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 10:53:59 +0100 Subject: [PATCH 104/208] Added #192 Updated AccountPropertyTransaction Names --- e2e/infrastructure/AccountHttp.spec.ts | 16 ++--- e2e/infrastructure/TransactionHttp.spec.ts | 52 ++++++++--------- .../transaction/CreateTransactionFromDTO.ts | 20 +++---- .../CreateTransactionFromPayload.ts | 20 +++---- .../transaction/SerializeTransactionToJSON.ts | 18 +++--- src/model/model.ts | 10 ++-- ...ressRestrictionModificationTransaction.ts} | 18 +++--- ...TypeRestrictionModificationTransaction.ts} | 18 +++--- ...saicRestrictionModificationTransaction.ts} | 18 +++--- ...n.ts => AccountRestrictionModification.ts} | 20 +++---- ...on.ts => AccountRestrictionTransaction.ts} | 40 ++++++------- test/core/utils/TransactionMapping.spec.ts | 44 +++++++------- .../SerializeTransactionToJSON.spec.ts | 16 ++--- .../AccountPropertyTransaction.spec.ts | 58 +++++++++---------- 14 files changed, 184 insertions(+), 184 deletions(-) rename src/model/transaction/{ModifyAccountPropertyAddressTransaction.ts => AccountAddressRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyEntityTypeTransaction.ts => AccountEntityTypeRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyMosaicTransaction.ts => AccountMosaicRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{AccountPropertyModification.ts => AccountRestrictionModification.ts} (76%) rename src/model/transaction/{AccountPropertyTransaction.ts => AccountRestrictionTransaction.ts} (70%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5dcf195e29..5baaa5dc03 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -27,8 +27,8 @@ import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -193,12 +193,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -419,12 +419,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index dfd5019b00..8c3d213fba 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -37,9 +37,12 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType'; import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction'; import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction'; @@ -49,9 +52,6 @@ import { HashLockTransaction } from '../../src/model/transaction/HashLockTransac import {HashType} from '../../src/model/transaction/HashType'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../src/model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction'; @@ -272,7 +272,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -283,11 +283,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -295,7 +295,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyAddressTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -310,7 +310,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -320,11 +320,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -347,7 +347,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -358,11 +358,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -370,7 +370,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyMosaicTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -385,7 +385,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -395,11 +395,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Remove, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -422,7 +422,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -433,11 +433,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: ModifyAccountPropertyEntityTypeTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -460,7 +460,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -470,11 +470,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Remove, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index eb6c258a62..3adc8b71f4 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -25,7 +25,7 @@ import {MosaicProperties} from '../../model/mosaic/MosaicProperties'; import { MosaicPropertyType } from '../../model/mosaic/MosaicPropertyType'; import {NamespaceId} from '../../model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification'; +import {AccountRestrictionModification} from '../../model/transaction/AccountRestrictionModification'; import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../model/transaction/AggregateTransaction'; import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature'; @@ -34,9 +34,9 @@ import {Deadline} from '../../model/transaction/Deadline'; import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; -import {ModifyAccountPropertyAddressTransaction} from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import {ModifyAccountPropertyEntityTypeTransaction} from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import {ModifyAccountPropertyMosaicTransaction} from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction'; @@ -277,13 +277,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) { - return new ModifyAccountPropertyAddressTransaction( + return new AccountAddressRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -293,13 +293,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new ModifyAccountPropertyEntityTypeTransaction( + return new AccountEntityTypeRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -309,13 +309,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) { - return new ModifyAccountPropertyMosaicTransaction( + return new AccountMosaicRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index c042e778e7..2d6a79adf1 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -26,7 +26,7 @@ import { MosaicProperties } from '../../model/mosaic/MosaicProperties'; import { NamespaceId } from '../../model/namespace/NamespaceId'; import { NamespaceType } from '../../model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../model/transaction/AccountPropertyModification'; +import { AccountRestrictionModification } from '../../model/transaction/AccountRestrictionModification'; import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { AggregateTransactionCosignature } from '../../model/transaction/AggregateTransactionCosignature'; @@ -36,9 +36,9 @@ import { HashType } from '../../model/transaction/HashType'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -113,10 +113,10 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N switch (type) { case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: - const t = ModifyAccountPropertyAddressTransaction.create( + const t = AccountAddressRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), Address.createFromEncoded(modification.substring(2, modification.length)).plain(), )) : [], @@ -124,20 +124,20 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N ); return t; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), UInt64.fromHex(reverse(modification.substring(2, modification.length))).toDTO(), )) : [], networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), parseInt(convert.uint8ToHex(convert.hexToUint8( modification.substring(2, modification.length)).reverse()), 16), diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index b3245a0ca8..d379334222 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -18,9 +18,9 @@ import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTrans import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -70,24 +70,24 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as ModifyAccountPropertyAddressTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyAddressTransaction). + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as ModifyAccountPropertyEntityTypeTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyEntityTypeTransaction). + propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as ModifyAccountPropertyMosaicTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyMosaicTransaction).modifications.map((modification) => { + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), }; diff --git a/src/model/model.ts b/src/model/model.ts index 47c8471340..9a1911b91d 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -91,11 +91,11 @@ export * from './receipt/Statement'; // Transaction export * from './transaction/AccountLinkTransaction'; -export * from './transaction/AccountPropertyTransaction'; -export * from './transaction/ModifyAccountPropertyAddressTransaction'; -export * from './transaction/ModifyAccountPropertyEntityTypeTransaction'; -export * from './transaction/ModifyAccountPropertyMosaicTransaction'; -export * from './transaction/AccountPropertyModification'; +export * from './transaction/AccountRestrictionTransaction'; +export * from './transaction/AccountAddressRestrictionModificationTransaction'; +export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountMosaicRestrictionModificationTransaction'; +export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; export * from './transaction/AggregateTransaction'; export * from './transaction/AggregateTransactionCosignature'; diff --git a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyAddressTransaction.ts rename to src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index 4cfa610839..cbca21f656 100644 --- a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyAddressTransaction extends Transaction { +export class AccountAddressRestrictionModificationTransaction extends Transaction { /** * Create a modify account property address transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyAddressTransaction { - return new ModifyAccountPropertyAddressTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { + return new AccountAddressRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyAddressTransaction + * @description get the byte size of a AccountAddressRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyAddressTransaction + * @memberof AccountAddressRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts rename to src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts index a49c4873a9..4b84cf9938 100644 --- a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts +++ b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { +export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyEntityTypeTransaction { - return new ModifyAccountPropertyEntityTypeTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { + return new AccountEntityTypeRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyEntityTypeTransaction + * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyEntityTypeTransaction + * @memberof AccountEntityTypeRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts rename to src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 1ec9770ae7..05ad838718 100644 --- a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyMosaicTransaction extends Transaction { +export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** * Create a modify account property mosaic transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyMosaicTransaction { - return new ModifyAccountPropertyMosaicTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { + return new AccountMosaicRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyMosaicTransaction + * @description get the byte size of a AccountMosaicRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyMosaicTransaction + * @memberof AccountMosaicRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountPropertyModification.ts b/src/model/transaction/AccountRestrictionModification.ts similarity index 76% rename from src/model/transaction/AccountPropertyModification.ts rename to src/model/transaction/AccountRestrictionModification.ts index d003dc7fa2..9fbedb9b3c 100644 --- a/src/model/transaction/AccountPropertyModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -19,7 +19,7 @@ import { PropertyModificationType } from '../account/PropertyModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; -export class AccountPropertyModification { +export class AccountRestrictionModification { /** * Constructor @@ -42,32 +42,32 @@ export class AccountPropertyModification { * Create an address filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param address - modification value (Address) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForAddress(modificationType: PropertyModificationType, - address: Address): AccountPropertyModification { - return new AccountPropertyModification(modificationType, address.plain()); + address: Address): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, address.plain()); } /** * Create an mosaic filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param mosaicId - modification value (Mosaic) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForMosaic(modificationType: PropertyModificationType, - mosaicId: MosaicId): AccountPropertyModification { - return new AccountPropertyModification(modificationType, mosaicId.id.toDTO()); + mosaicId: MosaicId): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } /** * Create an entity type filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param entityType - modification value (Transaction Type) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForEntityType(modificationType: PropertyModificationType, - entityType: number): AccountPropertyModification { - return new AccountPropertyModification(modificationType, entityType); + entityType: number): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, entityType); } /** diff --git a/src/model/transaction/AccountPropertyTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts similarity index 70% rename from src/model/transaction/AccountPropertyTransaction.ts rename to src/model/transaction/AccountRestrictionTransaction.ts index a75ac8ff80..f38a2b1a65 100644 --- a/src/model/transaction/AccountPropertyTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -17,14 +17,14 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; -import { ModifyAccountPropertyAddressTransaction } from './ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from './ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from './ModifyAccountPropertyMosaicTransaction'; import { TransactionType } from './TransactionType'; -export class AccountPropertyTransaction { +export class AccountRestrictionTransaction { /** * Create an address modification transaction object * @param deadline - The deadline to include the transaction. @@ -32,19 +32,19 @@ export class AccountPropertyTransaction { * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static createAddressPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyAddressTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountAddressRestrictionModificationTransaction { if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyAddressTransaction.create( + return AccountAddressRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -60,19 +60,19 @@ export class AccountPropertyTransaction { * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyMosaicTransaction} + * @returns {AccountMosaicRestrictionModificationTransaction} */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyMosaicTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountMosaicRestrictionModificationTransaction { if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -88,19 +88,19 @@ export class AccountPropertyTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyEntityTypeTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountEntityTypeRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index c7bc986b01..f4a5424aa1 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -35,8 +35,8 @@ import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; @@ -44,8 +44,8 @@ import { HashType } from '../../../src/model/transaction/HashType'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MessageType } from '../../../src/model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -70,11 +70,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -83,7 +83,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -92,11 +92,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -105,7 +105,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); @@ -114,11 +114,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -127,7 +127,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -599,11 +599,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -611,7 +611,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as ModifyAccountPropertyAddressTransaction; + TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); @@ -620,11 +620,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -632,7 +632,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); @@ -641,11 +641,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -653,7 +653,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index 3c2d1bcdf9..fd6d38d14d 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -31,8 +31,8 @@ import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMos import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -77,11 +77,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -97,11 +97,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -117,11 +117,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 80eb1ff029..5f66adc21f 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -21,14 +21,14 @@ import { PropertyModificationType } from '../../../src/model/account/PropertyMod import { PropertyType } from '../../../src/model/account/PropertyType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import {AccountPropertyTransaction} from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import {AccountRestrictionTransaction} from '../../../src/model/transaction/AccountRestrictionTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {UInt64} from '../../../src/model/UInt64'; import {TestingAccount} from '../../conf/conf.spec'; -describe('AccountPropertyTransaction', () => { +describe('AccountRestrictionTransaction', () => { let account: Account; const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { @@ -36,7 +36,7 @@ describe('AccountPropertyTransaction', () => { }); it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); @@ -46,7 +46,7 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); @@ -57,7 +57,7 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); @@ -66,13 +66,13 @@ describe('AccountPropertyTransaction', () => { }); describe('size', () => { - it('should return 148 for ModifyAccountPropertyAddressTransaction transaction byte size with 1 modification', () => { + it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -82,13 +82,13 @@ describe('AccountPropertyTransaction', () => { expect(addressPropertyTransaction.size).to.be.equal(148); }); - it('should return 131 for ModifyAccountPropertyMosaicTransaction transaction byte size with 1 modification', () => { + it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -97,13 +97,13 @@ describe('AccountPropertyTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for ModifyAccountPropertyEntityTypeTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -115,11 +115,11 @@ describe('AccountPropertyTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -132,11 +132,11 @@ describe('AccountPropertyTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -151,11 +151,11 @@ describe('AccountPropertyTransaction', () => { it('should create address property transaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -174,13 +174,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create address property transaction with wrong type', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); expect(() => { - AccountPropertyTransaction.createAddressPropertyModificationTransaction( + AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [addressPropertyFilter], @@ -193,11 +193,11 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property transaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -216,13 +216,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create mosaic property transaction with wrong type', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); expect(() => { - AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [mosaicPropertyFilter], @@ -235,11 +235,11 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property transaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], From 006d7450b25defc3c7f2604d34dc06523a838420 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 20:54:15 +0100 Subject: [PATCH 105/208] Renamed accountEntityType to accountOperation --- e2e/infrastructure/TransactionHttp.spec.ts | 4 ++-- .../transaction/CreateTransactionFromDTO.ts | 4 ++-- .../transaction/CreateTransactionFromPayload.ts | 4 ++-- .../transaction/SerializeTransactionToJSON.ts | 6 +++--- src/model/model.ts | 2 +- ...ntOperationRestrictionModificationTransaction.ts} | 12 ++++++------ .../transaction/AccountRestrictionTransaction.ts | 8 ++++---- .../transaction/AccountPropertyTransaction.spec.ts | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename src/model/transaction/{AccountEntityTypeRestrictionModificationTransaction.ts => AccountOperationRestrictionModificationTransaction.ts} (89%) diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8c3d213fba..8321e3784f 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -38,7 +38,7 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 3adc8b71f4..24ec79df98 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -35,7 +35,7 @@ import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountOperationRestrictionModificationTransaction} from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; @@ -293,7 +293,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new AccountEntityTypeRestrictionModificationTransaction( + return new AccountOperationRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 2d6a79adf1..7deb62836c 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -37,7 +37,7 @@ import { LockFundsTransaction } from '../../model/transaction/LockFundsTransacti import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -134,7 +134,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index d379334222..a4d39321b4 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -19,7 +19,7 @@ import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTra import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -78,8 +78,8 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, - modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/model.ts b/src/model/model.ts index 9a1911b91d..66cb725b2f 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -93,7 +93,7 @@ export * from './receipt/Statement'; export * from './transaction/AccountLinkTransaction'; export * from './transaction/AccountRestrictionTransaction'; export * from './transaction/AccountAddressRestrictionModificationTransaction'; -export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountOperationRestrictionModificationTransaction'; export * from './transaction/AccountMosaicRestrictionModificationTransaction'; export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; diff --git a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts similarity index 89% rename from src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts rename to src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4b84cf9938..4c62d32999 100644 --- a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -27,7 +27,7 @@ import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { +export class AccountOperationRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { - return new AccountEntityTypeRestrictionModificationTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { + return new AccountOperationRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -77,9 +77,9 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac /** * @override Transaction.size() - * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction + * @description get the byte size of a AccountOperationRestrictionModificationTransaction * @returns {number} - * @memberof AccountEntityTypeRestrictionModificationTransaction + * @memberof AccountOperationRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index f38a2b1a65..91a4dbaa88 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -18,8 +18,8 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from './AccountOperationRestrictionModificationTransaction'; import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { TransactionType } from './TransactionType'; @@ -88,7 +88,7 @@ export class AccountRestrictionTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, @@ -96,11 +96,11 @@ export class AccountRestrictionTransaction { modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), - ): AccountEntityTypeRestrictionModificationTransaction { + ): AccountOperationRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 5f66adc21f..4c78bdc7e2 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -97,7 +97,7 @@ describe('AccountRestrictionTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, From 8a1bfd9cdfe59f361ebfb146ad9a452cb0460cb7 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 21:40:21 +0100 Subject: [PATCH 106/208] More renames --- e2e/infrastructure/AccountHttp.spec.ts | 16 +++--- e2e/infrastructure/TransactionHttp.spec.ts | 34 +++++------ src/core/utils/DtoMapping.ts | 32 +++++------ src/infrastructure/AccountHttp.ts | 6 +- src/infrastructure/AccountRepository.ts | 6 +- .../transaction/SerializeTransactionToJSON.ts | 6 +- ...countProperty.ts => AccountRestriction.ts} | 14 ++--- ...ntProperties.ts => AccountRestrictions.ts} | 12 ++-- ...tiesInfo.ts => AccountRestrictionsInfo.ts} | 12 ++-- ...Type.ts => RestrictionModificationType.ts} | 4 +- .../{PropertyType.ts => RestrictionType.ts} | 14 ++--- src/model/model.ts | 10 ++-- ...dressRestrictionModificationTransaction.ts | 17 +++--- ...osaicRestrictionModificationTransaction.ts | 17 +++--- ...ationRestrictionModificationTransaction.ts | 17 +++--- .../AccountRestrictionModification.ts | 10 ++-- .../AccountRestrictionTransaction.ts | 32 +++++------ test/core/utils/TransactionMapping.spec.ts | 48 ++++++++-------- .../SerializeTransactionToJSON.spec.ts | 22 ++++---- ...rty.spec.ts => AccountRestriction.spec.ts} | 12 ++-- ...es.spec.ts => AccountRestrictions.spec.ts} | 17 ++++-- ...pec.ts => AccountRestrictionsInfo.spec.ts} | 26 ++++----- .../AccountPropertyTransaction.spec.ts | 56 +++++++++---------- 23 files changed, 221 insertions(+), 219 deletions(-) rename src/model/account/{AccountProperty.ts => AccountRestriction.ts} (71%) rename src/model/account/{AccountProperties.ts => AccountRestrictions.ts} (74%) rename src/model/account/{AccountPropertiesInfo.ts => AccountRestrictionsInfo.ts} (71%) rename src/model/account/{PropertyModificationType.ts => RestrictionModificationType.ts} (88%) rename src/model/account/{PropertyType.ts => RestrictionType.ts} (72%) rename test/model/account/{AccountProperty.spec.ts => AccountRestriction.spec.ts} (71%) rename test/model/account/{AccountProperties.spec.ts => AccountRestrictions.spec.ts} (74%) rename test/model/account/{AccountPropertiesInfo.spec.ts => AccountRestrictionsInfo.spec.ts} (60%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5baaa5dc03..c6eabef382 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -20,8 +20,8 @@ import {AccountHttp} from '../../src/infrastructure/AccountHttp'; import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure'; import { Account } from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; @@ -195,12 +195,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -286,7 +286,7 @@ describe('AccountHttp', () => { it('should call getAccountProperty successfully', (done) => { setTimeout(() => { accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => { - deepEqual(accountProperty.accountProperties.address, accountAddress); + deepEqual(accountProperty.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -297,7 +297,7 @@ describe('AccountHttp', () => { it('should call getAccountProperties successfully', (done) => { setTimeout(() => { accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => { - deepEqual(accountProperties[0]!.accountProperties.address, accountAddress); + deepEqual(accountProperties[0]!.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -421,12 +421,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8321e3784f..9e9ab624b2 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -25,8 +25,8 @@ import {Listener} from '../../src/infrastructure/Listener'; import {TransactionHttp} from '../../src/infrastructure/TransactionHttp'; import {Account} from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; @@ -284,12 +284,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -299,7 +299,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -321,12 +321,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -359,12 +359,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -374,7 +374,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -396,12 +396,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -434,12 +434,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -449,7 +449,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account3.address).subscribe((error) => { @@ -471,12 +471,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 282ecc6029..20b184e8ad 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { AccountProperties } from '../../model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../model/account/AccountProperty'; +import { AccountRestrictions } from '../../model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../model/account/AccountRestriction'; import { Address } from '../../model/account/Address'; -import { PropertyType } from '../../model/account/PropertyType'; +import { RestrictionType } from '../../model/account/RestrictionType'; import { MosaicId } from '../../model/mosaic/MosaicId'; export class DtoMapping { @@ -28,23 +28,23 @@ export class DtoMapping { * @param {object} dataJson The account property json object. * @returns {module: model/Account/AccountPropertiesInfo} The AccountPropertiesInfo class. */ - public static extractAccountPropertyFromDto(accountProperties): AccountPropertiesInfo { - return new AccountPropertiesInfo( + public static extractAccountPropertyFromDto(accountProperties): AccountRestrictionsInfo { + return new AccountRestrictionsInfo( accountProperties.meta, - new AccountProperties(Address.createFromEncoded(accountProperties.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountProperties.accountProperties.address), accountProperties.accountProperties.properties.map((prop) => { switch (prop.propertyType) { - case PropertyType.AllowAddress: - case PropertyType.BlockAddress: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowAddress: + case RestrictionType.BlockAddress: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => Address.createFromEncoded(value))); - case PropertyType.AllowMosaic: - case PropertyType.BlockMosaic: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowMosaic: + case RestrictionType.BlockMosaic: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => new MosaicId(value))); - case PropertyType.AllowTransaction: - case PropertyType.BlockTransaction: - return new AccountProperty(prop.propertyType, prop.values); + case RestrictionType.AllowTransaction: + case RestrictionType.BlockTransaction: + return new AccountRestriction(prop.propertyType, prop.values); default: throw new Error(`Invalid property type: ${prop.propertyType}`); } diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index 7c53b58c7d..a174f27a81 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -19,7 +19,7 @@ import {map, mergeMap} from 'rxjs/operators'; import { DtoMapping } from '../core/utils/DtoMapping'; import {AccountInfo} from '../model/account/AccountInfo'; import { AccountNames } from '../model/account/AccountNames'; -import { AccountPropertiesInfo } from '../model/account/AccountPropertiesInfo'; +import { AccountRestrictionsInfo } from '../model/account/AccountRestrictionsInfo'; import {Address} from '../model/account/Address'; import {MultisigAccountGraphInfo} from '../model/account/MultisigAccountGraphInfo'; import {MultisigAccountInfo} from '../model/account/MultisigAccountInfo'; @@ -97,7 +97,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param publicAccount public account * @returns Observable */ - public getAccountProperties(address: Address): Observable { + public getAccountProperties(address: Address): Observable { return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())) .pipe(map((accountProperties: AccountPropertiesInfoDTO) => { return DtoMapping.extractAccountPropertyFromDto(accountProperties); @@ -109,7 +109,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param address list of addresses * @returns Observable */ - public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { + public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { const accountIds = { addresses: addresses.map((address) => address.plain()), }; diff --git a/src/infrastructure/AccountRepository.ts b/src/infrastructure/AccountRepository.ts index da8d02c988..1fe6fa5e94 100644 --- a/src/infrastructure/AccountRepository.ts +++ b/src/infrastructure/AccountRepository.ts @@ -23,7 +23,7 @@ import {PublicAccount} from '../model/account/PublicAccount'; import {AggregateTransaction} from '../model/transaction/AggregateTransaction'; import {Transaction} from '../model/transaction/Transaction'; import {QueryParams} from './QueryParams'; -import {AccountPropertiesInfo} from "../model/account/AccountPropertiesInfo"; +import {AccountRestrictionsInfo} from "../model/account/AccountRestrictionsInfo"; import { AccountNames } from '../model/account/AccountNames'; /** @@ -60,14 +60,14 @@ export interface AccountRepository { * @param publicAccount public account * @returns Observable */ - getAccountProperties(address: Address): Observable; + getAccountProperties(address: Address): Observable; /** * Gets Account properties. * @param address list of addresses * @returns Observable */ - getAccountPropertiesFromAccounts(addresses: Address[]): Observable; + getAccountPropertiesFromAccounts(addresses: Address[]): Observable; /** * Gets a MultisigAccountInfo for an account. diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index a4d39321b4..9f97dc3f60 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -70,7 +70,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -78,7 +78,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -86,7 +86,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/account/AccountProperty.ts b/src/model/account/AccountRestriction.ts similarity index 71% rename from src/model/account/AccountProperty.ts rename to src/model/account/AccountRestriction.ts index 96774e1b9f..7eb6928f11 100644 --- a/src/model/account/AccountProperty.ts +++ b/src/model/account/AccountRestriction.ts @@ -14,24 +14,24 @@ * limitations under the License. */ -import { PropertyType } from './PropertyType'; +import { RestrictionType } from './RestrictionType'; /** - * Account property structure describes property information. + * Account restriction structure describes restriction information. */ -export class AccountProperty { +export class AccountRestriction { /** * Constructor - * @param propertyType + * @param restrictionType * @param values */ constructor( /** - * Account property type + * Account restriction type */ - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, /** - * Property values. + * Restriction values. */ public readonly values: object[]) { diff --git a/src/model/account/AccountProperties.ts b/src/model/account/AccountRestrictions.ts similarity index 74% rename from src/model/account/AccountProperties.ts rename to src/model/account/AccountRestrictions.ts index 80035e71e8..419f174166 100644 --- a/src/model/account/AccountProperties.ts +++ b/src/model/account/AccountRestrictions.ts @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperty } from './AccountProperty'; +import { AccountRestriction } from './AccountRestriction'; import { Address } from './Address'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountProperties { +export class AccountRestrictions { /** * Constructor * @param address - * @param properties + * @param restrictions */ constructor( /** @@ -31,9 +31,9 @@ export class AccountProperties { */ public readonly address: Address, /** - * Properties. + * Restrictions. */ - public readonly properties: AccountProperty[]) { + public readonly restrictions: AccountRestriction[]) { } } diff --git a/src/model/account/AccountPropertiesInfo.ts b/src/model/account/AccountRestrictionsInfo.ts similarity index 71% rename from src/model/account/AccountPropertiesInfo.ts rename to src/model/account/AccountRestrictionsInfo.ts index b1c3040968..5e6de8a8ba 100644 --- a/src/model/account/AccountPropertiesInfo.ts +++ b/src/model/account/AccountRestrictionsInfo.ts @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperties } from './AccountProperties'; +import { AccountRestrictions } from './AccountRestrictions'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountPropertiesInfo { +export class AccountRestrictionsInfo { /** * Constructor * @param meta - * @param accountProperties + * @param accountRestrictions */ constructor( /** @@ -30,9 +30,9 @@ export class AccountPropertiesInfo { */ public readonly meta: any, /** - * Properties. + * Restrictions. */ - public readonly accountProperties: AccountProperties) { + public readonly accountRestrictions: AccountRestrictions) { } } diff --git a/src/model/account/PropertyModificationType.ts b/src/model/account/RestrictionModificationType.ts similarity index 88% rename from src/model/account/PropertyModificationType.ts rename to src/model/account/RestrictionModificationType.ts index 6ba3b7d9db..b4aabd8151 100644 --- a/src/model/account/PropertyModificationType.ts +++ b/src/model/account/RestrictionModificationType.ts @@ -15,9 +15,9 @@ */ /** - * Account property modification type + * Account restriction modification type */ -export enum PropertyModificationType { +export enum RestrictionModificationType { Add = 0x00, Remove = 0x01, } diff --git a/src/model/account/PropertyType.ts b/src/model/account/RestrictionType.ts similarity index 72% rename from src/model/account/PropertyType.ts rename to src/model/account/RestrictionType.ts index 1b13f72113..aa7d236ed0 100644 --- a/src/model/account/PropertyType.ts +++ b/src/model/account/RestrictionType.ts @@ -15,15 +15,15 @@ */ /** - * Account property type - * 0x01 The property type is an address. - * 0x02 The property type is mosaic id. - * 0x03 The property type is a transaction type. - * 0x04 Property type sentinel. - * 0x80 + type The property is interpreted as a blocking operation. + * Account restriction type + * 0x01 The restriction type is an address. + * 0x02 The restriction type is mosaic id. + * 0x03 The restriction type is a transaction type. + * 0x04 restriction type sentinel. + * 0x80 + type The restriction is interpreted as a blocking operation. */ -export enum PropertyType { +export enum RestrictionType { AllowAddress = 0x01, AllowMosaic = 0x02, AllowTransaction = 0x04, diff --git a/src/model/model.ts b/src/model/model.ts index 66cb725b2f..62bb27f331 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -24,11 +24,11 @@ export * from './account/Address'; export * from './account/MultisigAccountGraphInfo'; export * from './account/MultisigAccountInfo'; export * from './account/PublicAccount'; -export * from './account/AccountProperties'; -export * from './account/AccountPropertiesInfo'; -export * from './account/AccountProperty'; -export * from './account/PropertyModificationType'; -export * from './account/PropertyType'; +export * from './account/AccountRestrictions'; +export * from './account/AccountRestrictionsInfo'; +export * from './account/AccountRestriction'; +export * from './account/RestrictionModificationType'; +export * from './account/RestrictionType'; export * from './account/AccountNames'; // Blockchain diff --git a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index cbca21f656..3d3859b116 100644 --- a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesAddressTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountAddressRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property address transaction object + * Create a modify account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 05ad838718..ea0f25213a 100644 --- a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesMosaicTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property mosaic transaction object + * Create a modify account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4c62d32999..946dd024ed 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountOperationRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property entity type transaction object + * Create a modify account operation restriction type transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountRestrictionModification.ts b/src/model/transaction/AccountRestrictionModification.ts index 9fbedb9b3c..8cbecf298a 100644 --- a/src/model/transaction/AccountRestrictionModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -15,7 +15,7 @@ */ import { Address } from '../account/Address'; -import { PropertyModificationType } from '../account/PropertyModificationType'; +import { RestrictionModificationType } from '../account/RestrictionModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; @@ -30,7 +30,7 @@ export class AccountRestrictionModification { /** * Modification type. */ - public readonly modificationType: PropertyModificationType, + public readonly modificationType: RestrictionModificationType, /** * Modification value (Address, Mosaic or Transaction Type). */ @@ -44,7 +44,7 @@ export class AccountRestrictionModification { * @param address - modification value (Address) * @returns {AccountRestrictionModification} */ - public static createForAddress(modificationType: PropertyModificationType, + public static createForAddress(modificationType: RestrictionModificationType, address: Address): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, address.plain()); } @@ -54,7 +54,7 @@ export class AccountRestrictionModification { * @param mosaicId - modification value (Mosaic) * @returns {AccountRestrictionModification} */ - public static createForMosaic(modificationType: PropertyModificationType, + public static createForMosaic(modificationType: RestrictionModificationType, mosaicId: MosaicId): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } @@ -65,7 +65,7 @@ export class AccountRestrictionModification { * @param entityType - modification value (Transaction Type) * @returns {AccountRestrictionModification} */ - public static createForEntityType(modificationType: PropertyModificationType, + public static createForEntityType(modificationType: RestrictionModificationType, entityType: number): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, entityType); } diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index 91a4dbaa88..e5de1db525 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; @@ -26,9 +26,9 @@ import { TransactionType } from './TransactionType'; export class AccountRestrictionTransaction { /** - * Create an address modification transaction object + * Create an account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -36,17 +36,17 @@ export class AccountRestrictionTransaction { */ public static createAddressPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountAddressRestrictionModificationTransaction { - if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { + if (![RestrictionType.AllowAddress, RestrictionType.BlockAddress].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountAddressRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -54,9 +54,9 @@ export class AccountRestrictionTransaction { } /** - * Create an mosaic modification transaction object + * Create an account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -64,17 +64,17 @@ export class AccountRestrictionTransaction { */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountMosaicRestrictionModificationTransaction { - if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { + if (![RestrictionType.AllowMosaic, RestrictionType.BlockMosaic].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountMosaicRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -82,9 +82,9 @@ export class AccountRestrictionTransaction { } /** - * Create an entity type modification transaction object + * Create an account operation restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account property transaction * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -92,17 +92,17 @@ export class AccountRestrictionTransaction { */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountOperationRestrictionModificationTransaction { - if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { + if (![RestrictionType.AllowTransaction, RestrictionType.BlockTransaction].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountOperationRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index f4a5424aa1..4d2c31247a 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -21,8 +21,8 @@ import {Convert as convert} from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import { EncryptedMessage } from '../../../src/model/model'; @@ -71,12 +71,12 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,20 +85,20 @@ describe('TransactionMapping - createFromPayload', () => { const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -106,21 +106,21 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -128,9 +128,9 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AddressAliasTransaction', () => { @@ -600,12 +600,12 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -614,19 +614,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -635,19 +635,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -656,7 +656,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications.length).to.be.equal(1); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index fd6d38d14d..c2a3ab5b1c 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -19,8 +19,8 @@ import { sha3_256 } from 'js-sha3'; import {Convert as convert} from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import { PublicAccount } from '../../src/model/account/PublicAccount'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -78,12 +78,12 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -91,19 +91,19 @@ describe('SerializeTransactionToJSON', () => { const json = addressPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowAddress); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowAddress); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -111,19 +111,19 @@ describe('SerializeTransactionToJSON', () => { const json = mosaicPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowMosaic); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -131,7 +131,7 @@ describe('SerializeTransactionToJSON', () => { const json = entityTypePropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowTransaction); expect(json.transaction.modifications.length).to.be.equal(1); }); diff --git a/test/model/account/AccountProperty.spec.ts b/test/model/account/AccountRestriction.spec.ts similarity index 71% rename from test/model/account/AccountProperty.spec.ts rename to test/model/account/AccountRestriction.spec.ts index ffa7fa4eb6..4f8481fc0e 100644 --- a/test/model/account/AccountProperty.spec.ts +++ b/test/model/account/AccountRestriction.spec.ts @@ -16,25 +16,25 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { Address } from '../../../src/model/account/Address'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountProperty', () => { it('should createComplete an AccountProperty object', () => { const accountPropertyDTO = { - propertyType: PropertyType.AllowAddress, + propertyType: RestrictionType.AllowAddress, values: ['906415867F121D037AF447E711B0F5E4D52EBBF066D96860EB'], }; - const accountProperty = new AccountProperty( + const accountRestriction = new AccountRestriction( accountPropertyDTO.propertyType, accountPropertyDTO.values.map((value) => { return Address.createFromEncoded(value); }), ); - expect(accountProperty.propertyType).to.be.equal(accountPropertyDTO.propertyType); - deepEqual(accountProperty.values.length, accountPropertyDTO.values.length); + expect(accountRestriction.restrictionType).to.be.equal(accountPropertyDTO.propertyType); + deepEqual(accountRestriction.values.length, accountPropertyDTO.values.length); }); }); diff --git a/test/model/account/AccountProperties.spec.ts b/test/model/account/AccountRestrictions.spec.ts similarity index 74% rename from test/model/account/AccountProperties.spec.ts rename to test/model/account/AccountRestrictions.spec.ts index 0ffbf09aae..5f6d15059c 100644 --- a/test/model/account/AccountProperties.spec.ts +++ b/test/model/account/AccountRestrictions.spec.ts @@ -17,7 +17,7 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; import {Address} from '../../../src/model/account/Address'; -import { AccountProperties, PropertyModificationType, PropertyType } from '../../../src/model/model'; +import { AccountRestrictions, RestrictionModificationType, RestrictionType, AccountRestriction } from '../../../src/model/model'; describe('AccountProperties', () => { @@ -25,19 +25,24 @@ describe('AccountProperties', () => { const accountPropertiesDTO = { address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'), properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }; - const accountProperties = new AccountProperties( + const accountRestrictions = new AccountRestrictions( accountPropertiesDTO.address, - accountPropertiesDTO.properties, + accountPropertiesDTO.properties.map((r) => { + return new AccountRestriction( + r.propertyType, + r.values, + ); + }), ); - expect(accountProperties.address).to.be.equal(accountPropertiesDTO.address); + expect(accountRestrictions.address).to.be.equal(accountPropertiesDTO.address); deepEqual(accountPropertiesDTO.properties.length, accountPropertiesDTO.properties.length); deepEqual(accountPropertiesDTO.properties[0].propertyType, accountPropertiesDTO.properties[0].propertyType); deepEqual(accountPropertiesDTO.properties[0].values.length, accountPropertiesDTO.properties[0].values.length); diff --git a/test/model/account/AccountPropertiesInfo.spec.ts b/test/model/account/AccountRestrictionsInfo.spec.ts similarity index 60% rename from test/model/account/AccountPropertiesInfo.spec.ts rename to test/model/account/AccountRestrictionsInfo.spec.ts index dd6d298986..04d5f6f2fb 100644 --- a/test/model/account/AccountPropertiesInfo.spec.ts +++ b/test/model/account/AccountRestrictionsInfo.spec.ts @@ -15,12 +15,12 @@ */ import {deepEqual} from 'assert'; -import { AccountProperties } from '../../../src/model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../../src/model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestrictions } from '../../../src/model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../../src/model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountPropertiesInfo', () => { @@ -31,27 +31,27 @@ describe('AccountPropertiesInfo', () => { accountProperties: { address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142', properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }, }; - const accountPropertiesInfo = new AccountPropertiesInfo( + const accountPropertiesInfo = new AccountRestrictionsInfo( accountPropertiesInfoDTO.meta, - new AccountProperties(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), accountPropertiesInfoDTO.accountProperties.properties.map((prop) => - new AccountProperty(prop.propertyType, prop.values))), + new AccountRestriction(prop.propertyType, prop.values))), ); deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id); - deepEqual(accountPropertiesInfo.accountProperties.address, + deepEqual(accountPropertiesInfo.accountRestrictions.address, Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address)); - deepEqual(accountPropertiesInfo.accountProperties.properties.length, + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions.length, accountPropertiesInfoDTO.accountProperties.properties.length); - deepEqual(accountPropertiesInfo.accountProperties.properties[0].values[0], + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions[0].values[0], accountPropertiesInfoDTO.accountProperties.properties[0].values[0]); }); }); diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 4c78bdc7e2..de24268e9d 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -17,8 +17,8 @@ import {expect} from 'chai'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; @@ -37,20 +37,20 @@ describe('AccountRestrictionTransaction', () => { it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); - expect(addressPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(addressPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(addressPropertyFilter.value).to.be.equal(address.plain()); }); it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); - expect(mosaicPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(mosaicPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(mosaicPropertyFilter.value[0]).to.be.equal(mosaicId.id.lower); expect(mosaicPropertyFilter.value[1]).to.be.equal(mosaicId.id.higher); }); @@ -58,10 +58,10 @@ describe('AccountRestrictionTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); - expect(entityTypePropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(entityTypePropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(entityTypePropertyFilter.value).to.be.equal(entityType); }); @@ -69,12 +69,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,12 +85,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -100,12 +100,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -116,12 +116,12 @@ describe('AccountRestrictionTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -133,12 +133,12 @@ describe('AccountRestrictionTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, new UInt64([1, 0]), @@ -152,12 +152,12 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -175,14 +175,14 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); expect(() => { AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -194,12 +194,12 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -217,14 +217,14 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); expect(() => { AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -236,12 +236,12 @@ describe('AccountRestrictionTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); From 6a0c7c00ad992ef633cbd5b545cf08c6e59d4df6 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 107/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 18 +++++ .../transaction/CosignatureTransaction.ts | 18 +++++ .../transaction/AggregateTransaction.spec.ts | 68 ++++++++++++++++++- .../CosignatureTransaction.spec.ts | 21 ++++++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 60b39e0db9..190a6ab28b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -22,6 +22,7 @@ import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AggregateTransactionCosignature } from './AggregateTransactionCosignature'; +import { CosignatureSignedTransaction } from './CosignatureSignedTransaction'; import { Deadline } from './Deadline'; import { InnerTransaction } from './InnerTransaction'; import { SignedTransaction } from './SignedTransaction'; @@ -149,6 +150,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index 3b64fbe117..b3918dbb25 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -46,6 +46,24 @@ export class CosignatureTransaction { return new CosignatureTransaction(transactionToCosign); } + /** + * Co-sign transaction with transaction hash (off chain) + * Creating a new CosignatureSignedTransaction + * @param account - The signing account + * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @returns {CosignatureSignedTransaction} + */ + public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + /** + * For aggregated complete transaction, cosignatories are gathered off chain announced. + */ + const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); + const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); + return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, + signedTransactionRaw.signature, + signedTransactionRaw.signer); + } + /** * @internal * Serialize and sign transaction creating a new SignedTransaction diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 3290fcdc24..fefd06f8f3 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,6 +16,8 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; +import { VerifiableTransaction } from 'nem2-library'; +import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; @@ -27,6 +29,8 @@ import {MosaicProperties} from '../../../src/model/mosaic/MosaicProperties'; import {MosaicSupplyType} from '../../../src/model/mosaic/MosaicSupplyType'; import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrencyMosaic'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; +import { CosignatureSignedTransaction } from '../../../src/model/transaction/CosignatureSignedTransaction'; +import { CosignatureTransaction } from '../../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import {ModifyMultisigAccountTransaction} from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import {MosaicDefinitionTransaction} from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -35,6 +39,7 @@ import {MultisigCosignatoryModification} from '../../../src/model/transaction/Mu import {MultisigCosignatoryModificationType} from '../../../src/model/transaction/MultisigCosignatoryModificationType'; import {PlainMessage} from '../../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../../src/model/transaction/RegisterNamespaceTransaction'; +import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../../src/model/transaction/TransferTransaction'; import {UInt64} from '../../../src/model/UInt64'; import {Cosignatory2Account, CosignatoryAccount, MultisigAccount, TestingAccount} from '../../conf/conf.spec'; @@ -80,7 +85,7 @@ describe('AggregateTransaction', () => { [transferTransaction.toAggregate(account.publicAccount)], NetworkType.MIJIN_TEST, [], - new UInt64([1, 0]) + new UInt64([1, 0]), ); expect(aggregateTransaction.maxFee.higher).to.be.equal(0); @@ -382,6 +387,67 @@ describe('AggregateTransaction', () => { }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); }); + it('Should create signed transaction with cosignatories - Aggregated Complete', () => { + /** + * https://github.com/nemtech/nem2-sdk-typescript-javascript/issues/112 + */ + const accountAlice = TestingAccount; + const accountBob = CosignatoryAccount; + const accountCarol = Cosignatory2Account; + + const AtoBTx = TransferTransaction.create(Deadline.create(), + accountBob.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST); + const BtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('b to a'), + NetworkType.MIJIN_TEST); + const CtoATx = TransferTransaction.create(Deadline.create(), + accountAlice.address, + [], + PlainMessage.create('c to a'), + NetworkType.MIJIN_TEST); + + // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + const aggregateTransactionPayload = AggregateTransaction.createComplete( + Deadline.create(), + [ + AtoBTx.toAggregate(accountAlice.publicAccount), + BtoATx.toAggregate(accountBob.publicAccount), + CtoATx.toAggregate(accountCarol.publicAccount)], + NetworkType.MIJIN_TEST, + [], + ).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); + + // 02.1 Bob cosigns the tx and sends it back to Alice + const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + + // 02.2 Carol cosigns the tx and sends it back to Alice + const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + + // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction + + // First Alice need to append cosignatories to current transaction. + const cosignatureSignedTransactions = [ + new CosignatureSignedTransaction(signedTxBob.parentHash, signedTxBob.signature, signedTxBob.signer), + new CosignatureSignedTransaction(signedTxCarol.parentHash, signedTxCarol.signature, signedTxCarol.signer), + ]; + + const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; + + const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + + expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); + expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); + expect(signedTransaction.payload.indexOf(accountBob.publicKey) > -1).to.be.true; + expect(signedTransaction.payload.indexOf(accountCarol.publicKey) > -1).to.be.true; + }); + describe('size', () => { it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => { const transaction = TransferTransaction.create( diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 7c9a270780..4a0fa087d7 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,10 +15,15 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; +import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction'; import {CosignatureTransaction} from '../../../src/model/transaction/CosignatureTransaction'; +import { Deadline } from '../../../src/model/transaction/Deadline'; +import { PlainMessage } from '../../../src/model/transaction/PlainMessage'; +import { TransferTransaction } from '../../../src/model/transaction/TransferTransaction'; import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { @@ -112,4 +117,20 @@ describe('CosignatureTransaction', () => { '93D2F8522C8DEAC74BEFBCB61AF6414ADF27B2176D6A24FEF612AA6DB2F562176A11C46BA6D5E05430042CB5705'); expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); + + it('should sign a transaction with transaction hash', () => { + const txPayload = TransferTransaction.create(Deadline.create(), + account.address, + [], + PlainMessage.create('a to b'), + NetworkType.MIJIN_TEST).serialize(); + + const txHash = VerifiableTransaction.createTransactionHash(txPayload); + + const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); + + expect(signedTx.parentHash).to.be.equal(txHash); + expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); + expect(signedTx.signer).to.be.equal(account.publicKey); + }); }); From bbecc4042c89a110a9863578a2e06eed745d5352 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Fri, 26 Apr 2019 17:38:24 +0100 Subject: [PATCH 108/208] Changed to sign cosign transaction to use payload instead of hash --- src/model/transaction/CosignatureTransaction.ts | 7 ++++--- test/model/transaction/AggregateTransaction.spec.ts | 8 +++----- test/model/transaction/CosignatureTransaction.spec.ts | 7 ++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index b3918dbb25..e0462de449 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -47,16 +47,17 @@ export class CosignatureTransaction { } /** - * Co-sign transaction with transaction hash (off chain) + * Co-sign transaction with transaction payload (off chain) * Creating a new CosignatureSignedTransaction * @param account - The signing account - * @param transactionHash - off transaction hash (aggregated transaction is unannounced) + * @param payload - off transaction payload (aggregated transaction is unannounced) * @returns {CosignatureSignedTransaction} */ - public static signTransactionHashWith(account: Account, transactionHash: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ + const transactionHash = VerifiableTransaction.createTransactionHash(payload); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index fefd06f8f3..ab2069e1ff 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -411,7 +411,7 @@ describe('AggregateTransaction', () => { PlainMessage.create('c to a'), NetworkType.MIJIN_TEST); - // 01. Alice creates the aggregated tx and serialize it, and generate the hash. Then send to Bob & Carol + // 01. Alice creates the aggregated tx and serialize it, Then payload send to Bob & Carol const aggregateTransactionPayload = AggregateTransaction.createComplete( Deadline.create(), [ @@ -422,13 +422,11 @@ describe('AggregateTransaction', () => { [], ).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(aggregateTransactionPayload); - // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionHashWith(accountBob, txHash); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionHashWith(accountCarol, txHash); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 4a0fa087d7..81396da68a 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -118,18 +118,15 @@ describe('CosignatureTransaction', () => { expect(cosignatureSignedTransaction.signer).to.be.equal(account.publicKey); }); - it('should sign a transaction with transaction hash', () => { + it('should sign a transaction with transaction payload', () => { const txPayload = TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const txHash = VerifiableTransaction.createTransactionHash(txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); - const signedTx = CosignatureTransaction.signTransactionHashWith(account, txHash); - - expect(signedTx.parentHash).to.be.equal(txHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); From f83eee34d1760d65d285db12f745a4b11c9dffee Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 109/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- test/model/transaction/AggregateTransaction.spec.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 190a6ab28b..8fd864d1a8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -158,11 +158,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index ab2069e1ff..6a6773f8f9 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -438,7 +438,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionWithCosignedTransactions(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); From b2bfd67c6ef49a8a60ba8052f8e73d6b59c86971 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 110/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 8fd864d1a8..16dacf2170 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -155,14 +155,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 964ec0401e6c4c2614e0934365a340ae481eca3a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 111/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 16dacf2170..d21b4d1135 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -167,6 +167,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account From 83c9c5a2a02f20bc7320c666497d73ac325b9b6b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 112/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index d21b4d1135..fbc445878d 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -175,11 +175,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From d3813da58799c6cb368f7c99ed58170bd5d34bd1 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 113/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index fbc445878d..be0b053463 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -172,14 +172,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 3ea0c9185552339095e44f766fef0c607374bf8c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 114/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 24 ++++--------------- .../transaction/CosignatureTransaction.ts | 6 +++-- .../transaction/AggregateTransaction.spec.ts | 7 +++--- .../CosignatureTransaction.spec.ts | 5 ++-- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index be0b053463..b63db47e02 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -156,30 +156,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index e0462de449..a324c15073 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -19,6 +19,7 @@ import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../inf import {Account} from '../account/Account'; import {AggregateTransaction} from './AggregateTransaction'; import {CosignatureSignedTransaction} from './CosignatureSignedTransaction'; +import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction'; /** * Cosignature transaction is used to sign an aggregate transactions with missing cosignatures. @@ -51,13 +52,14 @@ export class CosignatureTransaction { * Creating a new CosignatureSignedTransaction * @param account - The signing account * @param payload - off transaction payload (aggregated transaction is unannounced) + * @param gernationHash - Network generation hash * @returns {CosignatureSignedTransaction} */ - public static signTransactionPayload(account: Account, payload: string): CosignatureSignedTransaction { + public static signTransactionPayload(account: Account, payload: string, gernationHash: string): CosignatureSignedTransaction { /** * For aggregated complete transaction, cosignatories are gathered off chain announced. */ - const transactionHash = VerifiableTransaction.createTransactionHash(payload); + const transactionHash = VerifiableTransaction.createTransactionHash(payload, gernationHash); const aggregateSignatureTransaction = new CosignaturetransactionLibrary(transactionHash); const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account); return new CosignatureSignedTransaction(signedTransactionRaw.parentHash, diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 6a6773f8f9..d15e29d195 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -16,7 +16,6 @@ import {expect} from 'chai'; import {ChronoUnit} from 'js-joda'; -import { VerifiableTransaction } from 'nem2-library'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; @@ -423,10 +422,10 @@ describe('AggregateTransaction', () => { ).serialize(); // 02.1 Bob cosigns the tx and sends it back to Alice - const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload); + const signedTxBob = CosignatureTransaction.signTransactionPayload(accountBob, aggregateTransactionPayload, generationHash); // 02.2 Carol cosigns the tx and sends it back to Alice - const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload); + const signedTxCarol = CosignatureTransaction.signTransactionPayload(accountCarol, aggregateTransactionPayload, generationHash); // 03. Alice collects the cosignatures, recreate, sign, and announces the transaction @@ -438,7 +437,7 @@ describe('AggregateTransaction', () => { const recreatedTx = TransactionMapping.createFromPayload(aggregateTransactionPayload) as AggregateTransaction; - const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions); + const signedTransaction = recreatedTx.signTransactionGivenSignatures(accountAlice, cosignatureSignedTransactions, generationHash); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); expect(signedTransaction.signer).to.be.equal(accountAlice.publicKey); diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index 81396da68a..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -28,7 +27,7 @@ import {TestingAccount} from '../../conf/conf.spec'; describe('CosignatureTransaction', () => { let account: Account; - + const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { account = TestingAccount; }); @@ -125,7 +124,7 @@ describe('CosignatureTransaction', () => { PlainMessage.create('a to b'), NetworkType.MIJIN_TEST).serialize(); - const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload); + const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); From d3a0340588c79f01be108b615a21c6f2866ec024 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 115/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 1 + 2 files changed, 18 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b63db47e02..54b611d0d8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -170,6 +170,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 9f1d6b9cf7c9db450cc346b1de00d4f8612078fc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 116/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 54b611d0d8..f9c6ae2b71 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -178,11 +178,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 97092c1e3272dc90b2c9657efcae4ead5f21ea17 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 117/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index f9c6ae2b71..d17f9bd3a6 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -175,14 +175,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 8534059a189c10a0c2134d6ab6312b5c0936d052 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 118/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 11 +++++++---- src/model/transaction/CosignatureTransaction.ts | 2 +- test/model/transaction/AggregateTransaction.spec.ts | 2 +- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index d17f9bd3a6..2cdf0b8d89 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -97,7 +97,7 @@ export class AggregateTransaction extends Transaction { * @param {InnerTransaction[]} innerTransactions * @param {NetworkType} networkType * @param {AggregateTransactionCosignature[]} cosignatures - * @param {UInt64} maxFee - (Optional) Max fee defined by the sender + * @param {UInt64} maxFee - (Optional) Max fee defined by the sender * @return {AggregateTransaction} */ public static createBonded(deadline: Deadline, @@ -176,13 +176,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } @@ -217,4 +220,4 @@ export class AggregateTransaction extends Transaction { return byteSize + byteTransactionsSize + byteTransactions; } -} +} \ No newline at end of file diff --git a/src/model/transaction/CosignatureTransaction.ts b/src/model/transaction/CosignatureTransaction.ts index a324c15073..1eb021e01a 100644 --- a/src/model/transaction/CosignatureTransaction.ts +++ b/src/model/transaction/CosignatureTransaction.ts @@ -81,4 +81,4 @@ export class CosignatureTransaction { signedTransactionRaw.signature, signedTransactionRaw.signer); } -} +} \ No newline at end of file diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index d15e29d195..571df9defe 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -465,4 +465,4 @@ describe('AggregateTransaction', () => { expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158); }); }); -}); +}); \ No newline at end of file diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 2afb42ff51510a538a82dfd0c4cee93dcd078d88 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 119/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 2cdf0b8d89..4ef1dd77b1 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -190,6 +190,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From a14aa54ed171e39c64e3318990c0112ac7a979ac Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 120/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 4ef1dd77b1..bd93b7464d 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -198,11 +198,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 0c33133e2a738c5a2a11f3632beacd69fdd9ed4e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 121/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index bd93b7464d..1bcc4e7e59 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -195,14 +195,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From b6f9a2e5d4c1e828ca0f67849db744ead5822a66 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 122/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 1bcc4e7e59..9b42989d64 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -196,13 +196,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From a162b45161fb741180f79d55fa1ae8da28c753d3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 123/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From f1215c9434f217d70595a204b02e6d48b7d49ce5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 124/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 2b77c3aed08e1bf0c579b78b6f362676107c5cab Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 125/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9b42989d64..ddc0dab557 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -210,6 +210,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From c570a80cf6b308bc5478dafa93a5a930a6706de3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 126/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index ddc0dab557..9f0a4cc4b1 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -218,11 +218,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 95b1d6276d2b5263b5efe38e425f6ef75dc4b2c1 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 127/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9f0a4cc4b1..1db56380d3 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -215,14 +215,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From f1ed2324f267645af91f06109f66b6fd3de18271 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 128/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 1db56380d3..f7b02c3173 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -216,13 +216,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From aca55348eba9e60ec8c39df7829eb54589b00d63 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 129/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 6baeeb6070f22b88109537f2855ec527d67b0b84 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 130/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 89f154ecd9233d8bbdcedf326617323a19a3f74b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 131/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 70912dfaf6c571b1e65f45dd56271dc8c79a55bb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 132/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From a755a4a3d4d5268bd9dd9d49dd68700079b7493f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 133/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 2564a1eea1f9c67b91a33b47e94d7e8341fdc995 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 134/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From cdbd80157607178dce4215fe4397b4f4938d3eba Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 135/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index f7b02c3173..b424b4e786 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -230,6 +230,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 550362a9d6b60039acae1707bc0e361094450c78 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 136/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index b424b4e786..34e4c04f00 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -238,11 +238,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From d3efb976cb0014adcdc5184613908ab847e87ec9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 137/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 34e4c04f00..c1d46307c4 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -235,14 +235,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 8761a93c234fc3dbb35a4096e5554de4fcaa7aeb Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 138/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index c1d46307c4..a975ce14f5 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -236,13 +236,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From cb63ace070e87698ed0236ba7fe73c1dfdf07b25 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 139/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 19726757f486179b22727e64e90aac99e73a242a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 140/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 38fa9b26edc7d7cbcc1596e4d58befd77551cbdd Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 141/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 0a81b71a0a8847b3d172827d3e59907424b9f331 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 142/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c7a3cf9c9182012c13ce07f5c38883edec9a6098 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 143/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 3c98598494aa7cf5991efc7cd13fffb817204385 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 144/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From f9d2b2d7b387a55a7365a0e168f19953b924514b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 145/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 307cc20f27ce1c0f121f4e27034cf65d4c105eef Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 146/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c5bafdc823b3afbccd607170d64817baa7a89294 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 147/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 4edc84b4c0e08dfeca64aa05ebaf309c768584e2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 148/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 9a66501a923e278b6da0518cf4559fcf6baa8208 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 149/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From d3df4cb4d0a47c16560191b7d38f8258d6c73dc9 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 150/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From b06b72e0285a575d7ed8d3d9600b921a2410f5a5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 151/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From f6baeac6ded29f992ad06ae4d101ed3020d5a671 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 152/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 5da60f08d3bcba4168d80763114ed03793b4dcce Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 153/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 6404861572676923dc1145fecbda7fbd8cdf1264 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 154/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index a975ce14f5..c21d3d10f1 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -250,6 +250,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account From 39b9dedd73cf3c73bd0cfc6e86848da0891f1c00 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 155/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index c21d3d10f1..9049b94009 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -258,11 +258,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From baef289e2d4b0d0836fe5afe7148494bf8368f09 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 156/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 9049b94009..ae6d130b98 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -255,14 +255,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From f8bb079226668171fb3c6085b55555799d0705ea Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 157/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 3 ++- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index ae6d130b98..5b105fa01f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -262,7 +262,8 @@ export class AggregateTransaction extends Transaction { cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 0f0c8cf87bcc83bc9bc74caf17008af1c642a7ee Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 158/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 1 + 2 files changed, 18 insertions(+) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 5b105fa01f..0a1385ab0a 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -268,6 +268,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 7a16a5b035808d854124c42a61506cafb31bd99c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 159/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 0a1385ab0a..56467c299f 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -276,11 +276,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 5442c875e2be3cbb827aafd6b99e2f97cbdef850 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 160/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 56467c299f..f22a90e0f0 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -273,14 +273,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 650342b18f46cf33e860a8eae9422593ff341e6e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 161/208] fixed merge issue --- src/model/transaction/AggregateTransaction.ts | 6 ++++-- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index f22a90e0f0..793fd3250e 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -277,10 +277,12 @@ export class AggregateTransaction extends Transaction { * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 2b267c00de73c700bbe94deb2f2e483b9a16ca5d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 162/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 793fd3250e..ef4397bb4a 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -287,6 +287,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From c9f0f975efecd9f823b39b755ce2d9f1ce3f24f2 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 163/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index ef4397bb4a..ac1e467cce 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -295,11 +295,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From d3e419ac60a64895feea20c023b7f0fc3fa97475 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 164/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index ac1e467cce..24a27bd1c0 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -292,14 +292,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 040f56f7aa6c7082f24f821287da7ea43108dbbe Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 165/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 24a27bd1c0..8412d51b4b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -293,13 +293,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 863cd20219f2abd5cc1c2e4f53339d0295b4d89c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 166/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 1db6923366e2665584f16e2ab309311ffbae1120 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 167/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From f9010150f9dd913b21e44e8451874bd9e259c539 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 168/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 8412d51b4b..bccecceb09 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -307,6 +307,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 72958b1893779c3e6134e7f092f2d803d2caa16d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 169/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index bccecceb09..1ed668b116 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -315,11 +315,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 6371a2ba62293aa1c863d50607b6aeac258754ed Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 170/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 1ed668b116..a2ac80d671 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -312,14 +312,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 3bc0866fd7b09e4a6e0875e0cb20f7f4078aea9c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 171/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index a2ac80d671..bb9271f5e6 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -313,13 +313,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 57b00dbb866b15249b4ae6e772f2394095a25468 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 172/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c8153ab3355781ea995ca7ce5aed11fdc51fff18 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 173/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 10b6e01dfca28e38459d234399e34e4da1ee12e0 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 174/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 6f439ec5a2dd4a387f7924ceb74835c169e8943c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 175/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 1de12f75684e1955907f6d4a09ac6869ba299f31 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 176/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From fca7908ecd91d5320dbbe259c537c98f2d4ed31f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 177/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 6681a98817dd5415b26f155d19836e766385badc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 178/208] Added #112 sign with cosignatories --- src/model/transaction/AggregateTransaction.ts | 17 +++++++++++++++++ .../transaction/CosignatureTransaction.spec.ts | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index bb9271f5e6..e9088665b8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -327,6 +327,23 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } + /** + * @internal + * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction + * For off chain Aggregated Complete Transaction co-signing. + * @param initiatorAccount - Initiator account + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @return {SignedTransaction} + */ + public signTransactionWithCosignedTransactions(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + const aggregateTransaction = this.buildTransaction(); + const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, + cosignatureSignedTransaction); + return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, + this.type, this.networkType); + } + /** * Check if account has signed transaction * @param publicAccount - Signer public account diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 61aaacd0852de4f0a1604658ba53024b105b3934 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:24:00 +0100 Subject: [PATCH 179/208] Renamed signTransactionWithCosignedTransactions to eliminate confusions --- src/model/transaction/AggregateTransaction.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index e9088665b8..8d4bd4ce2a 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -335,11 +335,11 @@ export class AggregateTransaction extends Transaction { * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction * @return {SignedTransaction} */ - public signTransactionWithCosignedTransactions(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + public signTransactionGivenSignatures(initiatorAccount: Account, + cosignatureSignedTransaction: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionWithCosignedTransactions(initiatorAccount, - cosignatureSignedTransaction); + const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, + cosignatureSignedTransaction); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From cd3521ae03955de0585a8dda67f211e5a9bfd80f Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 29 Apr 2019 09:29:45 +0100 Subject: [PATCH 180/208] Updated parameter name --- src/model/transaction/AggregateTransaction.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 8d4bd4ce2a..dfab3f63d6 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -332,14 +332,14 @@ export class AggregateTransaction extends Transaction { * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransaction - Array of cosigned transaction + * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransaction: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[]) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransaction); + cosignatureSignedTransactions); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 9a0cb8c4c6af78535301f61926cc044ae089cd18 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 181/208] merged lates master --- src/model/transaction/AggregateTransaction.ts | 7 +++++-- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index dfab3f63d6..7a8fbb6e08 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -333,13 +333,16 @@ export class AggregateTransaction extends Transaction { * For off chain Aggregated Complete Transaction co-signing. * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction + * @param generationHash - Network generation hash hex * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { + cosignatureSignedTransactions: CosignatureSignedTransaction[], + generationHash: string) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions); + cosignatureSignedTransactions, + generationHash); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 1cbfca9c8a4351ec2e829f45799b9f565fbcab48 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 182/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From c91e98a2f185a35f84043a8a9acaec07116d476a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 183/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 1ff5c5fee1f2b22ee99e8f356303944ac3adc73e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 184/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From 554e2e63002d0ce2592b7103aec1140c071e71c5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 185/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 5dd9a785b04b24d353cb1c21d7c2eb35223ad3fc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 186/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 873070a5449f203c17756b85a4783aca4f8edcad Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 187/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 03416cb9457f6f72dadc22af7289a7704401f63d Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 188/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From e14679a842a5f61cfb40cf55c76ce6a02d256db3 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 189/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 17f30f641e244307d45c88ab2a4c51fe955ff58e Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 190/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From cb4a6cff5a45d97d3f5dd3b8a0e655e289290835 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 191/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From 13e271f9bb8524c6cc28a8901cfcc9aba420778c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 192/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index a788310d1d..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -129,4 +130,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); \ No newline at end of file +}); From d64ea9124254673c32582be14540447bfc31ddf5 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 17 Jun 2019 13:31:55 +0100 Subject: [PATCH 193/208] merged lates master --- test/model/transaction/CosignatureTransaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..b3f8de15af 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From f22ce7516068e420c4ddaa7aee25509f73426c42 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 25 Apr 2019 22:25:18 +0100 Subject: [PATCH 194/208] Added #112 sign with cosignatories --- test/model/transaction/CosignatureTransaction.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index b3f8de15af..c43781378b 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,6 +15,7 @@ */ import {expect} from 'chai'; +import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; From 296c10ce18ba731bc0200b1885bc39d1283d17cc Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 20 Jun 2019 13:28:02 +0100 Subject: [PATCH 195/208] fixed merge issue --- test/model/transaction/CosignatureTransaction.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index c43781378b..a788310d1d 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -15,7 +15,6 @@ */ import {expect} from 'chai'; -import { VerifiableTransaction } from 'nem2-library'; import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO'; import {Account} from '../../../src/model/account/Account'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; @@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => { expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE'); expect(signedTx.signer).to.be.equal(account.publicKey); }); -}); +}); \ No newline at end of file From cadb6886b0e8b8c1edb63505e5bd87ccfa217a7c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Wed, 3 Jul 2019 11:59:02 +0100 Subject: [PATCH 196/208] Updated signSchema --- src/model/transaction/AggregateTransaction.ts | 87 ++----------------- 1 file changed, 5 insertions(+), 82 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 7a8fbb6e08..6773fa8e3b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -157,95 +157,18 @@ export class AggregateTransaction extends Transaction { * @param initiatorAccount - Initiator account * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction * @param generationHash - Network generation hash hex + * @param {SignSchema} signSchema The Sign Schema. (KECCAK_REVERSED_KEY / SHA3) * @return {SignedTransaction} */ public signTransactionGivenSignatures(initiatorAccount: Account, cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { + generationHash: string, + signSchema: SignSchema= SignSchema.SHA3) { const aggregateTransaction = this.buildTransaction(); const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, cosignatureSignedTransactions, - generationHash); + generationHash, + signSchema); return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, this.type, this.networkType); } From 13f04a13ef540d3186f0f0b78198ed9977f34091 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Wed, 3 Jul 2019 12:00:48 +0100 Subject: [PATCH 197/208] fixed merged conflict issue --- src/model/transaction/AggregateTransaction.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 6773fa8e3b..26b695c69b 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -250,26 +250,6 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - /** * Check if account has signed transaction * @param publicAccount - Signer public account From 88bce96f99ee8a5b1c5f2798ab9f1952e52a0d42 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Wed, 3 Jul 2019 13:25:55 +0100 Subject: [PATCH 198/208] resolved rebase conflict --- src/model/transaction/AggregateTransaction.ts | 77 ------------------- 1 file changed, 77 deletions(-) diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts index 26b695c69b..495ba89fb8 100644 --- a/src/model/transaction/AggregateTransaction.ts +++ b/src/model/transaction/AggregateTransaction.ts @@ -173,83 +173,6 @@ export class AggregateTransaction extends Transaction { this.type, this.networkType); } - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[]) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - - /** - * @internal - * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction - * For off chain Aggregated Complete Transaction co-signing. - * @param initiatorAccount - Initiator account - * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction - * @param generationHash - Network generation hash hex - * @return {SignedTransaction} - */ - public signTransactionGivenSignatures(initiatorAccount: Account, - cosignatureSignedTransactions: CosignatureSignedTransaction[], - generationHash: string) { - const aggregateTransaction = this.buildTransaction(); - const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount, - cosignatureSignedTransactions, - generationHash); - return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey, - this.type, this.networkType); - } - /** * Check if account has signed transaction * @param publicAccount - Signer public account From 20491003ade46748ed077b49c1f49ae5bd4ef6f8 Mon Sep 17 00:00:00 2001 From: Greg S Date: Wed, 3 Jul 2019 15:56:50 +0200 Subject: [PATCH 199/208] added information for v0.13.0 with elephant compatibility --- CHANGELOG.md | 11 ++++++++++- README.md | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6323684b57..57db5056e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.13.0] - 03-Jul-2019 + +**Milestone**: Elephant + +- Added SignSchema to make KeyPair generation compatible with either of Catapult and NIS. +- Added SignSchema with KECCAK_REVERSED_KEY and SHA3. The SDK by default uses SHA3 which is the Catapult signature schema. +- Fixed transaction versions back to version 1 +- Added `signTransactionGivenSignatures` to cope with off chain aggregated complete transaction co signing. + ## [0.12.4] - 03-Jul-2019 **Milestone**: Dragon @@ -143,7 +152,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e **Milestone**: Alpaca - Initial code release. - +[0.13.0]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.4...v0.13.0 [0.12.4]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.3...v0.12.4 [0.12.3]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.2...v0.12.3 [0.12.2]: https://github.com/nemtech/nem2-sdk-typescript-javascript/compare/v0.12.1...v0.12.2 diff --git a/README.md b/README.md index ccca71cc60..9d10ea6d2e 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ with the NEM2 (a.k.a Catapult) ## Important Notes +### _Elephant Network Compatibility (catapult-server@0.5.0.1) + +Due to a network upgrade with [catapult-server@elephant](https://github.com/nemtech/catapult-server/releases/tag/v0.5.0.1) version, **it is recommended to use this package's 0.13.0 version and upwards to use this package with Dragon versioned networks**. + +The upgrade to this package's [version v0.13.0](https://github.com/nemtech/nem2-sdk-typescript-javascript/releases/tag/v0.13.0) is mandatory for **dragon compatibility**. + ### _Dragon_ Network Compatibility (catapult-server@0.4.0.1) Due to a network upgrade with [catapult-server@dragon](https://github.com/nemtech/catapult-server/releases/tag/v0.4.0.1) version, **it is recommended to use this package's 0.12.4 version and upwards to use this package with Dragon versioned networks**. From 0ed6b147512357794c2d3b1c56f67da3fcdd6818 Mon Sep 17 00:00:00 2001 From: Greg S Date: Wed, 3 Jul 2019 15:57:29 +0200 Subject: [PATCH 200/208] v0.13.0: base compatibility for Elephant protocol upgrade --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82520485e7..0459730d4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nem2-sdk", - "version": "0.12.4", + "version": "0.13.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f58619397c..26748b47c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nem2-sdk", - "version": "0.12.4", + "version": "0.13.0", "description": "Reactive Nem2 sdk for typescript and javascript", "scripts": { "pretest": "npm run build", From 5f37d3ff8fa08a15486186f0096c8a414c256b09 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 8 Jul 2019 15:14:51 +0100 Subject: [PATCH 201/208] Applied new DTOs from nem2-doc Renamed all `account properties` to `restrictions` --- e2e/infrastructure/AccountHttp.spec.ts | 22 +-- e2e/infrastructure/TransactionHttp.spec.ts | 57 +++---- src/core/utils/DtoMapping.ts | 26 ++-- src/infrastructure/AccountHttp.ts | 30 ++-- src/infrastructure/AccountRepository.ts | 12 +- src/infrastructure/api.ts | 5 +- src/infrastructure/api/accountRoutesApi.ts | 34 ++--- src/infrastructure/api/apis.ts | 4 +- src/infrastructure/api/blockRoutesApi.ts | 4 +- src/infrastructure/api/chainRoutesApi.ts | 4 +- src/infrastructure/api/diagnosticRoutesApi.ts | 4 +- src/infrastructure/api/mosaicRoutesApi.ts | 4 +- src/infrastructure/api/namespaceRoutesApi.ts | 4 +- src/infrastructure/api/networkRoutesApi.ts | 4 +- src/infrastructure/api/nodeRoutesApi.ts | 4 +- .../api/transactionRoutesApi.ts | 4 +- ...ntRestrictionsAddressTransactionBuffer.ts} | 142 +++++++++--------- ...estrictionsEntityTypeTransactionBuffer.ts} | 134 ++++++++--------- ...untRestrictionsMosaicTransactionBuffer.ts} | 142 +++++++++--------- .../AccountPropertiesAddressTransaction.ts | 128 ---------------- .../AccountPropertiesEntityTypeTransaction.ts | 126 ---------------- .../AccountPropertiesMosaicTransaction.ts | 127 ---------------- .../AccountRestrictionsAddressTransaction.ts | 128 ++++++++++++++++ ...ccountRestrictionsEntityTypeTransaction.ts | 126 ++++++++++++++++ .../AccountRestrictionsMosaicTransaction.ts | 127 ++++++++++++++++ src/infrastructure/model/accountDTO.ts | 4 +- src/infrastructure/model/accountIds.ts | 4 +- src/infrastructure/model/accountInfoDTO.ts | 4 +- src/infrastructure/model/accountMetaDTO.ts | 4 +- src/infrastructure/model/accountNamesDTO.ts | 6 +- ...ropertyDTO.ts => accountRestrictionDTO.ts} | 20 +-- ...eEnum.ts => accountRestrictionTypeEnum.ts} | 10 +- ...ertiesDTO.ts => accountRestrictionsDTO.ts} | 18 +-- ...foDTO.ts => accountRestrictionsInfoDTO.ts} | 18 +-- src/infrastructure/model/aliasDTO.ts | 4 +- src/infrastructure/model/aliasTypeEnum.ts | 4 +- .../model/announceTransactionInfoDTO.ts | 4 +- src/infrastructure/model/blockDTO.ts | 4 +- src/infrastructure/model/blockInfoDTO.ts | 4 +- src/infrastructure/model/blockMetaDTO.ts | 4 +- .../model/blockchainScoreDTO.ts | 4 +- .../model/communicationTimestamps.ts | 4 +- src/infrastructure/model/cosignature.ts | 4 +- src/infrastructure/model/heightInfoDTO.ts | 4 +- src/infrastructure/model/merklePathItem.ts | 4 +- src/infrastructure/model/merkleProofInfo.ts | 4 +- .../model/merkleProofInfoDTO.ts | 4 +- src/infrastructure/model/models.ts | 25 +-- src/infrastructure/model/mosaicDTO.ts | 4 +- .../model/mosaicDefinitionDTO.ts | 4 +- src/infrastructure/model/mosaicIds.ts | 4 +- src/infrastructure/model/mosaicInfoDTO.ts | 4 +- src/infrastructure/model/mosaicMetaDTO.ts | 4 +- src/infrastructure/model/mosaicNamesDTO.ts | 4 +- src/infrastructure/model/mosaicPropertyDTO.ts | 4 +- .../model/mosaicPropertyIdEnum.ts | 4 +- .../model/multisigAccountGraphInfoDTO.ts | 4 +- .../model/multisigAccountInfoDTO.ts | 4 +- src/infrastructure/model/multisigDTO.ts | 4 +- .../model/multisigModificationTypeEnum.ts | 4 +- src/infrastructure/model/namespaceDTO.ts | 4 +- src/infrastructure/model/namespaceIds.ts | 4 +- src/infrastructure/model/namespaceInfoDTO.ts | 4 +- src/infrastructure/model/namespaceMetaDTO.ts | 4 +- src/infrastructure/model/namespaceNameDTO.ts | 4 +- src/infrastructure/model/namespaceTypeEnum.ts | 4 +- src/infrastructure/model/networkTypeDTO.ts | 4 +- src/infrastructure/model/nodeInfoDTO.ts | 4 +- src/infrastructure/model/nodeTimeDTO.ts | 4 +- src/infrastructure/model/receiptTypeEnum.ts | 4 +- .../model/resolutionEntryDTO.ts | 4 +- .../model/resolutionStatementDTO.ts | 4 +- src/infrastructure/model/rolesTypeEnum.ts | 4 +- src/infrastructure/model/serverDTO.ts | 4 +- src/infrastructure/model/serverInfoDTO.ts | 4 +- src/infrastructure/model/sourceDTO.ts | 4 +- src/infrastructure/model/statementsDTO.ts | 4 +- src/infrastructure/model/storageInfoDTO.ts | 4 +- src/infrastructure/model/transactionHashes.ts | 4 +- src/infrastructure/model/transactionIds.ts | 4 +- .../model/transactionInfoDTO.ts | 4 +- .../model/transactionMetaDTO.ts | 4 +- .../model/transactionPayload.ts | 4 +- .../model/transactionStatementDTO.ts | 4 +- .../model/transactionStatusDTO.ts | 4 +- ...nsAddressModificationTransactionSchema.ts} | 6 +- ...ntityTypeModificationTransactionSchema.ts} | 6 +- ...onsMosaicModificationTransactionSchema.ts} | 6 +- .../transaction/CreateTransactionFromDTO.ts | 12 +- .../CreateTransactionFromPayload.ts | 14 +- .../transaction/SerializeTransactionToJSON.ts | 12 +- ...dressRestrictionModificationTransaction.ts | 15 +- ...osaicRestrictionModificationTransaction.ts | 15 +- ...ationRestrictionModificationTransaction.ts | 15 +- .../AccountRestrictionModification.ts | 14 +- .../AccountRestrictionTransaction.ts | 18 +-- src/model/transaction/TransactionType.ts | 12 +- src/model/transaction/TransactionVersion.ts | 12 +- test/core/utils/TransactionMapping.spec.ts | 96 ++++++------ .../SerializeTransactionToJSON.spec.ts | 48 +++--- test/model/account/AccountRestriction.spec.ts | 16 +- .../model/account/AccountRestrictions.spec.ts | 30 ++-- .../account/AccountRestrictionsInfo.spec.ts | 38 ++--- ... => AccountRestrictionTransaction.spec.ts} | 132 ++++++++-------- 104 files changed, 1115 insertions(+), 1117 deletions(-) rename src/infrastructure/buffers/{AccountPropertiesAddressTransactionBuffer.ts => AccountRestrictionsAddressTransactionBuffer.ts} (58%) rename src/infrastructure/buffers/{AccountPropertiesEntityTypeTransactionBuffer.ts => AccountRestrictionsEntityTypeTransactionBuffer.ts} (57%) rename src/infrastructure/buffers/{AccountPropertiesMosaicTransactionBuffer.ts => AccountRestrictionsMosaicTransactionBuffer.ts} (59%) delete mode 100644 src/infrastructure/builders/AccountPropertiesAddressTransaction.ts delete mode 100644 src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts delete mode 100644 src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts rename src/infrastructure/model/{accountPropertyDTO.ts => accountRestrictionDTO.ts} (72%) rename src/infrastructure/model/{accountPropertyTypeEnum.ts => accountRestrictionTypeEnum.ts} (56%) rename src/infrastructure/model/{accountPropertiesDTO.ts => accountRestrictionsDTO.ts} (76%) rename src/infrastructure/model/{accountPropertiesInfoDTO.ts => accountRestrictionsInfoDTO.ts} (71%) rename src/infrastructure/schemas/{AccountPropertiesAddressModificationTransactionSchema.ts => AccountRestrictionsAddressModificationTransactionSchema.ts} (87%) rename src/infrastructure/schemas/{AccountPropertiesEntityTypeModificationTransactionSchema.ts => AccountRestrictionsEntityTypeModificationTransactionSchema.ts} (87%) rename src/infrastructure/schemas/{AccountPropertiesMosaicModificationTransactionSchema.ts => AccountRestrictionsMosaicModificationTransactionSchema.ts} (87%) rename test/model/transaction/{AccountPropertyTransaction.spec.ts => AccountRestrictionTransaction.spec.ts} (54%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index c6eabef382..89c0ba90ff 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -198,7 +198,7 @@ describe('AccountHttp', () => { RestrictionModificationType.Add, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, [addressPropertyFilter], @@ -282,22 +282,22 @@ describe('AccountHttp', () => { }); }); - describe('getAccountProperty', () => { - it('should call getAccountProperty successfully', (done) => { + describe('getAccountRestrictions', () => { + it('should call getAccountRestrictions successfully', (done) => { setTimeout(() => { - accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => { - deepEqual(accountProperty.accountRestrictions.address, accountAddress); + accountHttp.getAccountRestrictions(accountAddress).subscribe((accountRestrictions) => { + deepEqual(accountRestrictions.accountRestrictions.address, accountAddress); done(); }); }, 1000); }); }); - describe('getAccountProperties', () => { - it('should call getAccountProperties successfully', (done) => { + describe('getAccountRestrictions', () => { + it('should call getAccountRestrictions successfully', (done) => { setTimeout(() => { - accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => { - deepEqual(accountProperties[0]!.accountRestrictions.address, accountAddress); + accountHttp.getAccountRestrictionsFromAccounts([accountAddress]).subscribe((accountRestrictions) => { + deepEqual(accountRestrictions[0]!.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -409,7 +409,7 @@ describe('AccountHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('Remove test AccountProperty - Address', () => { + describe('Remove test AccountRestriction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -424,7 +424,7 @@ describe('AccountHttp', () => { RestrictionModificationType.Remove, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, [addressPropertyFilter], diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 9e9ab624b2..dbee30b256 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -24,10 +24,8 @@ import { NamespaceHttp } from '../../src/infrastructure/infrastructure'; import {Listener} from '../../src/infrastructure/Listener'; import {TransactionHttp} from '../../src/infrastructure/TransactionHttp'; import {Account} from '../../src/model/account/Account'; -import {Address} from '../../src/model/account/Address'; import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../src/model/account/RestrictionType'; -import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; import {MosaicId} from '../../src/model/mosaic/MosaicId'; @@ -38,31 +36,26 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction'; import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction'; -import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../src/model/transaction/Deadline'; import { HashLockTransaction } from '../../src/model/transaction/HashLockTransaction'; import {HashType} from '../../src/model/transaction/HashType'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction'; -import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction'; import {MosaicSupplyChangeTransaction} from '../../src/model/transaction/MosaicSupplyChangeTransaction'; -import {MultisigCosignatoryModification} from '../../src/model/transaction/MultisigCosignatoryModification'; -import {MultisigCosignatoryModificationType} from '../../src/model/transaction/MultisigCosignatoryModificationType'; -import {EmptyMessage, PlainMessage} from '../../src/model/transaction/PlainMessage'; +import { PlainMessage } from '../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../src/model/transaction/RegisterNamespaceTransaction'; import {SecretLockTransaction} from '../../src/model/transaction/SecretLockTransaction'; import {SecretProofTransaction} from '../../src/model/transaction/SecretProofTransaction'; -import {SignedTransaction} from '../../src/model/transaction/SignedTransaction'; import {Transaction} from '../../src/model/transaction/Transaction'; import {TransactionType} from '../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../src/model/transaction/TransferTransaction'; @@ -283,14 +276,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account, generationHash); @@ -299,7 +292,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -320,14 +313,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Remove, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), @@ -358,14 +351,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account, generationHash); @@ -374,7 +367,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -395,14 +388,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Remove, mosaicId, ); - const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), @@ -422,7 +415,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountRestrictionTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - Operation', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -433,14 +426,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account3, generationHash); @@ -449,7 +442,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account3.address).subscribe((error) => { @@ -460,7 +453,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountRestrictionTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - Operation', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -470,14 +463,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Remove, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 20b184e8ad..9a0e2b77d1 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -14,9 +14,9 @@ * limitations under the License. */ +import { AccountRestriction } from '../../model/account/AccountRestriction'; import { AccountRestrictions } from '../../model/account/AccountRestrictions'; import { AccountRestrictionsInfo } from '../../model/account/AccountRestrictionsInfo'; -import { AccountRestriction } from '../../model/account/AccountRestriction'; import { Address } from '../../model/account/Address'; import { RestrictionType } from '../../model/account/RestrictionType'; import { MosaicId } from '../../model/mosaic/MosaicId'; @@ -24,29 +24,29 @@ import { MosaicId } from '../../model/mosaic/MosaicId'; export class DtoMapping { /** - * Create AccountPropertyInfo class from Json. - * @param {object} dataJson The account property json object. - * @returns {module: model/Account/AccountPropertiesInfo} The AccountPropertiesInfo class. + * Create AccountRestrictionsInfo class from Json. + * @param {object} dataJson The account restriction json object. + * @returns {module: model/Account/AccountRestrictionsInfo} The AccountRestrictionsInfo class. */ - public static extractAccountPropertyFromDto(accountProperties): AccountRestrictionsInfo { + public static extractAccountRestrictionFromDto(accountRestrictions): AccountRestrictionsInfo { return new AccountRestrictionsInfo( - accountProperties.meta, - new AccountRestrictions(Address.createFromEncoded(accountProperties.accountProperties.address), - accountProperties.accountProperties.properties.map((prop) => { - switch (prop.propertyType) { + accountRestrictions.meta, + new AccountRestrictions(Address.createFromEncoded(accountRestrictions.accountRestrictions.address), + accountRestrictions.accountRestrictions.restrictions.map((prop) => { + switch (prop.restrictionType) { case RestrictionType.AllowAddress: case RestrictionType.BlockAddress: - return new AccountRestriction(prop.propertyType, + return new AccountRestriction(prop.restrictionType, prop.values.map((value) => Address.createFromEncoded(value))); case RestrictionType.AllowMosaic: case RestrictionType.BlockMosaic: - return new AccountRestriction(prop.propertyType, + return new AccountRestriction(prop.restrictionType, prop.values.map((value) => new MosaicId(value))); case RestrictionType.AllowTransaction: case RestrictionType.BlockTransaction: - return new AccountRestriction(prop.propertyType, prop.values); + return new AccountRestriction(prop.restrictionType, prop.values); default: - throw new Error(`Invalid property type: ${prop.propertyType}`); + throw new Error(`Invalid restriction type: ${prop.restrictionType}`); } }))); } diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index a174f27a81..6ef6ba3fae 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -34,8 +34,8 @@ import {UInt64} from '../model/UInt64'; import {AccountRepository} from './AccountRepository'; import { AccountInfoDTO, AccountNamesDTO, - AccountPropertiesDTO, - AccountPropertiesInfoDTO, + AccountRestrictionsDTO, + AccountRestrictionsInfoDTO, AccountRoutesApi, MosaicDTO, MultisigAccountGraphInfoDTO, @@ -93,31 +93,31 @@ export class AccountHttp extends Http implements AccountRepository { } /** - * Gets Account property. + * Get Account restrictions. * @param publicAccount public account - * @returns Observable + * @returns Observable */ - public getAccountProperties(address: Address): Observable { - return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())) - .pipe(map((accountProperties: AccountPropertiesInfoDTO) => { - return DtoMapping.extractAccountPropertyFromDto(accountProperties); + public getAccountRestrictions(address: Address): Observable { + return observableFrom(this.accountRoutesApi.getAccountRestrictions(address.plain())) + .pipe(map((accountRestrictions: AccountRestrictionsInfoDTO) => { + return DtoMapping.extractAccountRestrictionFromDto(accountRestrictions); })); } /** - * Gets Account properties. + * Get Account restrictions. * @param address list of addresses - * @returns Observable + * @returns Observable */ - public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { + public getAccountRestrictionsFromAccounts(addresses: Address[]): Observable { const accountIds = { addresses: addresses.map((address) => address.plain()), }; return observableFrom( - this.accountRoutesApi.getAccountPropertiesFromAccounts(accountIds)) - .pipe(map((accountProperties: AccountPropertiesDTO[]) => { - return accountProperties.map((property) => { - return DtoMapping.extractAccountPropertyFromDto(property); + this.accountRoutesApi.getAccountRestrictionsFromAccounts(accountIds)) + .pipe(map((accountRestrictions: AccountRestrictionsDTO[]) => { + return accountRestrictions.map((restriction) => { + return DtoMapping.extractAccountRestrictionFromDto(restriction); }); })); } diff --git a/src/infrastructure/AccountRepository.ts b/src/infrastructure/AccountRepository.ts index 1fe6fa5e94..a853840b49 100644 --- a/src/infrastructure/AccountRepository.ts +++ b/src/infrastructure/AccountRepository.ts @@ -56,18 +56,18 @@ export interface AccountRepository { getAccountsNames(accountIds: Address[]): Observable; /** - * Gets Account property. + * Gets Account restrictions. * @param publicAccount public account - * @returns Observable + * @returns Observable */ - getAccountProperties(address: Address): Observable; + getAccountRestrictions(address: Address): Observable; /** - * Gets Account properties. + * Gets Account restrictions. * @param address list of addresses - * @returns Observable + * @returns Observable */ - getAccountPropertiesFromAccounts(addresses: Address[]): Observable; + getAccountRestrictionsFromAccounts(addresses: Address[]): Observable; /** * Gets a MultisigAccountInfo for an account. diff --git a/src/infrastructure/api.ts b/src/infrastructure/api.ts index 6d1bd548c9..590b4eacdd 100644 --- a/src/infrastructure/api.ts +++ b/src/infrastructure/api.ts @@ -14,16 +14,17 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * Do not edit the class manually. */ + // This is the entrypoint for the package export * from './api/apis'; export * from './model/models'; \ No newline at end of file diff --git a/src/infrastructure/api/accountRoutesApi.ts b/src/infrastructure/api/accountRoutesApi.ts index cdf01391d3..529245b7a5 100644 --- a/src/infrastructure/api/accountRoutesApi.ts +++ b/src/infrastructure/api/accountRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -32,7 +32,7 @@ import http = require('http'); import { AccountIds } from '../model/accountIds'; import { AccountInfoDTO } from '../model/accountInfoDTO'; import { AccountNamesDTO } from '../model/accountNamesDTO'; -import { AccountPropertiesInfoDTO } from '../model/accountPropertiesInfoDTO'; +import { AccountRestrictionsInfoDTO } from '../model/accountRestrictionsInfoDTO'; import { MultisigAccountGraphInfoDTO } from '../model/multisigAccountGraphInfoDTO'; import { MultisigAccountInfoDTO } from '../model/multisigAccountInfoDTO'; import { TransactionInfoDTO } from '../model/transactionInfoDTO'; @@ -262,12 +262,12 @@ export class AccountRoutesApi { }); } /** - * Returns the configurable properties for a given account. - * @summary Get account configurable properties information + * Returns the account restrictions for a given account. + * @summary Get the account restrictions * @param accountId The public key or address of the account. */ - public async getAccountProperties (accountId: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: AccountPropertiesInfoDTO; }> { - const localVarPath = this.basePath + '/account/{accountId}/properties/' + public async getAccountRestrictions (accountId: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: AccountRestrictionsInfoDTO; }> { + const localVarPath = this.basePath + '/account/{accountId}/restrictions/' .replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); @@ -275,7 +275,7 @@ export class AccountRoutesApi { // verify required parameter 'accountId' is not null or undefined if (accountId === null || accountId === undefined) { - throw new Error('Required parameter accountId was null or undefined when calling getAccountProperties.'); + throw new Error('Required parameter accountId was null or undefined when calling getAccountRestrictions.'); } (Object).assign(localVarHeaderParams, options.headers); @@ -300,12 +300,12 @@ export class AccountRoutesApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.ClientResponse; body: AccountPropertiesInfoDTO; }>((resolve, reject) => { + return new Promise<{ response: http.ClientResponse; body: AccountRestrictionsInfoDTO; }>((resolve, reject) => { localVarRequest(localVarRequestOptions, (error, response, body) => { if (error) { reject(error); } else { - body = ObjectSerializer.deserialize(body, "AccountPropertiesInfoDTO"); + body = ObjectSerializer.deserialize(body, "AccountRestrictionsInfoDTO"); if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) { resolve(body); } else { @@ -319,19 +319,19 @@ export class AccountRoutesApi { }); } /** - * Returns the configurable properties for a given array of addresses. - * @summary Get account properties for given array of addresses + * Returns the account restrictions for a given array of addresses. + * @summary Get account restrictions for given array of addresses * @param accountIds */ - public async getAccountPropertiesFromAccounts (accountIds: AccountIds, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: Array; }> { - const localVarPath = this.basePath + '/account/properties'; + public async getAccountRestrictionsFromAccounts (accountIds: AccountIds, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: Array; }> { + const localVarPath = this.basePath + '/account/restrictions'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); let localVarFormParams: any = {}; // verify required parameter 'accountIds' is not null or undefined if (accountIds === null || accountIds === undefined) { - throw new Error('Required parameter accountIds was null or undefined when calling getAccountPropertiesFromAccounts.'); + throw new Error('Required parameter accountIds was null or undefined when calling getAccountRestrictionsFromAccounts.'); } (Object).assign(localVarHeaderParams, options.headers); @@ -357,12 +357,12 @@ export class AccountRoutesApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => { + return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => { localVarRequest(localVarRequestOptions, (error, response, body) => { if (error) { reject(error); } else { - body = ObjectSerializer.deserialize(body, "Array"); + body = ObjectSerializer.deserialize(body, "Array"); if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) { resolve(body); } else { diff --git a/src/infrastructure/api/apis.ts b/src/infrastructure/api/apis.ts index b32f7659da..8772c3573e 100644 --- a/src/infrastructure/api/apis.ts +++ b/src/infrastructure/api/apis.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/blockRoutesApi.ts b/src/infrastructure/api/blockRoutesApi.ts index 81abddbdc6..881fb16997 100644 --- a/src/infrastructure/api/blockRoutesApi.ts +++ b/src/infrastructure/api/blockRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/chainRoutesApi.ts b/src/infrastructure/api/chainRoutesApi.ts index b5f3e17326..4e0706620c 100644 --- a/src/infrastructure/api/chainRoutesApi.ts +++ b/src/infrastructure/api/chainRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/diagnosticRoutesApi.ts b/src/infrastructure/api/diagnosticRoutesApi.ts index d05fc09bfe..e70a25623f 100644 --- a/src/infrastructure/api/diagnosticRoutesApi.ts +++ b/src/infrastructure/api/diagnosticRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/mosaicRoutesApi.ts b/src/infrastructure/api/mosaicRoutesApi.ts index 7470668f53..dfb0e36a8b 100644 --- a/src/infrastructure/api/mosaicRoutesApi.ts +++ b/src/infrastructure/api/mosaicRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/namespaceRoutesApi.ts b/src/infrastructure/api/namespaceRoutesApi.ts index ed7857bdf3..7ce0824c7b 100644 --- a/src/infrastructure/api/namespaceRoutesApi.ts +++ b/src/infrastructure/api/namespaceRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/networkRoutesApi.ts b/src/infrastructure/api/networkRoutesApi.ts index 368aa05c7d..1e9fa0422c 100644 --- a/src/infrastructure/api/networkRoutesApi.ts +++ b/src/infrastructure/api/networkRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/nodeRoutesApi.ts b/src/infrastructure/api/nodeRoutesApi.ts index bd2b829091..cd2b0ca19b 100644 --- a/src/infrastructure/api/nodeRoutesApi.ts +++ b/src/infrastructure/api/nodeRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/transactionRoutesApi.ts b/src/infrastructure/api/transactionRoutesApi.ts index e06468ad30..39618d7377 100644 --- a/src/infrastructure/api/transactionRoutesApi.ts +++ b/src/infrastructure/api/transactionRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts similarity index 58% rename from src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts index 128442e660..7f71878ffc 100644 --- a/src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyAddressModificationBuffer = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyAddressModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.__init = function(i /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyAddressModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @param {Catapult.Buffers.RestrictionAddressModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.PropertyAddressModificationBuffer.getRootAsPropertyAddressModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyAddressModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionAddressModificationBuffer.getRootAsRestrictionAddressModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionAddressModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.modificationType = * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.value = function(index) { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.value = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.value = function(in /** * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueLength = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.valueLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueLength = funct /** * @returns {Uint8Array} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueArray = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.valueArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueArray = functi /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyAddressModificationBuffer.startPropertyAddressModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionAddressModificationBuffer.startRestrictionAddressModificationBuffer = function(builder) { builder.startObject(2); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.startPropertyAddressModificat * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyAddressModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionAddressModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.addModificationType = functio * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} valueOffset */ -Catapult.Buffers.PropertyAddressModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionAddressModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldOffset(1, valueOffset, 0); }; @@ -124,7 +124,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.addValue = function(builder, * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyAddressModificationBuffer.createValueVector = function(builder, data) { +Catapult.Buffers.RestrictionAddressModificationBuffer.createValueVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -136,7 +136,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.createValueVector = function( * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.PropertyAddressModificationBuffer.startValueVector = function(builder, numElems) { +Catapult.Buffers.RestrictionAddressModificationBuffer.startValueVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -144,7 +144,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.startValueVector = function(b * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyAddressModificationBuffer.endPropertyAddressModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionAddressModificationBuffer.endRestrictionAddressModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -152,7 +152,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.endPropertyAddressModificatio /** * @constructor */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -167,9 +167,9 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -177,17 +177,17 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.__init = fu /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.getRootAsAccountPropertiesAddressTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesAddressTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.getRootAsAccountRestrictionsAddressTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -196,7 +196,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.size = func * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -204,7 +204,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signature = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -212,7 +212,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureLe /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -221,7 +221,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureAr * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -229,7 +229,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signer = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -237,7 +237,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerLengt /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -245,7 +245,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerArray /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -253,7 +253,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.version = f /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -262,7 +262,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.type = func * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -270,7 +270,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.fee = funct /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -278,7 +278,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeLength = /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -287,7 +287,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeArray = * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -295,7 +295,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadline = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -303,7 +303,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineLen /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -311,7 +311,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineArr /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -320,25 +320,25 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.propertyTyp /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyAddressModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @param {Catapult.Buffers.RestrictionAddressModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyAddressModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionAddressModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificatio /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startAccountPropertiesAddressTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startAccountRestrictionsAddressTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startAccountPropertie * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -362,7 +362,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSize = function(bu * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -371,7 +371,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSignature = functi * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignatureVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignatureVector * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -400,7 +400,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSigner = function( * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -412,7 +412,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignerVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignerVector = f * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addVersion = function * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -436,7 +436,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addType = function(bu * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -445,7 +445,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addFee = function(bui * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -457,7 +457,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createFeeVector = fun * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -465,7 +465,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startFeeVector = func * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addDeadline = functio * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -486,16 +486,16 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createDeadlineVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addPropertyType = fun * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -511,7 +511,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModificationCount * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -520,7 +520,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModifications = fu * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -532,7 +532,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createModificationsVe * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -540,7 +540,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startModificationsVec * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.endAccountPropertiesAddressTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.endAccountRestrictionsAddressTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -549,7 +549,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.endAccountPropertiesA * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.finishAccountPropertiesAddressTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.finishAccountRestrictionsAddressTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts similarity index 57% rename from src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts index 0994479bf7..b842f8d776 100644 --- a/src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.__init = functio /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyEntityTypeModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @param {Catapult.Buffers.RestrictionEntityTypeModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.getRootAsPropertyEntityTypeModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyEntityTypeModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.getRootAsRestrictionEntityTypeModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionEntityTypeModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.modificationType * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.value = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.value = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.value = function /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.startPropertyEntityTypeModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.startRestrictionEntityTypeModificationBuffer = function(builder) { builder.startObject(2); }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.startPropertyEntityTypeMod * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.addModificationType = func * @param {flatbuffers.Builder} builder * @param {number} valueOffset */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldInt16(1, valueOffset, 0); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.addValue = function(builde * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.endRestrictionEntityTypeModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModif /** * @constructor */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -130,9 +130,9 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -140,17 +140,17 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.__init = /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.getRootAsAccountPropertiesEntityTypeTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.getRootAsAccountRestrictionsEntityTypeTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -159,7 +159,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.size = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -167,7 +167,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -175,7 +175,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -184,7 +184,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -192,7 +192,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signer = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -200,7 +200,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerLe /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -208,7 +208,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerAr /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -216,7 +216,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.version /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -225,7 +225,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.type = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -233,7 +233,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.fee = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -241,7 +241,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeLengt /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -250,7 +250,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeArray * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -258,7 +258,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -266,7 +266,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -274,7 +274,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -283,25 +283,25 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.property /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyEntityTypeModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @param {Catapult.Buffers.RestrictionEntityTypeModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyEntityTypeModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionEntityTypeModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -309,7 +309,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modifica /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startAccountPropertiesEntityTypeTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startAccountRestrictionsEntityTypeTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -317,7 +317,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startAccountProper * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -325,7 +325,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSize = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -334,7 +334,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSignature = fun * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignatureVec * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignatureVect * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -363,7 +363,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSigner = functi * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -375,7 +375,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignerVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignerVector * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addVersion = funct * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -399,7 +399,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addType = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -408,7 +408,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addFee = function( * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createFeeVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startFeeVector = f * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -437,7 +437,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addDeadline = func * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -449,16 +449,16 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createDeadlineVect * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -466,7 +466,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addPropertyType = * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModificationCou * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -483,7 +483,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModifications = * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -495,7 +495,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createModification * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startModifications * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.endAccountPropertiesEntityTypeTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.endAccountRestrictionsEntityTypeTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -512,7 +512,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.endAccountProperti * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.finishAccountPropertiesEntityTypeTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.finishAccountRestrictionsEntityTypeTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts similarity index 59% rename from src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts index 59241cc50e..2fde91933f 100644 --- a/src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyMosaicModificationBuffer = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyMosaicModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.__init = function(i, /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyMosaicModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @param {Catapult.Buffers.RestrictionMosaicModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.getRootAsPropertyMosaicModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyMosaicModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionMosaicModificationBuffer.getRootAsRestrictionMosaicModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionMosaicModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.modificationType = f * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.value = function(index) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.value = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.value = function(ind /** * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueLength = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.valueLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueLength = functi /** * @returns {Uint8Array} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueArray = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.valueArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueArray = functio /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyMosaicModificationBuffer.startPropertyMosaicModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.startRestrictionMosaicModificationBuffer = function(builder) { builder.startObject(2); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.startPropertyMosaicModificatio * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyMosaicModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.addModificationType = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} valueOffset */ -Catapult.Buffers.PropertyMosaicModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldOffset(1, valueOffset, 0); }; @@ -124,7 +124,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.addValue = function(builder, v * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.createValueVector = function(builder, data) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.createValueVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -136,7 +136,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.createValueVector = function(b * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.PropertyMosaicModificationBuffer.startValueVector = function(builder, numElems) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.startValueVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -144,7 +144,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.startValueVector = function(bu * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.endPropertyMosaicModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.endRestrictionMosaicModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -152,7 +152,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.endPropertyMosaicModificationB /** * @constructor */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -167,9 +167,9 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -177,17 +177,17 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.__init = fun /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.getRootAsAccountPropertiesMosaicTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.getRootAsAccountRestrictionsMosaicTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -196,7 +196,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.size = funct * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -204,7 +204,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signature = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -212,7 +212,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureLen /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -221,7 +221,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureArr * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -229,7 +229,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signer = fun /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -237,7 +237,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerLength /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -245,7 +245,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerArray /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -253,7 +253,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.version = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -262,7 +262,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.type = funct * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -270,7 +270,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.fee = functi /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -278,7 +278,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeLength = /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -287,7 +287,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeArray = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -295,7 +295,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadline = f /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -303,7 +303,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineLeng /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -311,7 +311,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineArra /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -320,25 +320,25 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.propertyType /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyMosaicModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @param {Catapult.Buffers.RestrictionMosaicModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyMosaicModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionMosaicModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modification /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startAccountPropertiesMosaicTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startAccountRestrictionsMosaicTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startAccountProperties * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -362,7 +362,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSize = function(bui * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -371,7 +371,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSignature = functio * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignatureVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignatureVector = * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -400,7 +400,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSigner = function(b * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -412,7 +412,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignerVector = f * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignerVector = fu * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addVersion = function( * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -436,7 +436,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addType = function(bui * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -445,7 +445,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addFee = function(buil * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -457,7 +457,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createFeeVector = func * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -465,7 +465,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startFeeVector = funct * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addDeadline = function * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -486,16 +486,16 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createDeadlineVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addPropertyType = func * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -511,7 +511,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModificationCount = * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -520,7 +520,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModifications = fun * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -532,7 +532,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createModificationsVec * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -540,7 +540,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startModificationsVect * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMosaicTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.endAccountRestrictionsMosaicTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -549,7 +549,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMo * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.finishAccountPropertiesMosaicTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.finishAccountRestrictionsMosaicTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts b/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts deleted file mode 100644 index 13ac8e7da3..0000000000 --- a/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesAddressTransaction - */ -import { RawAddress as address } from '../../core/format'; -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesAddressTransactionBufferPackage from '../buffers/AccountPropertiesAddressTransactionBuffer'; -import AccountPropertiesAddressModificationTransactionSchema from '../schemas/AccountPropertiesAddressModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; -const { - AccountPropertiesAddressTransactionBuffer, - PropertyAddressModificationBuffer, -} = AccountPropertiesAddressTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesAddressTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesAddressModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - const addressModificationVector = PropertyAddressModificationBuffer - .createValueVector(builder, address.stringToAddress(modification.value)); - PropertyAddressModificationBuffer.startPropertyAddressModificationBuffer(builder); - PropertyAddressModificationBuffer.addModificationType(builder, modification.type); - PropertyAddressModificationBuffer.addValue(builder, addressModificationVector); - modificationsArray.push(PropertyAddressModificationBuffer.endPropertyAddressModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesAddressTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesAddressTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesAddressTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesAddressTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesAddressTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesAddressTransactionBuffer.startAccountPropertiesAddressTransactionBuffer(builder); - AccountPropertiesAddressTransactionBuffer.addSize(builder, 122 + (26 * this.modifications.length)); - AccountPropertiesAddressTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesAddressTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesAddressTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesAddressTransactionBuffer.addType(builder, this.type); - AccountPropertiesAddressTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesAddressTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesAddressTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesAddressTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesAddressTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesAddress = - AccountPropertiesAddressTransactionBuffer.endAccountPropertiesAddressTransactionBuffer(builder); - builder.finish(codedAccountPropertiesAddress); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesAddressTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts b/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts deleted file mode 100644 index 094d2bb1dc..0000000000 --- a/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesEntityTypeTransaction - */ -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesEntityTypeTransactionBufferPackage from '../buffers/AccountPropertiesEntityTypeTransactionBuffer'; -import AccountPropertiesEntityTypeModificationTransactionSchema from '../schemas/AccountPropertiesEntityTypeModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; - -const { - AccountPropertiesEntityTypeTransactionBuffer, - PropertyEntityTypeModificationBuffer, -} = AccountPropertiesEntityTypeTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesEntityTypeTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesEntityTypeModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - PropertyEntityTypeModificationBuffer.startPropertyEntityTypeModificationBuffer(builder); - PropertyEntityTypeModificationBuffer.addModificationType(builder, modification.type); - PropertyEntityTypeModificationBuffer.addValue(builder, modification.value); - modificationsArray.push(PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesEntityTypeTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesEntityTypeTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesEntityTypeTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesEntityTypeTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesEntityTypeTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesEntityTypeTransactionBuffer.startAccountPropertiesEntityTypeTransactionBuffer(builder); - AccountPropertiesEntityTypeTransactionBuffer.addSize(builder, 122 + (3 * this.modifications.length)); - AccountPropertiesEntityTypeTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesEntityTypeTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesEntityTypeTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesEntityTypeTransactionBuffer.addType(builder, this.type); - AccountPropertiesEntityTypeTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesEntityTypeTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesEntityTypeTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesEntityTypeTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesEntityTypeTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesAddress = AccountPropertiesEntityTypeTransactionBuffer - .endAccountPropertiesEntityTypeTransactionBuffer(builder); - builder.finish(codedAccountPropertiesAddress); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesEntityTypeTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts b/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts deleted file mode 100644 index 3842421260..0000000000 --- a/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesMosaicTransaction - */ -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesMosaicTransactionBufferPackage from '../buffers/AccountPropertiesMosaicTransactionBuffer'; -import AccountPropertiesMosaicModificationTransactionSchema from '../schemas/AccountPropertiesMosaicModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; - -const { - AccountPropertiesMosaicTransactionBuffer, - PropertyMosaicModificationBuffer, -} = AccountPropertiesMosaicTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesMosaicTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesMosaicModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - const addressModificationVector = PropertyMosaicModificationBuffer - .createValueVector(builder, modification.value); - PropertyMosaicModificationBuffer.startPropertyMosaicModificationBuffer(builder); - PropertyMosaicModificationBuffer.addModificationType(builder, modification.type); - PropertyMosaicModificationBuffer.addValue(builder, addressModificationVector); - modificationsArray.push(PropertyMosaicModificationBuffer.endPropertyMosaicModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesMosaicTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesMosaicTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesMosaicTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesMosaicTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesMosaicTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesMosaicTransactionBuffer.startAccountPropertiesMosaicTransactionBuffer(builder); - AccountPropertiesMosaicTransactionBuffer.addSize(builder, 122 + (9 * this.modifications.length)); - AccountPropertiesMosaicTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesMosaicTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesMosaicTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesMosaicTransactionBuffer.addType(builder, this.type); - AccountPropertiesMosaicTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesMosaicTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesMosaicTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesMosaicTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesMosaicTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesMosaic = AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMosaicTransactionBuffer(builder); - builder.finish(codedAccountPropertiesMosaic); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesMosaicTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts b/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts new file mode 100644 index 0000000000..452e4c30b7 --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts @@ -0,0 +1,128 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsAddressTransaction + */ +import { RawAddress as address } from '../../core/format'; +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsAddressTransactionBufferPackage from '../buffers/AccountRestrictionsAddressTransactionBuffer'; +import AccountRestrictionsAddressModificationTransactionSchema from '../schemas/AccountRestrictionsAddressModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; +const { + AccountRestrictionsAddressTransactionBuffer, + RestrictionAddressModificationBuffer, +} = AccountRestrictionsAddressTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsAddressTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsAddressModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + const addressModificationVector = RestrictionAddressModificationBuffer + .createValueVector(builder, address.stringToAddress(modification.value)); + RestrictionAddressModificationBuffer.startRestrictionAddressModificationBuffer(builder); + RestrictionAddressModificationBuffer.addModificationType(builder, modification.type); + RestrictionAddressModificationBuffer.addValue(builder, addressModificationVector); + modificationsArray.push(RestrictionAddressModificationBuffer.endRestrictionAddressModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsAddressTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsAddressTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsAddressTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsAddressTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsAddressTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsAddressTransactionBuffer.startAccountRestrictionsAddressTransactionBuffer(builder); + AccountRestrictionsAddressTransactionBuffer.addSize(builder, 122 + (26 * this.modifications.length)); + AccountRestrictionsAddressTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsAddressTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsAddressTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsAddressTransactionBuffer.addType(builder, this.type); + AccountRestrictionsAddressTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsAddressTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsAddressTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsAddressTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsAddressTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsAddress = + AccountRestrictionsAddressTransactionBuffer.endAccountRestrictionsAddressTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsAddress); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsAddressTransaction(bytes); + } +} diff --git a/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts b/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts new file mode 100644 index 0000000000..edfed292ba --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts @@ -0,0 +1,126 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsEntityTypeTransaction + */ +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsEntityTypeTransactionBufferPackage from '../buffers/AccountRestrictionsEntityTypeTransactionBuffer'; +import AccountRestrictionsEntityTypeModificationTransactionSchema from '../schemas/AccountRestrictionsEntityTypeModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; + +const { + AccountRestrictionsEntityTypeTransactionBuffer, + RestrictionEntityTypeModificationBuffer, +} = AccountRestrictionsEntityTypeTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsEntityTypeTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsEntityTypeModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + RestrictionEntityTypeModificationBuffer.startRestrictionEntityTypeModificationBuffer(builder); + RestrictionEntityTypeModificationBuffer.addModificationType(builder, modification.type); + RestrictionEntityTypeModificationBuffer.addValue(builder, modification.value); + modificationsArray.push(RestrictionEntityTypeModificationBuffer.endRestrictionEntityTypeModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsEntityTypeTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsEntityTypeTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsEntityTypeTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsEntityTypeTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsEntityTypeTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsEntityTypeTransactionBuffer.startAccountRestrictionsEntityTypeTransactionBuffer(builder); + AccountRestrictionsEntityTypeTransactionBuffer.addSize(builder, 122 + (3 * this.modifications.length)); + AccountRestrictionsEntityTypeTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsEntityTypeTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsEntityTypeTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsEntityTypeTransactionBuffer.addType(builder, this.type); + AccountRestrictionsEntityTypeTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsEntityTypeTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsEntityTypeTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsEntityTypeTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsEntityTypeTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsAddress = AccountRestrictionsEntityTypeTransactionBuffer + .endAccountRestrictionsEntityTypeTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsAddress); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsEntityTypeTransaction(bytes); + } +} diff --git a/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts b/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts new file mode 100644 index 0000000000..ec97bcc02e --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts @@ -0,0 +1,127 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsMosaicTransaction + */ +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsMosaicTransactionBufferPackage from '../buffers/AccountRestrictionsMosaicTransactionBuffer'; +import AccountRestrictionsMosaicModificationTransactionSchema from '../schemas/AccountRestrictionsMosaicModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; + +const { + AccountRestrictionsMosaicTransactionBuffer, + RestrictionMosaicModificationBuffer, +} = AccountRestrictionsMosaicTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsMosaicTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsMosaicModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + const addressModificationVector = RestrictionMosaicModificationBuffer + .createValueVector(builder, modification.value); + RestrictionMosaicModificationBuffer.startRestrictionMosaicModificationBuffer(builder); + RestrictionMosaicModificationBuffer.addModificationType(builder, modification.type); + RestrictionMosaicModificationBuffer.addValue(builder, addressModificationVector); + modificationsArray.push(RestrictionMosaicModificationBuffer.endRestrictionMosaicModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsMosaicTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsMosaicTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsMosaicTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsMosaicTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsMosaicTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsMosaicTransactionBuffer.startAccountRestrictionsMosaicTransactionBuffer(builder); + AccountRestrictionsMosaicTransactionBuffer.addSize(builder, 122 + (9 * this.modifications.length)); + AccountRestrictionsMosaicTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsMosaicTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsMosaicTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsMosaicTransactionBuffer.addType(builder, this.type); + AccountRestrictionsMosaicTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsMosaicTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsMosaicTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsMosaicTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsMosaicTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsMosaic = AccountRestrictionsMosaicTransactionBuffer.endAccountRestrictionsMosaicTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsMosaic); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsMosaicTransaction(bytes); + } +} diff --git a/src/infrastructure/model/accountDTO.ts b/src/infrastructure/model/accountDTO.ts index a312272c82..0b3890eea9 100644 --- a/src/infrastructure/model/accountDTO.ts +++ b/src/infrastructure/model/accountDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountIds.ts b/src/infrastructure/model/accountIds.ts index 2152a05918..1da22f763f 100644 --- a/src/infrastructure/model/accountIds.ts +++ b/src/infrastructure/model/accountIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountInfoDTO.ts b/src/infrastructure/model/accountInfoDTO.ts index b29f9fffa6..e2a190f4d9 100644 --- a/src/infrastructure/model/accountInfoDTO.ts +++ b/src/infrastructure/model/accountInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountMetaDTO.ts b/src/infrastructure/model/accountMetaDTO.ts index fd30c7da9a..f5b7b16602 100644 --- a/src/infrastructure/model/accountMetaDTO.ts +++ b/src/infrastructure/model/accountMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountNamesDTO.ts b/src/infrastructure/model/accountNamesDTO.ts index 5a4bbf42a3..b6e99a36cb 100644 --- a/src/infrastructure/model/accountNamesDTO.ts +++ b/src/infrastructure/model/accountNamesDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export class AccountNamesDTO { /** - * The address of the account in base 32. + * The address of the account in hexadecimal. */ 'address': string; /** diff --git a/src/infrastructure/model/accountPropertyDTO.ts b/src/infrastructure/model/accountRestrictionDTO.ts similarity index 72% rename from src/infrastructure/model/accountPropertyDTO.ts rename to src/infrastructure/model/accountRestrictionDTO.ts index 8b1cdef1a3..0da2925a92 100644 --- a/src/infrastructure/model/accountPropertyDTO.ts +++ b/src/infrastructure/model/accountRestrictionDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,12 +25,12 @@ * Do not edit the class manually. */ -import { AccountPropertyTypeEnum } from './accountPropertyTypeEnum'; +import { AccountRestrictionTypeEnum } from './accountRestrictionTypeEnum'; -export class AccountPropertyDTO { - 'propertyType': AccountPropertyTypeEnum; +export class AccountRestrictionDTO { + 'restrictionType': AccountRestrictionTypeEnum; /** - * The address, transaction type or mosaic id to filter. + * The address, transaction type or mosaic id to restrict. */ 'values': Array; @@ -38,9 +38,9 @@ export class AccountPropertyDTO { static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "propertyType", - "baseName": "propertyType", - "type": "AccountPropertyTypeEnum" + "name": "restrictionType", + "baseName": "restrictionType", + "type": "AccountRestrictionTypeEnum" }, { "name": "values", @@ -49,7 +49,7 @@ export class AccountPropertyDTO { } ]; static getAttributeTypeMap() { - return AccountPropertyDTO.attributeTypeMap; + return AccountRestrictionDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertyTypeEnum.ts b/src/infrastructure/model/accountRestrictionTypeEnum.ts similarity index 56% rename from src/infrastructure/model/accountPropertyTypeEnum.ts rename to src/infrastructure/model/accountRestrictionTypeEnum.ts index 6195456edd..f23969ad40 100644 --- a/src/infrastructure/model/accountPropertyTypeEnum.ts +++ b/src/infrastructure/model/accountRestrictionTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,9 +27,9 @@ /** -* The account properties type: * 0x01 (1 decimal) - The property type only allows receiving transactions from an address. * 0x02 (2 decimal) - The property type only allows receiving transactions containing a mosaic id. * 0x04 (4 decimal) - The property type only allows sending transactions with a given transaction type. * 0x05 (5 decimal) - Property type sentinel. * 0x81 (129 decimal) - The property type blocks receiving transactions from an address. * 0x82 (130 decimal) - The property type blocks receiving transactions containing a mosaic id. * 0x84 (132 decimal) - The property type blocks sending transactions with a given transaction type. +* The account restriction type: * 0x01 (1 decimal) - Allow only receiving transactions from an address. * 0x02 (2 decimal) - Allow only receiving transactions containing a mosaic id. * 0x04 (4 decimal) - Allow only sending transactions with a given transaction type. * 0x05 (5 decimal) - Restriction type sentinel. * 0x81 (129 decimal) - Block receiving transactions from an address. * 0x82 (130 decimal) - Block receiving transactions containing a mosaic id. * 0x84 (132 decimal) - Block sending transactions with a given transaction type. */ -export class AccountPropertyTypeEnum { +export class AccountRestrictionTypeEnum { static discriminator: string | undefined = undefined; @@ -37,7 +37,7 @@ export class AccountPropertyTypeEnum { ]; static getAttributeTypeMap() { - return AccountPropertyTypeEnum.attributeTypeMap; + return AccountRestrictionTypeEnum.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertiesDTO.ts b/src/infrastructure/model/accountRestrictionsDTO.ts similarity index 76% rename from src/infrastructure/model/accountPropertiesDTO.ts rename to src/infrastructure/model/accountRestrictionsDTO.ts index 27cd8a4dba..61512ce91f 100644 --- a/src/infrastructure/model/accountPropertiesDTO.ts +++ b/src/infrastructure/model/accountRestrictionsDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,14 +25,14 @@ * Do not edit the class manually. */ -import { AccountPropertyDTO } from './accountPropertyDTO'; +import { AccountRestrictionDTO } from './accountRestrictionDTO'; -export class AccountPropertiesDTO { +export class AccountRestrictionsDTO { /** * The address of the account in hexadecimal. */ 'address': string; - 'properties': Array; + 'restrictions': Array; static discriminator: string | undefined = undefined; @@ -43,13 +43,13 @@ export class AccountPropertiesDTO { "type": "string" }, { - "name": "properties", - "baseName": "properties", - "type": "Array" + "name": "restrictions", + "baseName": "restrictions", + "type": "Array" } ]; static getAttributeTypeMap() { - return AccountPropertiesDTO.attributeTypeMap; + return AccountRestrictionsDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertiesInfoDTO.ts b/src/infrastructure/model/accountRestrictionsInfoDTO.ts similarity index 71% rename from src/infrastructure/model/accountPropertiesInfoDTO.ts rename to src/infrastructure/model/accountRestrictionsInfoDTO.ts index 097a9c9649..8dc7cacf80 100644 --- a/src/infrastructure/model/accountPropertiesInfoDTO.ts +++ b/src/infrastructure/model/accountRestrictionsInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,22 +25,22 @@ * Do not edit the class manually. */ -import { AccountPropertiesDTO } from './accountPropertiesDTO'; +import { AccountRestrictionsDTO } from './accountRestrictionsDTO'; -export class AccountPropertiesInfoDTO { - 'accountProperties': AccountPropertiesDTO; +export class AccountRestrictionsInfoDTO { + 'accountRestrictions': AccountRestrictionsDTO; static discriminator: string | undefined = undefined; static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "accountProperties", - "baseName": "accountProperties", - "type": "AccountPropertiesDTO" + "name": "accountRestrictions", + "baseName": "accountRestrictions", + "type": "AccountRestrictionsDTO" } ]; static getAttributeTypeMap() { - return AccountPropertiesInfoDTO.attributeTypeMap; + return AccountRestrictionsInfoDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/aliasDTO.ts b/src/infrastructure/model/aliasDTO.ts index c1d05bdeb7..06056e902c 100644 --- a/src/infrastructure/model/aliasDTO.ts +++ b/src/infrastructure/model/aliasDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/aliasTypeEnum.ts b/src/infrastructure/model/aliasTypeEnum.ts index c3eb306311..8035ecd711 100644 --- a/src/infrastructure/model/aliasTypeEnum.ts +++ b/src/infrastructure/model/aliasTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/announceTransactionInfoDTO.ts b/src/infrastructure/model/announceTransactionInfoDTO.ts index 9a0bd590cc..298c4d310e 100644 --- a/src/infrastructure/model/announceTransactionInfoDTO.ts +++ b/src/infrastructure/model/announceTransactionInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockDTO.ts b/src/infrastructure/model/blockDTO.ts index 178c52f7a0..4182db536a 100644 --- a/src/infrastructure/model/blockDTO.ts +++ b/src/infrastructure/model/blockDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockInfoDTO.ts b/src/infrastructure/model/blockInfoDTO.ts index 8472c92e20..e64ced621a 100644 --- a/src/infrastructure/model/blockInfoDTO.ts +++ b/src/infrastructure/model/blockInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockMetaDTO.ts b/src/infrastructure/model/blockMetaDTO.ts index 42cf4d7f93..d37bd8c65d 100644 --- a/src/infrastructure/model/blockMetaDTO.ts +++ b/src/infrastructure/model/blockMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockchainScoreDTO.ts b/src/infrastructure/model/blockchainScoreDTO.ts index e878826403..a5498b09d4 100644 --- a/src/infrastructure/model/blockchainScoreDTO.ts +++ b/src/infrastructure/model/blockchainScoreDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/communicationTimestamps.ts b/src/infrastructure/model/communicationTimestamps.ts index aac9258c6e..e44d99a240 100644 --- a/src/infrastructure/model/communicationTimestamps.ts +++ b/src/infrastructure/model/communicationTimestamps.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/cosignature.ts b/src/infrastructure/model/cosignature.ts index c3f5fea38f..4e078d0794 100644 --- a/src/infrastructure/model/cosignature.ts +++ b/src/infrastructure/model/cosignature.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/heightInfoDTO.ts b/src/infrastructure/model/heightInfoDTO.ts index 14276bc9a3..53f49ef78a 100644 --- a/src/infrastructure/model/heightInfoDTO.ts +++ b/src/infrastructure/model/heightInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merklePathItem.ts b/src/infrastructure/model/merklePathItem.ts index 475550c6f5..fe4e09e439 100644 --- a/src/infrastructure/model/merklePathItem.ts +++ b/src/infrastructure/model/merklePathItem.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merkleProofInfo.ts b/src/infrastructure/model/merkleProofInfo.ts index 1b43545088..736671acb0 100644 --- a/src/infrastructure/model/merkleProofInfo.ts +++ b/src/infrastructure/model/merkleProofInfo.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merkleProofInfoDTO.ts b/src/infrastructure/model/merkleProofInfoDTO.ts index d11326ff87..8e46199b97 100644 --- a/src/infrastructure/model/merkleProofInfoDTO.ts +++ b/src/infrastructure/model/merkleProofInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/models.ts b/src/infrastructure/model/models.ts index e80d56cb48..79ac71b3db 100644 --- a/src/infrastructure/model/models.ts +++ b/src/infrastructure/model/models.ts @@ -29,10 +29,10 @@ export * from './accountIds'; export * from './accountInfoDTO'; export * from './accountMetaDTO'; export * from './accountNamesDTO'; -export * from './accountPropertiesDTO'; -export * from './accountPropertiesInfoDTO'; -export * from './accountPropertyDTO'; -export * from './accountPropertyTypeEnum'; +export * from './accountRestrictionDTO'; +export * from './accountRestrictionTypeEnum'; +export * from './accountRestrictionsDTO'; +export * from './accountRestrictionsInfoDTO'; export * from './aliasDTO'; export * from './aliasTypeEnum'; export * from './announceTransactionInfoDTO'; @@ -91,10 +91,10 @@ import { AccountIds } from './accountIds'; import { AccountInfoDTO } from './accountInfoDTO'; import { AccountMetaDTO } from './accountMetaDTO'; import { AccountNamesDTO } from './accountNamesDTO'; -import { AccountPropertiesDTO } from './accountPropertiesDTO'; -import { AccountPropertiesInfoDTO } from './accountPropertiesInfoDTO'; -import { AccountPropertyDTO } from './accountPropertyDTO'; -import { AccountPropertyTypeEnum } from './accountPropertyTypeEnum'; +import { AccountRestrictionDTO } from './accountRestrictionDTO'; +import { AccountRestrictionTypeEnum } from './accountRestrictionTypeEnum'; +import { AccountRestrictionsDTO } from './accountRestrictionsDTO'; +import { AccountRestrictionsInfoDTO } from './accountRestrictionsInfoDTO'; import { AliasDTO } from './aliasDTO'; import { AliasTypeEnum } from './aliasTypeEnum'; import { AnnounceTransactionInfoDTO } from './announceTransactionInfoDTO'; @@ -159,7 +159,7 @@ let primitives = [ ]; let enumsMap: {[index: string]: any} = { - "AccountPropertyTypeEnum": AccountPropertyTypeEnum, + "AliasTypeEnum": AliasTypeEnum, "MosaicPropertyIdEnum": MosaicPropertyIdEnum, "MultisigModificationTypeEnum": MultisigModificationTypeEnum, @@ -174,9 +174,10 @@ let typeMap: {[index: string]: any} = { "AccountInfoDTO": AccountInfoDTO, "AccountMetaDTO": AccountMetaDTO, "AccountNamesDTO": AccountNamesDTO, - "AccountPropertiesDTO": AccountPropertiesDTO, - "AccountPropertiesInfoDTO": AccountPropertiesInfoDTO, - "AccountPropertyDTO": AccountPropertyDTO, + "AccountRestrictionDTO": AccountRestrictionDTO, + "AccountRestrictionTypeEnum": AccountRestrictionTypeEnum, + "AccountRestrictionsDTO": AccountRestrictionsDTO, + "AccountRestrictionsInfoDTO": AccountRestrictionsInfoDTO, "AliasDTO": AliasDTO, "AnnounceTransactionInfoDTO": AnnounceTransactionInfoDTO, "BlockDTO": BlockDTO, diff --git a/src/infrastructure/model/mosaicDTO.ts b/src/infrastructure/model/mosaicDTO.ts index 6d378dd0e7..a929869893 100644 --- a/src/infrastructure/model/mosaicDTO.ts +++ b/src/infrastructure/model/mosaicDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicDefinitionDTO.ts b/src/infrastructure/model/mosaicDefinitionDTO.ts index 852beca482..a4582269be 100644 --- a/src/infrastructure/model/mosaicDefinitionDTO.ts +++ b/src/infrastructure/model/mosaicDefinitionDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicIds.ts b/src/infrastructure/model/mosaicIds.ts index 1835e0f87c..0cf86352e0 100644 --- a/src/infrastructure/model/mosaicIds.ts +++ b/src/infrastructure/model/mosaicIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicInfoDTO.ts b/src/infrastructure/model/mosaicInfoDTO.ts index 3c47234a50..d3f22605f6 100644 --- a/src/infrastructure/model/mosaicInfoDTO.ts +++ b/src/infrastructure/model/mosaicInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicMetaDTO.ts b/src/infrastructure/model/mosaicMetaDTO.ts index 25725c93aa..845c13a39a 100644 --- a/src/infrastructure/model/mosaicMetaDTO.ts +++ b/src/infrastructure/model/mosaicMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicNamesDTO.ts b/src/infrastructure/model/mosaicNamesDTO.ts index b45f1934f9..e9413ce9be 100644 --- a/src/infrastructure/model/mosaicNamesDTO.ts +++ b/src/infrastructure/model/mosaicNamesDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicPropertyDTO.ts b/src/infrastructure/model/mosaicPropertyDTO.ts index 9f480d6fa0..90f9bde59c 100644 --- a/src/infrastructure/model/mosaicPropertyDTO.ts +++ b/src/infrastructure/model/mosaicPropertyDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicPropertyIdEnum.ts b/src/infrastructure/model/mosaicPropertyIdEnum.ts index 02542b4b78..6f739ec065 100644 --- a/src/infrastructure/model/mosaicPropertyIdEnum.ts +++ b/src/infrastructure/model/mosaicPropertyIdEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigAccountGraphInfoDTO.ts b/src/infrastructure/model/multisigAccountGraphInfoDTO.ts index 20a3e027ae..d004a7ce63 100644 --- a/src/infrastructure/model/multisigAccountGraphInfoDTO.ts +++ b/src/infrastructure/model/multisigAccountGraphInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigAccountInfoDTO.ts b/src/infrastructure/model/multisigAccountInfoDTO.ts index 5cc02e4c4d..59b5c8e55c 100644 --- a/src/infrastructure/model/multisigAccountInfoDTO.ts +++ b/src/infrastructure/model/multisigAccountInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigDTO.ts b/src/infrastructure/model/multisigDTO.ts index 3ad10b6d94..011353a2f3 100644 --- a/src/infrastructure/model/multisigDTO.ts +++ b/src/infrastructure/model/multisigDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigModificationTypeEnum.ts b/src/infrastructure/model/multisigModificationTypeEnum.ts index 248b06a1ba..3107b46071 100644 --- a/src/infrastructure/model/multisigModificationTypeEnum.ts +++ b/src/infrastructure/model/multisigModificationTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceDTO.ts b/src/infrastructure/model/namespaceDTO.ts index 6836a3564c..68f20c9d7b 100644 --- a/src/infrastructure/model/namespaceDTO.ts +++ b/src/infrastructure/model/namespaceDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceIds.ts b/src/infrastructure/model/namespaceIds.ts index 684e8c89a9..24f633f1c4 100644 --- a/src/infrastructure/model/namespaceIds.ts +++ b/src/infrastructure/model/namespaceIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceInfoDTO.ts b/src/infrastructure/model/namespaceInfoDTO.ts index 084ba6da75..dceebf799a 100644 --- a/src/infrastructure/model/namespaceInfoDTO.ts +++ b/src/infrastructure/model/namespaceInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceMetaDTO.ts b/src/infrastructure/model/namespaceMetaDTO.ts index 13f3557d7f..cb6640b594 100644 --- a/src/infrastructure/model/namespaceMetaDTO.ts +++ b/src/infrastructure/model/namespaceMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceNameDTO.ts b/src/infrastructure/model/namespaceNameDTO.ts index 9a8eef6567..7cd704e180 100644 --- a/src/infrastructure/model/namespaceNameDTO.ts +++ b/src/infrastructure/model/namespaceNameDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceTypeEnum.ts b/src/infrastructure/model/namespaceTypeEnum.ts index 81ae70d2af..9e78121039 100644 --- a/src/infrastructure/model/namespaceTypeEnum.ts +++ b/src/infrastructure/model/namespaceTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/networkTypeDTO.ts b/src/infrastructure/model/networkTypeDTO.ts index 8994ce3c30..0df44f1af7 100644 --- a/src/infrastructure/model/networkTypeDTO.ts +++ b/src/infrastructure/model/networkTypeDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/nodeInfoDTO.ts b/src/infrastructure/model/nodeInfoDTO.ts index c4786b709d..a44c736793 100644 --- a/src/infrastructure/model/nodeInfoDTO.ts +++ b/src/infrastructure/model/nodeInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/nodeTimeDTO.ts b/src/infrastructure/model/nodeTimeDTO.ts index d1a61ad09d..dda0b6eaa4 100644 --- a/src/infrastructure/model/nodeTimeDTO.ts +++ b/src/infrastructure/model/nodeTimeDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/receiptTypeEnum.ts b/src/infrastructure/model/receiptTypeEnum.ts index 3083c95477..7c2b4981fa 100644 --- a/src/infrastructure/model/receiptTypeEnum.ts +++ b/src/infrastructure/model/receiptTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/resolutionEntryDTO.ts b/src/infrastructure/model/resolutionEntryDTO.ts index 32569b9855..e0f1328c48 100644 --- a/src/infrastructure/model/resolutionEntryDTO.ts +++ b/src/infrastructure/model/resolutionEntryDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/resolutionStatementDTO.ts b/src/infrastructure/model/resolutionStatementDTO.ts index d7de883078..ab58575eb1 100644 --- a/src/infrastructure/model/resolutionStatementDTO.ts +++ b/src/infrastructure/model/resolutionStatementDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/rolesTypeEnum.ts b/src/infrastructure/model/rolesTypeEnum.ts index a0b91d7a13..1b7cd9a3bb 100644 --- a/src/infrastructure/model/rolesTypeEnum.ts +++ b/src/infrastructure/model/rolesTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/serverDTO.ts b/src/infrastructure/model/serverDTO.ts index 0cb1e94b98..ea725312b5 100644 --- a/src/infrastructure/model/serverDTO.ts +++ b/src/infrastructure/model/serverDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/serverInfoDTO.ts b/src/infrastructure/model/serverInfoDTO.ts index 9a1ce8b75f..6dd2fd1b2d 100644 --- a/src/infrastructure/model/serverInfoDTO.ts +++ b/src/infrastructure/model/serverInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/sourceDTO.ts b/src/infrastructure/model/sourceDTO.ts index b88167f350..d57091485c 100644 --- a/src/infrastructure/model/sourceDTO.ts +++ b/src/infrastructure/model/sourceDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/statementsDTO.ts b/src/infrastructure/model/statementsDTO.ts index a7f5016e89..35d64d7a68 100644 --- a/src/infrastructure/model/statementsDTO.ts +++ b/src/infrastructure/model/statementsDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/storageInfoDTO.ts b/src/infrastructure/model/storageInfoDTO.ts index 78c7bacd71..672a18ba13 100644 --- a/src/infrastructure/model/storageInfoDTO.ts +++ b/src/infrastructure/model/storageInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionHashes.ts b/src/infrastructure/model/transactionHashes.ts index 00a2aaf043..40b833628d 100644 --- a/src/infrastructure/model/transactionHashes.ts +++ b/src/infrastructure/model/transactionHashes.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionIds.ts b/src/infrastructure/model/transactionIds.ts index 9f9c4c8ed0..745788bae6 100644 --- a/src/infrastructure/model/transactionIds.ts +++ b/src/infrastructure/model/transactionIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionInfoDTO.ts b/src/infrastructure/model/transactionInfoDTO.ts index 935036c58a..73901a3a24 100644 --- a/src/infrastructure/model/transactionInfoDTO.ts +++ b/src/infrastructure/model/transactionInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionMetaDTO.ts b/src/infrastructure/model/transactionMetaDTO.ts index d264c1c74c..c6e9e626a4 100644 --- a/src/infrastructure/model/transactionMetaDTO.ts +++ b/src/infrastructure/model/transactionMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionPayload.ts b/src/infrastructure/model/transactionPayload.ts index dcd42913a6..ff83fbb12a 100644 --- a/src/infrastructure/model/transactionPayload.ts +++ b/src/infrastructure/model/transactionPayload.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionStatementDTO.ts b/src/infrastructure/model/transactionStatementDTO.ts index 999e49a2e2..7f0a9959e9 100644 --- a/src/infrastructure/model/transactionStatementDTO.ts +++ b/src/infrastructure/model/transactionStatementDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionStatusDTO.ts b/src/infrastructure/model/transactionStatusDTO.ts index 69d24befd9..8ae13588c0 100644 --- a/src/infrastructure/model/transactionStatusDTO.ts +++ b/src/infrastructure/model/transactionStatusDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts index 288fb34f23..f08fd0cda3 100644 --- a/src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesAddressModificationTransactionSchema + * @module schema/AccountRestrictionsAddressModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restriction address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts index 5c2373b1cc..6d9090a5c0 100644 --- a/src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesEntityTypeModificationTransactionSchema + * @module schema/AccountRestrictionsEntityTypeModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restrictions address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts index ce323b9e8c..557c38898e 100644 --- a/src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesMosaicModificationTransactionSchema + * @module schema/AccountRestrictionsMosaicModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restrictions address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 24ec79df98..aa094d8499 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -276,13 +276,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS) { return new AccountAddressRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, @@ -292,13 +292,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION) { return new AccountOperationRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, @@ -308,13 +308,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC) { return new AccountMosaicRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 7deb62836c..2759ad3f3c 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -98,9 +98,9 @@ export const CreateTransactionFromPayload = (transactionBinary: string): Transac */ const CreateTransaction = (type: number, transactionData: string, networkType: NetworkType, deadline: number[]): Transaction => { switch (type) { - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: const propertyTypeLength = 2; const modificationCountOffset = propertyTypeLength; @@ -112,7 +112,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N const modificationArray = modifications.match(/.{1,52}/g); switch (type) { - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: const t = AccountAddressRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -123,7 +123,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); return t; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: return AccountMosaicRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -133,7 +133,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N )) : [], networkType, ); - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: return AccountOperationRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -145,7 +145,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); } - throw new Error ('Account property transaction type not recognised.'); + throw new Error ('Account restriction transaction type not recognised.'); case TransactionType.LINK_ACCOUNT: // read bytes const remoteAccountKey = transactionData.substring(0, 64); diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index 9f97dc3f60..c73bd0bd93 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -68,25 +68,25 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { duration: (transaction as LockFundsTransaction).duration.toDTO(), hash: (transaction as LockFundsTransaction).hash, }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: return { - propertyType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: return { - propertyType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: return { - propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index 3d3859b116..3a9d99f813 100644 --- a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesAddressTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsAddressTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { return new AccountAddressRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_ADDRESS, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio // - 25 bytes for the modification value (address) const byteModifications = 26 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index ea0f25213a..3a32656795 100644 --- a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesMosaicTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsMosaicTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { return new AccountMosaicRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_MOSAIC, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction // - 8 bytes for the modification value (mosaicId) const byteModifications = 9 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 946dd024ed..38160cc79d 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { return new AccountOperationRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_ENTITY_TYPE, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountOperationRestrictionModificationTransaction extends Transact signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact // - 2 bytes for the modification value (transaction type) const byteModifications = 3 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountRestrictionModification.ts b/src/model/transaction/AccountRestrictionModification.ts index 8cbecf298a..599a61ae65 100644 --- a/src/model/transaction/AccountRestrictionModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -39,7 +39,7 @@ export class AccountRestrictionModification { } /** - * Create an address filter for account property modification + * Create an address filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove * @param address - modification value (Address) * @returns {AccountRestrictionModification} @@ -49,7 +49,7 @@ export class AccountRestrictionModification { return new AccountRestrictionModification(modificationType, address.plain()); } /** - * Create an mosaic filter for account property modification + * Create an mosaic filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove * @param mosaicId - modification value (Mosaic) * @returns {AccountRestrictionModification} @@ -60,14 +60,14 @@ export class AccountRestrictionModification { } /** - * Create an entity type filter for account property modification + * Create an operation filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove - * @param entityType - modification value (Transaction Type) + * @param operation - modification value (Transaction Type) * @returns {AccountRestrictionModification} */ - public static createForEntityType(modificationType: RestrictionModificationType, - entityType: number): AccountRestrictionModification { - return new AccountRestrictionModification(modificationType, entityType); + public static createForOperation(modificationType: RestrictionModificationType, + operation: number): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, operation); } /** diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index e5de1db525..7e0f26c313 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -34,7 +34,7 @@ export class AccountRestrictionTransaction { * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ - public static createAddressPropertyModificationTransaction( + public static createAddressRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -42,7 +42,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountAddressRestrictionModificationTransaction { if (![RestrictionType.AllowAddress, RestrictionType.BlockAddress].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountAddressRestrictionModificationTransaction.create( deadline, @@ -62,7 +62,7 @@ export class AccountRestrictionTransaction { * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountMosaicRestrictionModificationTransaction} */ - public static createMosaicPropertyModificationTransaction( + public static createMosaicRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -70,7 +70,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountMosaicRestrictionModificationTransaction { if (![RestrictionType.AllowMosaic, RestrictionType.BlockMosaic].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountMosaicRestrictionModificationTransaction.create( deadline, @@ -84,13 +84,13 @@ export class AccountRestrictionTransaction { /** * Create an account operation restriction transaction object * @param deadline - The deadline to include the transaction. - * @param restrictionType - Type of account property transaction - * @param modification - array of entity type modifications + * @param restrictionType - Type of account restriction transaction + * @param modification - array of operation modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountOperationRestrictionModificationTransaction} + * @returns {createOperationRestrictionModificationTransaction} */ - public static createEntityTypePropertyModificationTransaction( + public static createOperationRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -98,7 +98,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountOperationRestrictionModificationTransaction { if (![RestrictionType.AllowTransaction, RestrictionType.BlockTransaction].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountOperationRestrictionModificationTransaction.create( deadline, diff --git a/src/model/transaction/TransactionType.ts b/src/model/transaction/TransactionType.ts index 07632512a1..2ff0f82e50 100644 --- a/src/model/transaction/TransactionType.ts +++ b/src/model/transaction/TransactionType.ts @@ -91,22 +91,22 @@ export class TransactionType { public static readonly SECRET_PROOF = 0x4252; /** - * Account property address transaction type + * Account restriction address transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ADDRESS = 0x4150; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ADDRESS = 0x4150; /** - * Account property mosaic transaction type + * Account restriction mosaic transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_MOSAIC = 0x4250; + public static readonly MODIFY_ACCOUNT_RESTRICTION_MOSAIC = 0x4250; /** - * Account property entity type transaction type + * Account restriction operation transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE = 0x4350; + public static readonly MODIFY_ACCOUNT_RESTRICTION_OPERATION = 0x4350; /** * Link account transaction type diff --git a/src/model/transaction/TransactionVersion.ts b/src/model/transaction/TransactionVersion.ts index 5f90e38a46..d7446f12ec 100644 --- a/src/model/transaction/TransactionVersion.ts +++ b/src/model/transaction/TransactionVersion.ts @@ -101,22 +101,22 @@ export class TransactionVersion { public static readonly MOSAIC_ALIAS = 0x01; /** - * Account Property address transaction version + * Account Restriction address transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ADDRESS = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ADDRESS = 0x01; /** - * Account Property mosaic transaction version + * Account Restriction mosaic transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_MOSAIC = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_MOSAIC = 0x01; /** - * Account Property entity type transaction version + * Account Restriction operation transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ENTITY_TYPE = 0x01; /** * Link account transaction version diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index 4d2c31247a..c536e14c06 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -21,9 +21,9 @@ import {Convert as convert} from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; +import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import { EncryptedMessage } from '../../../src/model/model'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; @@ -34,7 +34,9 @@ import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrency import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; +import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; @@ -44,8 +46,6 @@ import { HashType } from '../../../src/model/transaction/HashType'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MessageType } from '../../../src/model/transaction/MessageType'; -import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -68,20 +68,20 @@ describe('TransactionMapping - createFromPayload', () => { account = TestingAccount; }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); + const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; @@ -90,20 +90,20 @@ describe('TransactionMapping - createFromPayload', () => { expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); + const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); @@ -112,24 +112,24 @@ describe('TransactionMapping - createFromPayload', () => { expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionOperationTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); + const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); - expect(transaction.modifications[0].value).to.be.equal(entityType); + expect(transaction.modifications[0].value).to.be.equal(operation); expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); @@ -144,7 +144,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = addressAliasTransaction.signWith(account,generationHash); + const signedTransaction = addressAliasTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AddressAliasTransaction; @@ -190,7 +190,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -215,7 +215,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -238,7 +238,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -261,7 +261,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -284,7 +284,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -327,7 +327,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = transferTransaction.signWith(account,generationHash); + const signedTransaction = transferTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as TransferTransaction; @@ -468,7 +468,7 @@ describe('TransactionMapping - createFromPayload', () => { signedTransaction, NetworkType.MIJIN_TEST); - const signedLockFundTransaction = lockTransaction.signWith(account,generationHash); + const signedLockFundTransaction = lockTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedLockFundTransaction.payload) as LockFundsTransaction; @@ -597,65 +597,65 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => expect(transaction.linkAction).to.be.equal(LinkAction.Link); }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; + TransactionMapping.createFromDTO(addressRestrictionTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; + TransactionMapping.createFromDTO(mosaicRestrictionTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; - expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); + expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionMosaicTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; + TransactionMapping.createFromDTO(operationRestrictionTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; - expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); + expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications.length).to.be.equal(1); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index c2a3ab5b1c..5a13ee0d28 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -19,9 +19,9 @@ import { sha3_256 } from 'js-sha3'; import {Convert as convert} from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; +import { PublicAccount } from '../../src/model/account/PublicAccount'; import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../src/model/account/RestrictionType'; -import { PublicAccount } from '../../src/model/account/PublicAccount'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce'; @@ -75,63 +75,63 @@ describe('SerializeTransactionToJSON', () => { expect(json.transaction.action).to.be.equal(LinkAction.Link); }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = addressPropertyTransaction.toJSON(); + const json = addressRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowAddress); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); expect(json.transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = mosaicPropertyTransaction.toJSON(); + const json = mosaicRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowMosaic); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(json.transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionOperationTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = entityTypePropertyTransaction.toJSON(); + const json = operationRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowTransaction); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(json.transaction.modifications.length).to.be.equal(1); }); diff --git a/test/model/account/AccountRestriction.spec.ts b/test/model/account/AccountRestriction.spec.ts index 4f8481fc0e..5bc3e189b6 100644 --- a/test/model/account/AccountRestriction.spec.ts +++ b/test/model/account/AccountRestriction.spec.ts @@ -19,22 +19,22 @@ import {expect} from 'chai'; import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { Address } from '../../../src/model/account/Address'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -describe('AccountProperty', () => { +describe('AccountRestriction', () => { - it('should createComplete an AccountProperty object', () => { - const accountPropertyDTO = { - propertyType: RestrictionType.AllowAddress, + it('should createComplete an AccountRestriction object', () => { + const accountRestrictionDTO = { + restrictionType: RestrictionType.AllowAddress, values: ['906415867F121D037AF447E711B0F5E4D52EBBF066D96860EB'], }; const accountRestriction = new AccountRestriction( - accountPropertyDTO.propertyType, - accountPropertyDTO.values.map((value) => { + accountRestrictionDTO.restrictionType, + accountRestrictionDTO.values.map((value) => { return Address.createFromEncoded(value); }), ); - expect(accountRestriction.restrictionType).to.be.equal(accountPropertyDTO.propertyType); - deepEqual(accountRestriction.values.length, accountPropertyDTO.values.length); + expect(accountRestriction.restrictionType).to.be.equal(accountRestrictionDTO.restrictionType); + deepEqual(accountRestriction.values.length, accountRestrictionDTO.values.length); }); }); diff --git a/test/model/account/AccountRestrictions.spec.ts b/test/model/account/AccountRestrictions.spec.ts index 5f6d15059c..1ad76d7daa 100644 --- a/test/model/account/AccountRestrictions.spec.ts +++ b/test/model/account/AccountRestrictions.spec.ts @@ -19,13 +19,13 @@ import {expect} from 'chai'; import {Address} from '../../../src/model/account/Address'; import { AccountRestrictions, RestrictionModificationType, RestrictionType, AccountRestriction } from '../../../src/model/model'; -describe('AccountProperties', () => { +describe('AccountRestrictions', () => { - it('should createComplete an AccountProperties object', () => { - const accountPropertiesDTO = { + it('should createComplete an AccountRestrictions object', () => { + const accountRestrictionsDTO = { address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'), - properties: [{ - propertyType: RestrictionType.AllowAddress, + restrictions: [{ + restrictionType: RestrictionType.AllowAddress, values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], @@ -33,21 +33,21 @@ describe('AccountProperties', () => { }; const accountRestrictions = new AccountRestrictions( - accountPropertiesDTO.address, - accountPropertiesDTO.properties.map((r) => { + accountRestrictionsDTO.address, + accountRestrictionsDTO.restrictions.map((r) => { return new AccountRestriction( - r.propertyType, + r.restrictionType, r.values, ); }), ); - expect(accountRestrictions.address).to.be.equal(accountPropertiesDTO.address); - deepEqual(accountPropertiesDTO.properties.length, accountPropertiesDTO.properties.length); - deepEqual(accountPropertiesDTO.properties[0].propertyType, accountPropertiesDTO.properties[0].propertyType); - deepEqual(accountPropertiesDTO.properties[0].values.length, accountPropertiesDTO.properties[0].values.length); - deepEqual(accountPropertiesDTO.properties[0].values[0].modificationType, - accountPropertiesDTO.properties[0].values[0].modificationType); - deepEqual(accountPropertiesDTO.properties[0].values[0].value, accountPropertiesDTO.properties[0].values[0].value); + expect(accountRestrictions.address).to.be.equal(accountRestrictionsDTO.address); + deepEqual(accountRestrictions.restrictions.length, accountRestrictionsDTO.restrictions.length); + deepEqual(accountRestrictions.restrictions[0].restrictionType, accountRestrictionsDTO.restrictions[0].restrictionType); + deepEqual(accountRestrictions.restrictions[0].values.length, accountRestrictionsDTO.restrictions[0].values.length); + deepEqual((accountRestrictions.restrictions[0].values[0] as any).modificationType, + accountRestrictionsDTO.restrictions[0].values[0].modificationType); + deepEqual((accountRestrictions.restrictions[0].values[0] as any).value, accountRestrictionsDTO.restrictions[0].values[0].value); }); }); diff --git a/test/model/account/AccountRestrictionsInfo.spec.ts b/test/model/account/AccountRestrictionsInfo.spec.ts index 04d5f6f2fb..01ac4771f9 100644 --- a/test/model/account/AccountRestrictionsInfo.spec.ts +++ b/test/model/account/AccountRestrictionsInfo.spec.ts @@ -15,23 +15,23 @@ */ import {deepEqual} from 'assert'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { AccountRestrictions } from '../../../src/model/account/AccountRestrictions'; import { AccountRestrictionsInfo } from '../../../src/model/account/AccountRestrictionsInfo'; -import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import {Address} from '../../../src/model/account/Address'; import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -describe('AccountPropertiesInfo', () => { +describe('AccountRestrictionsInfo', () => { - it('should createComplete an AccountPropertiesInfo object', () => { + it('should createComplete an AccountRestrictionsInfo object', () => { - const accountPropertiesInfoDTO = { + const accountRestrictionsInfoDTO = { meta: {id: '12345'}, - accountProperties: { + accountRestrictions: { address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142', - properties: [{ - propertyType: RestrictionType.AllowAddress, + restrictions: [{ + restrictionType: RestrictionType.AllowAddress, values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], @@ -39,19 +39,19 @@ describe('AccountPropertiesInfo', () => { }, }; - const accountPropertiesInfo = new AccountRestrictionsInfo( - accountPropertiesInfoDTO.meta, - new AccountRestrictions(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), - accountPropertiesInfoDTO.accountProperties.properties.map((prop) => - new AccountRestriction(prop.propertyType, prop.values))), + const accountRestrictionsInfo = new AccountRestrictionsInfo( + accountRestrictionsInfoDTO.meta, + new AccountRestrictions(Address.createFromEncoded(accountRestrictionsInfoDTO.accountRestrictions.address), + accountRestrictionsInfoDTO.accountRestrictions.restrictions.map((prop) => + new AccountRestriction(prop.restrictionType, prop.values))), ); - deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id); - deepEqual(accountPropertiesInfo.accountRestrictions.address, - Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address)); - deepEqual(accountPropertiesInfo.accountRestrictions.restrictions.length, - accountPropertiesInfoDTO.accountProperties.properties.length); - deepEqual(accountPropertiesInfo.accountRestrictions.restrictions[0].values[0], - accountPropertiesInfoDTO.accountProperties.properties[0].values[0]); + deepEqual(accountRestrictionsInfo.meta.id, accountRestrictionsInfoDTO.meta.id); + deepEqual(accountRestrictionsInfo.accountRestrictions.address, + Address.createFromEncoded(accountRestrictionsInfoDTO.accountRestrictions.address)); + deepEqual(accountRestrictionsInfo.accountRestrictions.restrictions.length, + accountRestrictionsInfoDTO.accountRestrictions.restrictions.length); + deepEqual(accountRestrictionsInfo.accountRestrictions.restrictions[0].values[0], + accountRestrictionsInfoDTO.accountRestrictions.restrictions[0].values[0]); }); }); diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountRestrictionTransaction.spec.ts similarity index 54% rename from test/model/transaction/AccountPropertyTransaction.spec.ts rename to test/model/transaction/AccountRestrictionTransaction.spec.ts index de24268e9d..04ef489a07 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountRestrictionTransaction.spec.ts @@ -34,135 +34,135 @@ describe('AccountRestrictionTransaction', () => { before(() => { account = TestingAccount; }); - it('should create address property filter', () => { + it('should create address restriction filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - expect(addressPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(addressPropertyFilter.value).to.be.equal(address.plain()); + expect(addressRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(addressRestrictionFilter.value).to.be.equal(address.plain()); }); - it('should create mosaic property filter', () => { + it('should create mosaic restriction filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - expect(mosaicPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(mosaicPropertyFilter.value[0]).to.be.equal(mosaicId.id.lower); - expect(mosaicPropertyFilter.value[1]).to.be.equal(mosaicId.id.higher); + expect(mosaicRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(mosaicRestrictionFilter.value[0]).to.be.equal(mosaicId.id.lower); + expect(mosaicRestrictionFilter.value[1]).to.be.equal(mosaicId.id.higher); }); - it('should create entity type property filter', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create operation restriction filter', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - expect(entityTypePropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(entityTypePropertyFilter.value).to.be.equal(entityType); + expect(operationRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(operationRestrictionFilter.value).to.be.equal(operation); }); describe('size', () => { it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(addressPropertyTransaction.size).to.be.equal(148); + expect(addressRestrictionTransaction.size).to.be.equal(148); }); it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(mosaicPropertyTransaction.size).to.be.equal(131); + expect(mosaicRestrictionTransaction.size).to.be.equal(131); }); it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(entityTypePropertyTransaction.size).to.be.equal(125); + expect(operationRestrictionTransaction.size).to.be.equal(125); }); }); it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(addressPropertyTransaction.maxFee.higher).to.be.equal(0); - expect(addressPropertyTransaction.maxFee.lower).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.higher).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.lower).to.be.equal(0); }); it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, new UInt64([1, 0]), ); - expect(addressPropertyTransaction.maxFee.higher).to.be.equal(0); - expect(addressPropertyTransaction.maxFee.lower).to.be.equal(1); + expect(addressRestrictionTransaction.maxFee.higher).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.lower).to.be.equal(1); }); - it('should create address property transaction', () => { + it('should create address restriction transaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); + const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240, @@ -171,40 +171,40 @@ describe('AccountRestrictionTransaction', () => { }); - it('should throw exception when create address property transaction with wrong type', () => { + it('should throw exception when create address restriction transaction with wrong type', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); expect(() => { - AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.Sentinel, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - }).to.throw(Error, 'Property type is not allowed.'); + }).to.throw(Error, 'Restriction type is not allowed.'); }); - it('should create mosaic property transaction', () => { + it('should create mosaic restriction transaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); + const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240, @@ -213,40 +213,40 @@ describe('AccountRestrictionTransaction', () => { }); - it('should throw exception when create mosaic property transaction with wrong type', () => { + it('should throw exception when create mosaic restriction transaction with wrong type', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); expect(() => { - AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.Sentinel, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - }).to.throw(Error, 'Property type is not allowed.'); + }).to.throw(Error, 'Restriction type is not allowed.'); }); - it('should create entity type property transaction', () => { + it('should create operation restriction transaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); + const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240, From 98f57d5162c01b04f7ad7adc030ee5a3b16ff14a Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 10:53:59 +0100 Subject: [PATCH 202/208] Added #192 Updated AccountPropertyTransaction Names --- e2e/infrastructure/AccountHttp.spec.ts | 16 ++--- e2e/infrastructure/TransactionHttp.spec.ts | 52 ++++++++--------- .../transaction/CreateTransactionFromDTO.ts | 20 +++---- .../CreateTransactionFromPayload.ts | 20 +++---- .../transaction/SerializeTransactionToJSON.ts | 18 +++--- src/model/model.ts | 10 ++-- ...ressRestrictionModificationTransaction.ts} | 18 +++--- ...TypeRestrictionModificationTransaction.ts} | 18 +++--- ...saicRestrictionModificationTransaction.ts} | 18 +++--- ...n.ts => AccountRestrictionModification.ts} | 20 +++---- ...on.ts => AccountRestrictionTransaction.ts} | 40 ++++++------- test/core/utils/TransactionMapping.spec.ts | 44 +++++++------- .../SerializeTransactionToJSON.spec.ts | 16 ++--- .../AccountPropertyTransaction.spec.ts | 58 +++++++++---------- 14 files changed, 184 insertions(+), 184 deletions(-) rename src/model/transaction/{ModifyAccountPropertyAddressTransaction.ts => AccountAddressRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyEntityTypeTransaction.ts => AccountEntityTypeRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{ModifyAccountPropertyMosaicTransaction.ts => AccountMosaicRestrictionModificationTransaction.ts} (82%) rename src/model/transaction/{AccountPropertyModification.ts => AccountRestrictionModification.ts} (76%) rename src/model/transaction/{AccountPropertyTransaction.ts => AccountRestrictionTransaction.ts} (70%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5dcf195e29..5baaa5dc03 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -27,8 +27,8 @@ import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -193,12 +193,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -419,12 +419,12 @@ describe('AccountHttp', () => { return listener.close(); }); - it('Announce AccountPropertyTransaction', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + it('Announce AccountRestrictionTransaction', (done) => { + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index dfd5019b00..8c3d213fba 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -37,9 +37,12 @@ import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType'; import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic'; import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; +import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction'; import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction'; @@ -49,9 +52,6 @@ import { HashLockTransaction } from '../../src/model/transaction/HashLockTransac import {HashType} from '../../src/model/transaction/HashType'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../src/model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction'; @@ -272,7 +272,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -283,11 +283,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -295,7 +295,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyAddressTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountAddressRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -310,7 +310,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Address', () => { + describe('AccountRestrictionTransaction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -320,11 +320,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Remove, account3.address, ); - const addressModification = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.BlockAddress, [addressPropertyFilter], @@ -347,7 +347,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -358,11 +358,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -370,7 +370,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account, generationHash); - listener.confirmed(account.address).subscribe((transaction: ModifyAccountPropertyMosaicTransaction) => { + listener.confirmed(account.address).subscribe((transaction: AccountMosaicRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -385,7 +385,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - Mosaic', () => { + describe('AccountRestrictionTransaction - Mosaic', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -395,11 +395,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Remove, mosaicId, ); - const addressModification = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.BlockMosaic, [mosaicPropertyFilter], @@ -422,7 +422,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -433,11 +433,11 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: ModifyAccountPropertyEntityTypeTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; @@ -460,7 +460,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountPropertyTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - EntityType', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -470,11 +470,11 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Remove, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.BlockTransaction, [entityTypePropertyFilter], diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index eb6c258a62..3adc8b71f4 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -25,7 +25,7 @@ import {MosaicProperties} from '../../model/mosaic/MosaicProperties'; import { MosaicPropertyType } from '../../model/mosaic/MosaicPropertyType'; import {NamespaceId} from '../../model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification'; +import {AccountRestrictionModification} from '../../model/transaction/AccountRestrictionModification'; import {AddressAliasTransaction} from '../../model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../model/transaction/AggregateTransaction'; import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature'; @@ -34,9 +34,9 @@ import {Deadline} from '../../model/transaction/Deadline'; import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; -import {ModifyAccountPropertyAddressTransaction} from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import {ModifyAccountPropertyEntityTypeTransaction} from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import {ModifyAccountPropertyMosaicTransaction} from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction'; @@ -277,13 +277,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) { - return new ModifyAccountPropertyAddressTransaction( + return new AccountAddressRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -293,13 +293,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new ModifyAccountPropertyEntityTypeTransaction( + return new AccountEntityTypeRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], @@ -309,13 +309,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) { - return new ModifyAccountPropertyMosaicTransaction( + return new AccountMosaicRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), transactionDTO.propertyType, - transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountPropertyModification( + transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, )) : [], diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index c042e778e7..2d6a79adf1 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -26,7 +26,7 @@ import { MosaicProperties } from '../../model/mosaic/MosaicProperties'; import { NamespaceId } from '../../model/namespace/NamespaceId'; import { NamespaceType } from '../../model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../model/transaction/AccountPropertyModification'; +import { AccountRestrictionModification } from '../../model/transaction/AccountRestrictionModification'; import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { AggregateTransactionCosignature } from '../../model/transaction/AggregateTransactionCosignature'; @@ -36,9 +36,9 @@ import { HashType } from '../../model/transaction/HashType'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -113,10 +113,10 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N switch (type) { case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: - const t = ModifyAccountPropertyAddressTransaction.create( + const t = AccountAddressRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), Address.createFromEncoded(modification.substring(2, modification.length)).plain(), )) : [], @@ -124,20 +124,20 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N ); return t; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), UInt64.fromHex(reverse(modification.substring(2, modification.length))).toDTO(), )) : [], networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), - modificationArray ? modificationArray.map((modification) => new AccountPropertyModification( + modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( parseInt(convert.uint8ToHex(convert.hexToUint8(modification.substring(0, 2)).reverse()), 16), parseInt(convert.uint8ToHex(convert.hexToUint8( modification.substring(2, modification.length)).reverse()), 16), diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index b3245a0ca8..d379334222 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -18,9 +18,9 @@ import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTrans import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; -import { ModifyAccountPropertyAddressTransaction } from '../../model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from '../../model/transaction/ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../model/transaction/MosaicDefinitionTransaction'; @@ -70,24 +70,24 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as ModifyAccountPropertyAddressTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyAddressTransaction). + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as ModifyAccountPropertyEntityTypeTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyEntityTypeTransaction). + propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as ModifyAccountPropertyMosaicTransaction).propertyType, - modifications: (transaction as ModifyAccountPropertyMosaicTransaction).modifications.map((modification) => { + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), }; diff --git a/src/model/model.ts b/src/model/model.ts index 47c8471340..9a1911b91d 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -91,11 +91,11 @@ export * from './receipt/Statement'; // Transaction export * from './transaction/AccountLinkTransaction'; -export * from './transaction/AccountPropertyTransaction'; -export * from './transaction/ModifyAccountPropertyAddressTransaction'; -export * from './transaction/ModifyAccountPropertyEntityTypeTransaction'; -export * from './transaction/ModifyAccountPropertyMosaicTransaction'; -export * from './transaction/AccountPropertyModification'; +export * from './transaction/AccountRestrictionTransaction'; +export * from './transaction/AccountAddressRestrictionModificationTransaction'; +export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountMosaicRestrictionModificationTransaction'; +export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; export * from './transaction/AggregateTransaction'; export * from './transaction/AggregateTransactionCosignature'; diff --git a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyAddressTransaction.ts rename to src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index 4cfa610839..cbca21f656 100644 --- a/src/model/transaction/ModifyAccountPropertyAddressTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyAddressTransaction extends Transaction { +export class AccountAddressRestrictionModificationTransaction extends Transaction { /** * Create a modify account property address transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyAddressTransaction { - return new ModifyAccountPropertyAddressTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { + return new AccountAddressRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyAddressTransaction + * @description get the byte size of a AccountAddressRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyAddressTransaction + * @memberof AccountAddressRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts rename to src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts index a49c4873a9..4b84cf9938 100644 --- a/src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts +++ b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { +export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyEntityTypeTransaction { - return new ModifyAccountPropertyEntityTypeTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { + return new AccountEntityTypeRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyEntityTypeTransaction + * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyEntityTypeTransaction + * @memberof AccountEntityTypeRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts similarity index 82% rename from src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts rename to src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 1ec9770ae7..05ad838718 100644 --- a/src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -20,14 +20,14 @@ import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { Transaction } from './Transaction'; import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class ModifyAccountPropertyMosaicTransaction extends Transaction { +export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** * Create a modify account property mosaic transaction object @@ -36,14 +36,14 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): ModifyAccountPropertyMosaicTransaction { - return new ModifyAccountPropertyMosaicTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { + return new AccountMosaicRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, @@ -68,7 +68,7 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { deadline: Deadline, maxFee: UInt64, public readonly propertyType: PropertyType, - public readonly modifications: Array>, + public readonly modifications: Array>, signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { @@ -77,9 +77,9 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction { /** * @override Transaction.size() - * @description get the byte size of a ModifyAccountPropertyMosaicTransaction + * @description get the byte size of a AccountMosaicRestrictionModificationTransaction * @returns {number} - * @memberof ModifyAccountPropertyMosaicTransaction + * @memberof AccountMosaicRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountPropertyModification.ts b/src/model/transaction/AccountRestrictionModification.ts similarity index 76% rename from src/model/transaction/AccountPropertyModification.ts rename to src/model/transaction/AccountRestrictionModification.ts index d003dc7fa2..9fbedb9b3c 100644 --- a/src/model/transaction/AccountPropertyModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -19,7 +19,7 @@ import { PropertyModificationType } from '../account/PropertyModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; -export class AccountPropertyModification { +export class AccountRestrictionModification { /** * Constructor @@ -42,32 +42,32 @@ export class AccountPropertyModification { * Create an address filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param address - modification value (Address) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForAddress(modificationType: PropertyModificationType, - address: Address): AccountPropertyModification { - return new AccountPropertyModification(modificationType, address.plain()); + address: Address): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, address.plain()); } /** * Create an mosaic filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param mosaicId - modification value (Mosaic) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForMosaic(modificationType: PropertyModificationType, - mosaicId: MosaicId): AccountPropertyModification { - return new AccountPropertyModification(modificationType, mosaicId.id.toDTO()); + mosaicId: MosaicId): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } /** * Create an entity type filter for account property modification * @param modificationType - modification type. 0: Add, 1: Remove * @param entityType - modification value (Transaction Type) - * @returns {AccountPropertyModification} + * @returns {AccountRestrictionModification} */ public static createForEntityType(modificationType: PropertyModificationType, - entityType: number): AccountPropertyModification { - return new AccountPropertyModification(modificationType, entityType); + entityType: number): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, entityType); } /** diff --git a/src/model/transaction/AccountPropertyTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts similarity index 70% rename from src/model/transaction/AccountPropertyTransaction.ts rename to src/model/transaction/AccountRestrictionTransaction.ts index a75ac8ff80..f38a2b1a65 100644 --- a/src/model/transaction/AccountPropertyTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -17,14 +17,14 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; -import { AccountPropertyModification } from './AccountPropertyModification'; +import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; +import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; -import { ModifyAccountPropertyAddressTransaction } from './ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyEntityTypeTransaction } from './ModifyAccountPropertyEntityTypeTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from './ModifyAccountPropertyMosaicTransaction'; import { TransactionType } from './TransactionType'; -export class AccountPropertyTransaction { +export class AccountRestrictionTransaction { /** * Create an address modification transaction object * @param deadline - The deadline to include the transaction. @@ -32,19 +32,19 @@ export class AccountPropertyTransaction { * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyAddressTransaction} + * @returns {AccountAddressRestrictionModificationTransaction} */ public static createAddressPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyAddressTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountAddressRestrictionModificationTransaction { if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyAddressTransaction.create( + return AccountAddressRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -60,19 +60,19 @@ export class AccountPropertyTransaction { * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyMosaicTransaction} + * @returns {AccountMosaicRestrictionModificationTransaction} */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyMosaicTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountMosaicRestrictionModificationTransaction { if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyMosaicTransaction.create( + return AccountMosaicRestrictionModificationTransaction.create( deadline, propertyType, modifications, @@ -88,19 +88,19 @@ export class AccountPropertyTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {ModifyAccountPropertyEntityTypeTransaction} + * @returns {AccountEntityTypeRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, propertyType: PropertyType, - modifications: Array>, + modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0]) - ): ModifyAccountPropertyEntityTypeTransaction { + maxFee: UInt64 = new UInt64([0, 0]), + ): AccountEntityTypeRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return ModifyAccountPropertyEntityTypeTransaction.create( + return AccountEntityTypeRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index c7bc986b01..f4a5424aa1 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -35,8 +35,8 @@ import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../../src/model/transaction/Deadline'; @@ -44,8 +44,8 @@ import { HashType } from '../../../src/model/transaction/HashType'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MessageType } from '../../../src/model/transaction/MessageType'; -import { ModifyAccountPropertyAddressTransaction } from '../../../src/model/transaction/ModifyAccountPropertyAddressTransaction'; -import { ModifyAccountPropertyMosaicTransaction } from '../../../src/model/transaction/ModifyAccountPropertyMosaicTransaction'; +import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -70,11 +70,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -83,7 +83,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -92,11 +92,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -105,7 +105,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); @@ -114,11 +114,11 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -127,7 +127,7 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); - const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as ModifyAccountPropertyAddressTransaction; + const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); @@ -599,11 +599,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -611,7 +611,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as ModifyAccountPropertyAddressTransaction; + TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); @@ -620,11 +620,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -632,7 +632,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); @@ -641,11 +641,11 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -653,7 +653,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => ); const transaction = - TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as ModifyAccountPropertyMosaicTransaction; + TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index 3c2d1bcdf9..fd6d38d14d 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -31,8 +31,8 @@ import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMos import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; -import { AccountPropertyModification } from '../../src/model/transaction/AccountPropertyModification'; -import { AccountPropertyTransaction } from '../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; +import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction'; import { Deadline } from '../../src/model/transaction/Deadline'; @@ -77,11 +77,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -97,11 +97,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -117,11 +117,11 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 80eb1ff029..5f66adc21f 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -21,14 +21,14 @@ import { PropertyModificationType } from '../../../src/model/account/PropertyMod import { PropertyType } from '../../../src/model/account/PropertyType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; -import { AccountPropertyModification } from '../../../src/model/transaction/AccountPropertyModification'; -import {AccountPropertyTransaction} from '../../../src/model/transaction/AccountPropertyTransaction'; +import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; +import {AccountRestrictionTransaction} from '../../../src/model/transaction/AccountRestrictionTransaction'; import {Deadline} from '../../../src/model/transaction/Deadline'; import { TransactionType } from '../../../src/model/transaction/TransactionType'; import {UInt64} from '../../../src/model/UInt64'; import {TestingAccount} from '../../conf/conf.spec'; -describe('AccountPropertyTransaction', () => { +describe('AccountRestrictionTransaction', () => { let account: Account; const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; before(() => { @@ -36,7 +36,7 @@ describe('AccountPropertyTransaction', () => { }); it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); @@ -46,7 +46,7 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); @@ -57,7 +57,7 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); @@ -66,13 +66,13 @@ describe('AccountPropertyTransaction', () => { }); describe('size', () => { - it('should return 148 for ModifyAccountPropertyAddressTransaction transaction byte size with 1 modification', () => { + it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -82,13 +82,13 @@ describe('AccountPropertyTransaction', () => { expect(addressPropertyTransaction.size).to.be.equal(148); }); - it('should return 131 for ModifyAccountPropertyMosaicTransaction transaction byte size with 1 modification', () => { + it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -97,13 +97,13 @@ describe('AccountPropertyTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for ModifyAccountPropertyEntityTypeTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], @@ -115,11 +115,11 @@ describe('AccountPropertyTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -132,11 +132,11 @@ describe('AccountPropertyTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -151,11 +151,11 @@ describe('AccountPropertyTransaction', () => { it('should create address property transaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); - const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction( + const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.AllowAddress, [addressPropertyFilter], @@ -174,13 +174,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create address property transaction with wrong type', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountPropertyModification.createForAddress( + const addressPropertyFilter = AccountRestrictionModification.createForAddress( PropertyModificationType.Add, address, ); expect(() => { - AccountPropertyTransaction.createAddressPropertyModificationTransaction( + AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [addressPropertyFilter], @@ -193,11 +193,11 @@ describe('AccountPropertyTransaction', () => { it('should create mosaic property transaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.AllowMosaic, [mosaicPropertyFilter], @@ -216,13 +216,13 @@ describe('AccountPropertyTransaction', () => { it('should throw exception when create mosaic property transaction with wrong type', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountPropertyModification.createForMosaic( + const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( PropertyModificationType.Add, mosaicId, ); expect(() => { - AccountPropertyTransaction.createMosaicPropertyModificationTransaction( + AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), PropertyType.Sentinel, [mosaicPropertyFilter], @@ -235,11 +235,11 @@ describe('AccountPropertyTransaction', () => { it('should create entity type property transaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountPropertyModification.createForEntityType( + const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, entityType, ); - const entityTypePropertyTransaction = AccountPropertyTransaction.createEntityTypePropertyModificationTransaction( + const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), PropertyType.AllowTransaction, [entityTypePropertyFilter], From 3a2ead6862aeea4df4c53ea40cd973f087b99520 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 20:54:15 +0100 Subject: [PATCH 203/208] Renamed accountEntityType to accountOperation --- e2e/infrastructure/TransactionHttp.spec.ts | 4 ++-- .../transaction/CreateTransactionFromDTO.ts | 4 ++-- .../transaction/CreateTransactionFromPayload.ts | 4 ++-- .../transaction/SerializeTransactionToJSON.ts | 6 +++--- src/model/model.ts | 2 +- ...ntOperationRestrictionModificationTransaction.ts} | 12 ++++++------ .../transaction/AccountRestrictionTransaction.ts | 8 ++++---- .../transaction/AccountPropertyTransaction.spec.ts | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename src/model/transaction/{AccountEntityTypeRestrictionModificationTransaction.ts => AccountOperationRestrictionModificationTransaction.ts} (89%) diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8c3d213fba..8321e3784f 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -38,7 +38,7 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../src/model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; @@ -445,7 +445,7 @@ describe('TransactionHttp', () => { ); const signedTransaction = addressModification.signWith(account3, generationHash); - listener.confirmed(account3.address).subscribe((transaction: AccountEntityTypeRestrictionModificationTransaction) => { + listener.confirmed(account3.address).subscribe((transaction: AccountOperationRestrictionModificationTransaction) => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 3adc8b71f4..24ec79df98 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -35,7 +35,7 @@ import { EncryptedMessage } from '../../model/transaction/EncryptedMessage'; import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction'; import { MessageType } from '../../model/transaction/MessageType'; import {AccountAddressRestrictionModificationTransaction} from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import {AccountEntityTypeRestrictionModificationTransaction} from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import {AccountOperationRestrictionModificationTransaction} from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import {AccountMosaicRestrictionModificationTransaction} from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction'; import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction'; @@ -293,7 +293,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr transactionInfo, ); } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { - return new AccountEntityTypeRestrictionModificationTransaction( + return new AccountOperationRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 2d6a79adf1..7deb62836c 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -37,7 +37,7 @@ import { LockFundsTransaction } from '../../model/transaction/LockFundsTransacti import { Message } from '../../model/transaction/Message'; import { MessageType } from '../../model/transaction/MessageType'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -134,7 +134,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), modificationArray ? modificationArray.map((modification) => new AccountRestrictionModification( diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index d379334222..a4d39321b4 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -19,7 +19,7 @@ import { AddressAliasTransaction } from '../../model/transaction/AddressAliasTra import { AggregateTransaction } from '../../model/transaction/AggregateTransaction'; import { LockFundsTransaction } from '../../model/transaction/LockFundsTransaction'; import { AccountAddressRestrictionModificationTransaction } from '../../model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from '../../model/transaction/AccountEntityTypeRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../model/transaction/MosaicAliasTransaction'; @@ -78,8 +78,8 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountEntityTypeRestrictionModificationTransaction).propertyType, - modifications: (transaction as AccountEntityTypeRestrictionModificationTransaction). + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/model.ts b/src/model/model.ts index 9a1911b91d..66cb725b2f 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -93,7 +93,7 @@ export * from './receipt/Statement'; export * from './transaction/AccountLinkTransaction'; export * from './transaction/AccountRestrictionTransaction'; export * from './transaction/AccountAddressRestrictionModificationTransaction'; -export * from './transaction/AccountEntityTypeRestrictionModificationTransaction'; +export * from './transaction/AccountOperationRestrictionModificationTransaction'; export * from './transaction/AccountMosaicRestrictionModificationTransaction'; export * from './transaction/AccountRestrictionModification'; export * from './transaction/AddressAliasTransaction'; diff --git a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts similarity index 89% rename from src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts rename to src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4b84cf9938..4c62d32999 100644 --- a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -27,7 +27,7 @@ import { TransactionInfo } from './TransactionInfo'; import { TransactionType } from './TransactionType'; import { TransactionVersion } from './TransactionVersion'; -export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { +export class AccountOperationRestrictionModificationTransaction extends Transaction { /** * Create a modify account property entity type transaction object @@ -36,14 +36,14 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, propertyType: PropertyType, modifications: Array>, networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { - return new AccountEntityTypeRestrictionModificationTransaction(networkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { + return new AccountOperationRestrictionModificationTransaction(networkType, TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, @@ -77,9 +77,9 @@ export class AccountEntityTypeRestrictionModificationTransaction extends Transac /** * @override Transaction.size() - * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction + * @description get the byte size of a AccountOperationRestrictionModificationTransaction * @returns {number} - * @memberof AccountEntityTypeRestrictionModificationTransaction + * @memberof AccountOperationRestrictionModificationTransaction */ public get size(): number { const byteSize = super.size; diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index f38a2b1a65..91a4dbaa88 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -18,8 +18,8 @@ import { PropertyType } from '../account/PropertyType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; -import { AccountEntityTypeRestrictionModificationTransaction } from './AccountEntityTypeRestrictionModificationTransaction'; import { AccountMosaicRestrictionModificationTransaction } from './AccountMosaicRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from './AccountOperationRestrictionModificationTransaction'; import { AccountRestrictionModification } from './AccountRestrictionModification'; import { Deadline } from './Deadline'; import { TransactionType } from './TransactionType'; @@ -88,7 +88,7 @@ export class AccountRestrictionTransaction { * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} + * @returns {AccountOperationRestrictionModificationTransaction} */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, @@ -96,11 +96,11 @@ export class AccountRestrictionTransaction { modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), - ): AccountEntityTypeRestrictionModificationTransaction { + ): AccountOperationRestrictionModificationTransaction { if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { throw new Error ('Property type is not allowed.'); } - return AccountEntityTypeRestrictionModificationTransaction.create( + return AccountOperationRestrictionModificationTransaction.create( deadline, propertyType, modifications, diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 5f66adc21f..4c78bdc7e2 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -97,7 +97,7 @@ describe('AccountRestrictionTransaction', () => { expect(mosaicPropertyTransaction.size).to.be.equal(131); }); - it('should return 125 for AccountEntityTypeRestrictionModificationTransaction transaction byte size with 1 modification', () => { + it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( PropertyModificationType.Add, From 881bfdfa68affdc00696d20bdeceed8bf5af15c4 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 21:40:21 +0100 Subject: [PATCH 204/208] More renames --- e2e/infrastructure/AccountHttp.spec.ts | 16 +++--- e2e/infrastructure/TransactionHttp.spec.ts | 34 +++++------ src/core/utils/DtoMapping.ts | 32 +++++------ src/infrastructure/AccountHttp.ts | 6 +- src/infrastructure/AccountRepository.ts | 6 +- .../transaction/SerializeTransactionToJSON.ts | 6 +- ...countProperty.ts => AccountRestriction.ts} | 14 ++--- ...ntProperties.ts => AccountRestrictions.ts} | 12 ++-- ...tiesInfo.ts => AccountRestrictionsInfo.ts} | 12 ++-- ...Type.ts => RestrictionModificationType.ts} | 4 +- .../{PropertyType.ts => RestrictionType.ts} | 14 ++--- src/model/model.ts | 10 ++-- ...dressRestrictionModificationTransaction.ts | 17 +++--- ...osaicRestrictionModificationTransaction.ts | 17 +++--- ...ationRestrictionModificationTransaction.ts | 17 +++--- .../AccountRestrictionModification.ts | 10 ++-- .../AccountRestrictionTransaction.ts | 32 +++++------ test/core/utils/TransactionMapping.spec.ts | 48 ++++++++-------- .../SerializeTransactionToJSON.spec.ts | 22 ++++---- ...rty.spec.ts => AccountRestriction.spec.ts} | 12 ++-- ...es.spec.ts => AccountRestrictions.spec.ts} | 17 ++++-- ...pec.ts => AccountRestrictionsInfo.spec.ts} | 26 ++++----- .../AccountPropertyTransaction.spec.ts | 56 +++++++++---------- 23 files changed, 221 insertions(+), 219 deletions(-) rename src/model/account/{AccountProperty.ts => AccountRestriction.ts} (71%) rename src/model/account/{AccountProperties.ts => AccountRestrictions.ts} (74%) rename src/model/account/{AccountPropertiesInfo.ts => AccountRestrictionsInfo.ts} (71%) rename src/model/account/{PropertyModificationType.ts => RestrictionModificationType.ts} (88%) rename src/model/account/{PropertyType.ts => RestrictionType.ts} (72%) rename test/model/account/{AccountProperty.spec.ts => AccountRestriction.spec.ts} (71%) rename test/model/account/{AccountProperties.spec.ts => AccountRestrictions.spec.ts} (74%) rename test/model/account/{AccountPropertiesInfo.spec.ts => AccountRestrictionsInfo.spec.ts} (60%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index 5baaa5dc03..c6eabef382 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -20,8 +20,8 @@ import {AccountHttp} from '../../src/infrastructure/AccountHttp'; import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure'; import { Account } from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic'; @@ -195,12 +195,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -286,7 +286,7 @@ describe('AccountHttp', () => { it('should call getAccountProperty successfully', (done) => { setTimeout(() => { accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => { - deepEqual(accountProperty.accountProperties.address, accountAddress); + deepEqual(accountProperty.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -297,7 +297,7 @@ describe('AccountHttp', () => { it('should call getAccountProperties successfully', (done) => { setTimeout(() => { accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => { - deepEqual(accountProperties[0]!.accountProperties.address, accountAddress); + deepEqual(accountProperties[0]!.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -421,12 +421,12 @@ describe('AccountHttp', () => { it('Announce AccountRestrictionTransaction', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 8321e3784f..9e9ab624b2 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -25,8 +25,8 @@ import {Listener} from '../../src/infrastructure/Listener'; import {TransactionHttp} from '../../src/infrastructure/TransactionHttp'; import {Account} from '../../src/model/account/Account'; import {Address} from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; @@ -284,12 +284,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -299,7 +299,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -321,12 +321,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, account3.address, ); const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockAddress, + RestrictionType.BlockAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -359,12 +359,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -374,7 +374,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -396,12 +396,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, mosaicId, ); const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.BlockMosaic, + RestrictionType.BlockMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -434,12 +434,12 @@ describe('TransactionHttp', () => { it('standalone', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -449,7 +449,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.propertyType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; done(); }); listener.status(account3.address).subscribe((error) => { @@ -471,12 +471,12 @@ describe('TransactionHttp', () => { }); it('aggregate', (done) => { const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Remove, + RestrictionModificationType.Remove, TransactionType.LINK_ACCOUNT, ); const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.BlockTransaction, + RestrictionType.BlockTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 282ecc6029..20b184e8ad 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { AccountProperties } from '../../model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../model/account/AccountProperty'; +import { AccountRestrictions } from '../../model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../model/account/AccountRestriction'; import { Address } from '../../model/account/Address'; -import { PropertyType } from '../../model/account/PropertyType'; +import { RestrictionType } from '../../model/account/RestrictionType'; import { MosaicId } from '../../model/mosaic/MosaicId'; export class DtoMapping { @@ -28,23 +28,23 @@ export class DtoMapping { * @param {object} dataJson The account property json object. * @returns {module: model/Account/AccountPropertiesInfo} The AccountPropertiesInfo class. */ - public static extractAccountPropertyFromDto(accountProperties): AccountPropertiesInfo { - return new AccountPropertiesInfo( + public static extractAccountPropertyFromDto(accountProperties): AccountRestrictionsInfo { + return new AccountRestrictionsInfo( accountProperties.meta, - new AccountProperties(Address.createFromEncoded(accountProperties.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountProperties.accountProperties.address), accountProperties.accountProperties.properties.map((prop) => { switch (prop.propertyType) { - case PropertyType.AllowAddress: - case PropertyType.BlockAddress: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowAddress: + case RestrictionType.BlockAddress: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => Address.createFromEncoded(value))); - case PropertyType.AllowMosaic: - case PropertyType.BlockMosaic: - return new AccountProperty(prop.propertyType, + case RestrictionType.AllowMosaic: + case RestrictionType.BlockMosaic: + return new AccountRestriction(prop.propertyType, prop.values.map((value) => new MosaicId(value))); - case PropertyType.AllowTransaction: - case PropertyType.BlockTransaction: - return new AccountProperty(prop.propertyType, prop.values); + case RestrictionType.AllowTransaction: + case RestrictionType.BlockTransaction: + return new AccountRestriction(prop.propertyType, prop.values); default: throw new Error(`Invalid property type: ${prop.propertyType}`); } diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index 7c53b58c7d..a174f27a81 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -19,7 +19,7 @@ import {map, mergeMap} from 'rxjs/operators'; import { DtoMapping } from '../core/utils/DtoMapping'; import {AccountInfo} from '../model/account/AccountInfo'; import { AccountNames } from '../model/account/AccountNames'; -import { AccountPropertiesInfo } from '../model/account/AccountPropertiesInfo'; +import { AccountRestrictionsInfo } from '../model/account/AccountRestrictionsInfo'; import {Address} from '../model/account/Address'; import {MultisigAccountGraphInfo} from '../model/account/MultisigAccountGraphInfo'; import {MultisigAccountInfo} from '../model/account/MultisigAccountInfo'; @@ -97,7 +97,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param publicAccount public account * @returns Observable */ - public getAccountProperties(address: Address): Observable { + public getAccountProperties(address: Address): Observable { return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())) .pipe(map((accountProperties: AccountPropertiesInfoDTO) => { return DtoMapping.extractAccountPropertyFromDto(accountProperties); @@ -109,7 +109,7 @@ export class AccountHttp extends Http implements AccountRepository { * @param address list of addresses * @returns Observable */ - public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { + public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { const accountIds = { addresses: addresses.map((address) => address.plain()), }; diff --git a/src/infrastructure/AccountRepository.ts b/src/infrastructure/AccountRepository.ts index da8d02c988..1fe6fa5e94 100644 --- a/src/infrastructure/AccountRepository.ts +++ b/src/infrastructure/AccountRepository.ts @@ -23,7 +23,7 @@ import {PublicAccount} from '../model/account/PublicAccount'; import {AggregateTransaction} from '../model/transaction/AggregateTransaction'; import {Transaction} from '../model/transaction/Transaction'; import {QueryParams} from './QueryParams'; -import {AccountPropertiesInfo} from "../model/account/AccountPropertiesInfo"; +import {AccountRestrictionsInfo} from "../model/account/AccountRestrictionsInfo"; import { AccountNames } from '../model/account/AccountNames'; /** @@ -60,14 +60,14 @@ export interface AccountRepository { * @param publicAccount public account * @returns Observable */ - getAccountProperties(address: Address): Observable; + getAccountProperties(address: Address): Observable; /** * Gets Account properties. * @param address list of addresses * @returns Observable */ - getAccountPropertiesFromAccounts(addresses: Address[]): Observable; + getAccountPropertiesFromAccounts(addresses: Address[]): Observable; /** * Gets a MultisigAccountInfo for an account. diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index a4d39321b4..9f97dc3f60 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -70,7 +70,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: return { - propertyType: (transaction as AccountAddressRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -78,7 +78,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: return { - propertyType: (transaction as AccountOperationRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); @@ -86,7 +86,7 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { }; case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: return { - propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).propertyType, + propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/account/AccountProperty.ts b/src/model/account/AccountRestriction.ts similarity index 71% rename from src/model/account/AccountProperty.ts rename to src/model/account/AccountRestriction.ts index 96774e1b9f..7eb6928f11 100644 --- a/src/model/account/AccountProperty.ts +++ b/src/model/account/AccountRestriction.ts @@ -14,24 +14,24 @@ * limitations under the License. */ -import { PropertyType } from './PropertyType'; +import { RestrictionType } from './RestrictionType'; /** - * Account property structure describes property information. + * Account restriction structure describes restriction information. */ -export class AccountProperty { +export class AccountRestriction { /** * Constructor - * @param propertyType + * @param restrictionType * @param values */ constructor( /** - * Account property type + * Account restriction type */ - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, /** - * Property values. + * Restriction values. */ public readonly values: object[]) { diff --git a/src/model/account/AccountProperties.ts b/src/model/account/AccountRestrictions.ts similarity index 74% rename from src/model/account/AccountProperties.ts rename to src/model/account/AccountRestrictions.ts index 80035e71e8..419f174166 100644 --- a/src/model/account/AccountProperties.ts +++ b/src/model/account/AccountRestrictions.ts @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperty } from './AccountProperty'; +import { AccountRestriction } from './AccountRestriction'; import { Address } from './Address'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountProperties { +export class AccountRestrictions { /** * Constructor * @param address - * @param properties + * @param restrictions */ constructor( /** @@ -31,9 +31,9 @@ export class AccountProperties { */ public readonly address: Address, /** - * Properties. + * Restrictions. */ - public readonly properties: AccountProperty[]) { + public readonly restrictions: AccountRestriction[]) { } } diff --git a/src/model/account/AccountPropertiesInfo.ts b/src/model/account/AccountRestrictionsInfo.ts similarity index 71% rename from src/model/account/AccountPropertiesInfo.ts rename to src/model/account/AccountRestrictionsInfo.ts index b1c3040968..5e6de8a8ba 100644 --- a/src/model/account/AccountPropertiesInfo.ts +++ b/src/model/account/AccountRestrictionsInfo.ts @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AccountProperties } from './AccountProperties'; +import { AccountRestrictions } from './AccountRestrictions'; /** - * Account properties structure describes property information for an account. + * Account restrictions structure describes restriction information for an account. */ -export class AccountPropertiesInfo { +export class AccountRestrictionsInfo { /** * Constructor * @param meta - * @param accountProperties + * @param accountRestrictions */ constructor( /** @@ -30,9 +30,9 @@ export class AccountPropertiesInfo { */ public readonly meta: any, /** - * Properties. + * Restrictions. */ - public readonly accountProperties: AccountProperties) { + public readonly accountRestrictions: AccountRestrictions) { } } diff --git a/src/model/account/PropertyModificationType.ts b/src/model/account/RestrictionModificationType.ts similarity index 88% rename from src/model/account/PropertyModificationType.ts rename to src/model/account/RestrictionModificationType.ts index 6ba3b7d9db..b4aabd8151 100644 --- a/src/model/account/PropertyModificationType.ts +++ b/src/model/account/RestrictionModificationType.ts @@ -15,9 +15,9 @@ */ /** - * Account property modification type + * Account restriction modification type */ -export enum PropertyModificationType { +export enum RestrictionModificationType { Add = 0x00, Remove = 0x01, } diff --git a/src/model/account/PropertyType.ts b/src/model/account/RestrictionType.ts similarity index 72% rename from src/model/account/PropertyType.ts rename to src/model/account/RestrictionType.ts index 1b13f72113..aa7d236ed0 100644 --- a/src/model/account/PropertyType.ts +++ b/src/model/account/RestrictionType.ts @@ -15,15 +15,15 @@ */ /** - * Account property type - * 0x01 The property type is an address. - * 0x02 The property type is mosaic id. - * 0x03 The property type is a transaction type. - * 0x04 Property type sentinel. - * 0x80 + type The property is interpreted as a blocking operation. + * Account restriction type + * 0x01 The restriction type is an address. + * 0x02 The restriction type is mosaic id. + * 0x03 The restriction type is a transaction type. + * 0x04 restriction type sentinel. + * 0x80 + type The restriction is interpreted as a blocking operation. */ -export enum PropertyType { +export enum RestrictionType { AllowAddress = 0x01, AllowMosaic = 0x02, AllowTransaction = 0x04, diff --git a/src/model/model.ts b/src/model/model.ts index 66cb725b2f..62bb27f331 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -24,11 +24,11 @@ export * from './account/Address'; export * from './account/MultisigAccountGraphInfo'; export * from './account/MultisigAccountInfo'; export * from './account/PublicAccount'; -export * from './account/AccountProperties'; -export * from './account/AccountPropertiesInfo'; -export * from './account/AccountProperty'; -export * from './account/PropertyModificationType'; -export * from './account/PropertyType'; +export * from './account/AccountRestrictions'; +export * from './account/AccountRestrictionsInfo'; +export * from './account/AccountRestriction'; +export * from './account/RestrictionModificationType'; +export * from './account/RestrictionType'; export * from './account/AccountNames'; // Blockchain diff --git a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index cbca21f656..3d3859b116 100644 --- a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesAddressTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountAddressRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property address transaction object + * Create a modify account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index 05ad838718..ea0f25213a 100644 --- a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesMosaicTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountMosaicRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property mosaic transaction object + * Create a modify account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4c62d32999..946dd024ed 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountOperationRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property entity type transaction object + * Create a modify account operation restriction type transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountRestrictionModification.ts b/src/model/transaction/AccountRestrictionModification.ts index 9fbedb9b3c..8cbecf298a 100644 --- a/src/model/transaction/AccountRestrictionModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -15,7 +15,7 @@ */ import { Address } from '../account/Address'; -import { PropertyModificationType } from '../account/PropertyModificationType'; +import { RestrictionModificationType } from '../account/RestrictionModificationType'; import { MosaicId } from '../mosaic/MosaicId'; import { TransactionType } from './TransactionType'; @@ -30,7 +30,7 @@ export class AccountRestrictionModification { /** * Modification type. */ - public readonly modificationType: PropertyModificationType, + public readonly modificationType: RestrictionModificationType, /** * Modification value (Address, Mosaic or Transaction Type). */ @@ -44,7 +44,7 @@ export class AccountRestrictionModification { * @param address - modification value (Address) * @returns {AccountRestrictionModification} */ - public static createForAddress(modificationType: PropertyModificationType, + public static createForAddress(modificationType: RestrictionModificationType, address: Address): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, address.plain()); } @@ -54,7 +54,7 @@ export class AccountRestrictionModification { * @param mosaicId - modification value (Mosaic) * @returns {AccountRestrictionModification} */ - public static createForMosaic(modificationType: PropertyModificationType, + public static createForMosaic(modificationType: RestrictionModificationType, mosaicId: MosaicId): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, mosaicId.id.toDTO()); } @@ -65,7 +65,7 @@ export class AccountRestrictionModification { * @param entityType - modification value (Transaction Type) * @returns {AccountRestrictionModification} */ - public static createForEntityType(modificationType: PropertyModificationType, + public static createForEntityType(modificationType: RestrictionModificationType, entityType: number): AccountRestrictionModification { return new AccountRestrictionModification(modificationType, entityType); } diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index 91a4dbaa88..e5de1db525 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountAddressRestrictionModificationTransaction } from './AccountAddressRestrictionModificationTransaction'; @@ -26,9 +26,9 @@ import { TransactionType } from './TransactionType'; export class AccountRestrictionTransaction { /** - * Create an address modification transaction object + * Create an account address restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of address modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -36,17 +36,17 @@ export class AccountRestrictionTransaction { */ public static createAddressPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountAddressRestrictionModificationTransaction { - if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) { + if (![RestrictionType.AllowAddress, RestrictionType.BlockAddress].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountAddressRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -54,9 +54,9 @@ export class AccountRestrictionTransaction { } /** - * Create an mosaic modification transaction object + * Create an account mosaic restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account restriction transaction * @param modification - array of mosaic modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -64,17 +64,17 @@ export class AccountRestrictionTransaction { */ public static createMosaicPropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountMosaicRestrictionModificationTransaction { - if (![PropertyType.AllowMosaic, PropertyType.BlockMosaic].includes(propertyType)) { + if (![RestrictionType.AllowMosaic, RestrictionType.BlockMosaic].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountMosaicRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, @@ -82,9 +82,9 @@ export class AccountRestrictionTransaction { } /** - * Create an entity type modification transaction object + * Create an account operation restriction transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - Type of account property transaction + * @param restrictionType - Type of account property transaction * @param modification - array of entity type modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender @@ -92,17 +92,17 @@ export class AccountRestrictionTransaction { */ public static createEntityTypePropertyModificationTransaction( deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0]), ): AccountOperationRestrictionModificationTransaction { - if (![PropertyType.AllowTransaction, PropertyType.BlockTransaction].includes(propertyType)) { + if (![RestrictionType.AllowTransaction, RestrictionType.BlockTransaction].includes(restrictionType)) { throw new Error ('Property type is not allowed.'); } return AccountOperationRestrictionModificationTransaction.create( deadline, - propertyType, + restrictionType, modifications, networkType, maxFee, diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index f4a5424aa1..4d2c31247a 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -21,8 +21,8 @@ import {Convert as convert} from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import { EncryptedMessage } from '../../../src/model/model'; @@ -71,12 +71,12 @@ describe('TransactionMapping - createFromPayload', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,20 +85,20 @@ describe('TransactionMapping - createFromPayload', () => { const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -106,21 +106,21 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications[0].value[0]).to.be.equal(2262289484); expect(transaction.modifications[0].value[1]).to.be.equal(3405110546); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -128,9 +128,9 @@ describe('TransactionMapping - createFromPayload', () => { const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications[0].value).to.be.equal(entityType); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AddressAliasTransaction', () => { @@ -600,12 +600,12 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -614,19 +614,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowAddress); - expect(transaction.modifications[0].modificationType).to.be.equal(PropertyModificationType.Add); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); + expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -635,19 +635,19 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -656,7 +656,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications.length).to.be.equal(1); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index fd6d38d14d..c2a3ab5b1c 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -19,8 +19,8 @@ import { sha3_256 } from 'js-sha3'; import {Convert as convert} from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; -import { PropertyModificationType } from '../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../src/model/account/RestrictionType'; import { PublicAccount } from '../../src/model/account/PublicAccount'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; @@ -78,12 +78,12 @@ describe('SerializeTransactionToJSON', () => { it('should create AccountPropertyAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -91,19 +91,19 @@ describe('SerializeTransactionToJSON', () => { const json = addressPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowAddress); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowAddress); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -111,19 +111,19 @@ describe('SerializeTransactionToJSON', () => { const json = mosaicPropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowMosaic); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowMosaic); expect(json.transaction.modifications.length).to.be.equal(1); }); it('should create AccountPropertyMosaicTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -131,7 +131,7 @@ describe('SerializeTransactionToJSON', () => { const json = entityTypePropertyTransaction.toJSON(); expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(json.transaction.propertyType).to.be.equal(PropertyType.AllowTransaction); + expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowTransaction); expect(json.transaction.modifications.length).to.be.equal(1); }); diff --git a/test/model/account/AccountProperty.spec.ts b/test/model/account/AccountRestriction.spec.ts similarity index 71% rename from test/model/account/AccountProperty.spec.ts rename to test/model/account/AccountRestriction.spec.ts index ffa7fa4eb6..4f8481fc0e 100644 --- a/test/model/account/AccountProperty.spec.ts +++ b/test/model/account/AccountRestriction.spec.ts @@ -16,25 +16,25 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { Address } from '../../../src/model/account/Address'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountProperty', () => { it('should createComplete an AccountProperty object', () => { const accountPropertyDTO = { - propertyType: PropertyType.AllowAddress, + propertyType: RestrictionType.AllowAddress, values: ['906415867F121D037AF447E711B0F5E4D52EBBF066D96860EB'], }; - const accountProperty = new AccountProperty( + const accountRestriction = new AccountRestriction( accountPropertyDTO.propertyType, accountPropertyDTO.values.map((value) => { return Address.createFromEncoded(value); }), ); - expect(accountProperty.propertyType).to.be.equal(accountPropertyDTO.propertyType); - deepEqual(accountProperty.values.length, accountPropertyDTO.values.length); + expect(accountRestriction.restrictionType).to.be.equal(accountPropertyDTO.propertyType); + deepEqual(accountRestriction.values.length, accountPropertyDTO.values.length); }); }); diff --git a/test/model/account/AccountProperties.spec.ts b/test/model/account/AccountRestrictions.spec.ts similarity index 74% rename from test/model/account/AccountProperties.spec.ts rename to test/model/account/AccountRestrictions.spec.ts index 0ffbf09aae..5f6d15059c 100644 --- a/test/model/account/AccountProperties.spec.ts +++ b/test/model/account/AccountRestrictions.spec.ts @@ -17,7 +17,7 @@ import {deepEqual} from 'assert'; import {expect} from 'chai'; import {Address} from '../../../src/model/account/Address'; -import { AccountProperties, PropertyModificationType, PropertyType } from '../../../src/model/model'; +import { AccountRestrictions, RestrictionModificationType, RestrictionType, AccountRestriction } from '../../../src/model/model'; describe('AccountProperties', () => { @@ -25,19 +25,24 @@ describe('AccountProperties', () => { const accountPropertiesDTO = { address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'), properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }; - const accountProperties = new AccountProperties( + const accountRestrictions = new AccountRestrictions( accountPropertiesDTO.address, - accountPropertiesDTO.properties, + accountPropertiesDTO.properties.map((r) => { + return new AccountRestriction( + r.propertyType, + r.values, + ); + }), ); - expect(accountProperties.address).to.be.equal(accountPropertiesDTO.address); + expect(accountRestrictions.address).to.be.equal(accountPropertiesDTO.address); deepEqual(accountPropertiesDTO.properties.length, accountPropertiesDTO.properties.length); deepEqual(accountPropertiesDTO.properties[0].propertyType, accountPropertiesDTO.properties[0].propertyType); deepEqual(accountPropertiesDTO.properties[0].values.length, accountPropertiesDTO.properties[0].values.length); diff --git a/test/model/account/AccountPropertiesInfo.spec.ts b/test/model/account/AccountRestrictionsInfo.spec.ts similarity index 60% rename from test/model/account/AccountPropertiesInfo.spec.ts rename to test/model/account/AccountRestrictionsInfo.spec.ts index dd6d298986..04d5f6f2fb 100644 --- a/test/model/account/AccountPropertiesInfo.spec.ts +++ b/test/model/account/AccountRestrictionsInfo.spec.ts @@ -15,12 +15,12 @@ */ import {deepEqual} from 'assert'; -import { AccountProperties } from '../../../src/model/account/AccountProperties'; -import { AccountPropertiesInfo } from '../../../src/model/account/AccountPropertiesInfo'; -import { AccountProperty } from '../../../src/model/account/AccountProperty'; +import { AccountRestrictions } from '../../../src/model/account/AccountRestrictions'; +import { AccountRestrictionsInfo } from '../../../src/model/account/AccountRestrictionsInfo'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; describe('AccountPropertiesInfo', () => { @@ -31,27 +31,27 @@ describe('AccountPropertiesInfo', () => { accountProperties: { address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142', properties: [{ - propertyType: PropertyType.AllowAddress, - values: [{modificationType: PropertyModificationType.Add, + propertyType: RestrictionType.AllowAddress, + values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], }], }, }; - const accountPropertiesInfo = new AccountPropertiesInfo( + const accountPropertiesInfo = new AccountRestrictionsInfo( accountPropertiesInfoDTO.meta, - new AccountProperties(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), + new AccountRestrictions(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), accountPropertiesInfoDTO.accountProperties.properties.map((prop) => - new AccountProperty(prop.propertyType, prop.values))), + new AccountRestriction(prop.propertyType, prop.values))), ); deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id); - deepEqual(accountPropertiesInfo.accountProperties.address, + deepEqual(accountPropertiesInfo.accountRestrictions.address, Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address)); - deepEqual(accountPropertiesInfo.accountProperties.properties.length, + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions.length, accountPropertiesInfoDTO.accountProperties.properties.length); - deepEqual(accountPropertiesInfo.accountProperties.properties[0].values[0], + deepEqual(accountPropertiesInfo.accountRestrictions.restrictions[0].values[0], accountPropertiesInfoDTO.accountProperties.properties[0].values[0]); }); }); diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountPropertyTransaction.spec.ts index 4c78bdc7e2..de24268e9d 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountPropertyTransaction.spec.ts @@ -17,8 +17,8 @@ import {expect} from 'chai'; import {Account} from '../../../src/model/account/Account'; import {Address} from '../../../src/model/account/Address'; -import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType'; -import { PropertyType } from '../../../src/model/account/PropertyType'; +import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; +import { RestrictionType } from '../../../src/model/account/RestrictionType'; import {NetworkType} from '../../../src/model/blockchain/NetworkType'; import {MosaicId} from '../../../src/model/mosaic/MosaicId'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; @@ -37,20 +37,20 @@ describe('AccountRestrictionTransaction', () => { it('should create address property filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); - expect(addressPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(addressPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(addressPropertyFilter.value).to.be.equal(address.plain()); }); it('should create mosaic property filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); - expect(mosaicPropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(mosaicPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(mosaicPropertyFilter.value[0]).to.be.equal(mosaicId.id.lower); expect(mosaicPropertyFilter.value[1]).to.be.equal(mosaicId.id.higher); }); @@ -58,10 +58,10 @@ describe('AccountRestrictionTransaction', () => { it('should create entity type property filter', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); - expect(entityTypePropertyFilter.modificationType).to.be.equal(PropertyModificationType.Add); + expect(entityTypePropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); expect(entityTypePropertyFilter.value).to.be.equal(entityType); }); @@ -69,12 +69,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -85,12 +85,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -100,12 +100,12 @@ describe('AccountRestrictionTransaction', () => { it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); @@ -116,12 +116,12 @@ describe('AccountRestrictionTransaction', () => { it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -133,12 +133,12 @@ describe('AccountRestrictionTransaction', () => { it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, new UInt64([1, 0]), @@ -152,12 +152,12 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowAddress, + RestrictionType.AllowAddress, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -175,14 +175,14 @@ describe('AccountRestrictionTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); const addressPropertyFilter = AccountRestrictionModification.createForAddress( - PropertyModificationType.Add, + RestrictionModificationType.Add, address, ); expect(() => { AccountRestrictionTransaction.createAddressPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [addressPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -194,12 +194,12 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.AllowMosaic, + RestrictionType.AllowMosaic, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -217,14 +217,14 @@ describe('AccountRestrictionTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( - PropertyModificationType.Add, + RestrictionModificationType.Add, mosaicId, ); expect(() => { AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( Deadline.create(), - PropertyType.Sentinel, + RestrictionType.Sentinel, [mosaicPropertyFilter], NetworkType.MIJIN_TEST, ); @@ -236,12 +236,12 @@ describe('AccountRestrictionTransaction', () => { const entityType = TransactionType.ADDRESS_ALIAS; const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( - PropertyModificationType.Add, + RestrictionModificationType.Add, entityType, ); const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( Deadline.create(), - PropertyType.AllowTransaction, + RestrictionType.AllowTransaction, [entityTypePropertyFilter], NetworkType.MIJIN_TEST, ); From 508e24f18a2f12f52fbed519f12eb10316dfef57 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 10:53:59 +0100 Subject: [PATCH 205/208] Added #192 Updated AccountPropertyTransaction Names --- ...yTypeRestrictionModificationTransaction.ts | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts diff --git a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts new file mode 100644 index 0000000000..4b84cf9938 --- /dev/null +++ b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts @@ -0,0 +1,113 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; +import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; +import { PropertyType } from '../account/PropertyType'; +import { PublicAccount } from '../account/PublicAccount'; +import { NetworkType } from '../blockchain/NetworkType'; +import { UInt64 } from '../UInt64'; +import { AccountRestrictionModification } from './AccountRestrictionModification'; +import { Deadline } from './Deadline'; +import { Transaction } from './Transaction'; +import { TransactionInfo } from './TransactionInfo'; +import { TransactionType } from './TransactionType'; +import { TransactionVersion } from './TransactionVersion'; + +export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { + + /** + * Create a modify account property entity type transaction object + * @param deadline - The deadline to include the transaction. + * @param propertyType - The account property type. + * @param modifications - The array of modifications. + * @param networkType - The network type. + * @param maxFee - (Optional) Max fee defined by the sender + * @returns {AccountEntityTypeRestrictionModificationTransaction} + */ + public static create(deadline: Deadline, + propertyType: PropertyType, + modifications: Array>, + networkType: NetworkType, + maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { + return new AccountEntityTypeRestrictionModificationTransaction(networkType, + TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, + deadline, + maxFee, + propertyType, + modifications); + } + + /** + * @param networkType + * @param version + * @param deadline + * @param maxFee + * @param minApprovalDelta + * @param minRemovalDelta + * @param modifications + * @param signature + * @param signer + * @param transactionInfo + */ + constructor(networkType: NetworkType, + version: number, + deadline: Deadline, + maxFee: UInt64, + public readonly propertyType: PropertyType, + public readonly modifications: Array>, + signature?: string, + signer?: PublicAccount, + transactionInfo?: TransactionInfo) { + super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + } + + /** + * @override Transaction.size() + * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction + * @returns {number} + * @memberof AccountEntityTypeRestrictionModificationTransaction + */ + public get size(): number { + const byteSize = super.size; + + // set static byte size fields + const bytePropertyType = 1; + const byteModificationCount = 1; + + // each modification contains : + // - 1 byte for modificationType + // - 2 bytes for the modification value (transaction type) + const byteModifications = 3 * this.modifications.length; + + return byteSize + bytePropertyType + byteModificationCount + byteModifications; + } + + /** + * @internal + * @returns {VerifiableTransaction} + */ + protected buildTransaction(): VerifiableTransaction { + return new Builder() + .addDeadline(this.deadline.toDTO()) + .addFee(this.maxFee.toDTO()) + .addVersion(this.versionToDTO()) + .addPropertyType(this.propertyType) + .addModifications(this.modifications.map((modification) => modification.toDTO())) + .build(); + } + +} From 3d06a571b58550b8a5e0a1950120f82416fc73bf Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 20:54:15 +0100 Subject: [PATCH 206/208] Renamed accountEntityType to accountOperation --- ...yTypeRestrictionModificationTransaction.ts | 113 ------------------ ...ationRestrictionModificationTransaction.ts | 17 +-- 2 files changed, 9 insertions(+), 121 deletions(-) delete mode 100644 src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts diff --git a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts b/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts deleted file mode 100644 index 4b84cf9938..0000000000 --- a/src/model/transaction/AccountEntityTypeRestrictionModificationTransaction.ts +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; -import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; -import { PublicAccount } from '../account/PublicAccount'; -import { NetworkType } from '../blockchain/NetworkType'; -import { UInt64 } from '../UInt64'; -import { AccountRestrictionModification } from './AccountRestrictionModification'; -import { Deadline } from './Deadline'; -import { Transaction } from './Transaction'; -import { TransactionInfo } from './TransactionInfo'; -import { TransactionType } from './TransactionType'; -import { TransactionVersion } from './TransactionVersion'; - -export class AccountEntityTypeRestrictionModificationTransaction extends Transaction { - - /** - * Create a modify account property entity type transaction object - * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. - * @param modifications - The array of modifications. - * @param networkType - The network type. - * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountEntityTypeRestrictionModificationTransaction} - */ - public static create(deadline: Deadline, - propertyType: PropertyType, - modifications: Array>, - networkType: NetworkType, - maxFee: UInt64 = new UInt64([0, 0])): AccountEntityTypeRestrictionModificationTransaction { - return new AccountEntityTypeRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, - deadline, - maxFee, - propertyType, - modifications); - } - - /** - * @param networkType - * @param version - * @param deadline - * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta - * @param modifications - * @param signature - * @param signer - * @param transactionInfo - */ - constructor(networkType: NetworkType, - version: number, - deadline: Deadline, - maxFee: UInt64, - public readonly propertyType: PropertyType, - public readonly modifications: Array>, - signature?: string, - signer?: PublicAccount, - transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, networkType, version, deadline, maxFee, signature, signer, transactionInfo); - } - - /** - * @override Transaction.size() - * @description get the byte size of a AccountEntityTypeRestrictionModificationTransaction - * @returns {number} - * @memberof AccountEntityTypeRestrictionModificationTransaction - */ - public get size(): number { - const byteSize = super.size; - - // set static byte size fields - const bytePropertyType = 1; - const byteModificationCount = 1; - - // each modification contains : - // - 1 byte for modificationType - // - 2 bytes for the modification value (transaction type) - const byteModifications = 3 * this.modifications.length; - - return byteSize + bytePropertyType + byteModificationCount + byteModifications; - } - - /** - * @internal - * @returns {VerifiableTransaction} - */ - protected buildTransaction(): VerifiableTransaction { - return new Builder() - .addDeadline(this.deadline.toDTO()) - .addFee(this.maxFee.toDTO()) - .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) - .addModifications(this.modifications.map((modification) => modification.toDTO())) - .build(); - } - -} diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 946dd024ed..4c62d32999 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; +import { PropertyType } from '../account/PropertyType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountOperationRestrictionModificationTransaction extends Transaction { /** - * Create a modify account operation restriction type transaction object + * Create a modify account property entity type transaction object * @param deadline - The deadline to include the transaction. - * @param restrictionType - The account restriction type. + * @param propertyType - The account property type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, - restrictionType: RestrictionType, + propertyType: PropertyType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, - restrictionType, + propertyType, modifications); } @@ -56,7 +56,8 @@ export class AccountOperationRestrictionModificationTransaction extends Transact * @param version * @param deadline * @param maxFee - * @param restrictionType + * @param minApprovalDelta + * @param minRemovalDelta * @param modifications * @param signature * @param signer @@ -66,7 +67,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact version: number, deadline: Deadline, maxFee: UInt64, - public readonly restrictionType: RestrictionType, + public readonly propertyType: PropertyType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -104,7 +105,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addPropertyType(this.propertyType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } From 155aa1acb039436e7927186ed51274c5db0d5c37 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Sun, 30 Jun 2019 21:40:21 +0100 Subject: [PATCH 207/208] More renames --- ...erationRestrictionModificationTransaction.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 4c62d32999..946dd024ed 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -16,7 +16,7 @@ import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { PropertyType } from '../account/PropertyType'; +import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; @@ -30,16 +30,16 @@ import { TransactionVersion } from './TransactionVersion'; export class AccountOperationRestrictionModificationTransaction extends Transaction { /** - * Create a modify account property entity type transaction object + * Create a modify account operation restriction type transaction object * @param deadline - The deadline to include the transaction. - * @param propertyType - The account property type. + * @param restrictionType - The account restriction type. * @param modifications - The array of modifications. * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountOperationRestrictionModificationTransaction} */ public static create(deadline: Deadline, - propertyType: PropertyType, + restrictionType: RestrictionType, modifications: Array>, networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { @@ -47,7 +47,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, deadline, maxFee, - propertyType, + restrictionType, modifications); } @@ -56,8 +56,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact * @param version * @param deadline * @param maxFee - * @param minApprovalDelta - * @param minRemovalDelta + * @param restrictionType * @param modifications * @param signature * @param signer @@ -67,7 +66,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact version: number, deadline: Deadline, maxFee: UInt64, - public readonly propertyType: PropertyType, + public readonly restrictionType: RestrictionType, public readonly modifications: Array>, signature?: string, signer?: PublicAccount, @@ -105,7 +104,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.propertyType) + .addPropertyType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } From f34231a6e644afd61fae6b46818e7ecaf6902140 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 8 Jul 2019 15:14:51 +0100 Subject: [PATCH 208/208] Applied new DTOs from nem2-doc Renamed all `account properties` to `restrictions` --- e2e/infrastructure/AccountHttp.spec.ts | 22 +-- e2e/infrastructure/TransactionHttp.spec.ts | 57 +++---- src/core/utils/DtoMapping.ts | 26 ++-- src/infrastructure/AccountHttp.ts | 30 ++-- src/infrastructure/AccountRepository.ts | 12 +- src/infrastructure/api.ts | 5 +- src/infrastructure/api/accountRoutesApi.ts | 34 ++--- src/infrastructure/api/apis.ts | 4 +- src/infrastructure/api/blockRoutesApi.ts | 4 +- src/infrastructure/api/chainRoutesApi.ts | 4 +- src/infrastructure/api/diagnosticRoutesApi.ts | 4 +- src/infrastructure/api/mosaicRoutesApi.ts | 4 +- src/infrastructure/api/namespaceRoutesApi.ts | 4 +- src/infrastructure/api/networkRoutesApi.ts | 4 +- src/infrastructure/api/nodeRoutesApi.ts | 4 +- .../api/transactionRoutesApi.ts | 4 +- ...ntRestrictionsAddressTransactionBuffer.ts} | 142 +++++++++--------- ...estrictionsEntityTypeTransactionBuffer.ts} | 134 ++++++++--------- ...untRestrictionsMosaicTransactionBuffer.ts} | 142 +++++++++--------- .../AccountPropertiesAddressTransaction.ts | 128 ---------------- .../AccountPropertiesEntityTypeTransaction.ts | 126 ---------------- .../AccountPropertiesMosaicTransaction.ts | 127 ---------------- .../AccountRestrictionsAddressTransaction.ts | 128 ++++++++++++++++ ...ccountRestrictionsEntityTypeTransaction.ts | 126 ++++++++++++++++ .../AccountRestrictionsMosaicTransaction.ts | 127 ++++++++++++++++ src/infrastructure/model/accountDTO.ts | 4 +- src/infrastructure/model/accountIds.ts | 4 +- src/infrastructure/model/accountInfoDTO.ts | 4 +- src/infrastructure/model/accountMetaDTO.ts | 4 +- src/infrastructure/model/accountNamesDTO.ts | 6 +- ...ropertyDTO.ts => accountRestrictionDTO.ts} | 20 +-- ...eEnum.ts => accountRestrictionTypeEnum.ts} | 10 +- ...ertiesDTO.ts => accountRestrictionsDTO.ts} | 18 +-- ...foDTO.ts => accountRestrictionsInfoDTO.ts} | 18 +-- src/infrastructure/model/aliasDTO.ts | 4 +- src/infrastructure/model/aliasTypeEnum.ts | 4 +- .../model/announceTransactionInfoDTO.ts | 4 +- src/infrastructure/model/blockDTO.ts | 4 +- src/infrastructure/model/blockInfoDTO.ts | 4 +- src/infrastructure/model/blockMetaDTO.ts | 4 +- .../model/blockchainScoreDTO.ts | 4 +- .../model/communicationTimestamps.ts | 4 +- src/infrastructure/model/cosignature.ts | 4 +- src/infrastructure/model/heightInfoDTO.ts | 4 +- src/infrastructure/model/merklePathItem.ts | 4 +- src/infrastructure/model/merkleProofInfo.ts | 4 +- .../model/merkleProofInfoDTO.ts | 4 +- src/infrastructure/model/models.ts | 25 +-- src/infrastructure/model/mosaicDTO.ts | 4 +- .../model/mosaicDefinitionDTO.ts | 4 +- src/infrastructure/model/mosaicIds.ts | 4 +- src/infrastructure/model/mosaicInfoDTO.ts | 4 +- src/infrastructure/model/mosaicMetaDTO.ts | 4 +- src/infrastructure/model/mosaicNamesDTO.ts | 4 +- src/infrastructure/model/mosaicPropertyDTO.ts | 4 +- .../model/mosaicPropertyIdEnum.ts | 4 +- .../model/multisigAccountGraphInfoDTO.ts | 4 +- .../model/multisigAccountInfoDTO.ts | 4 +- src/infrastructure/model/multisigDTO.ts | 4 +- .../model/multisigModificationTypeEnum.ts | 4 +- src/infrastructure/model/namespaceDTO.ts | 4 +- src/infrastructure/model/namespaceIds.ts | 4 +- src/infrastructure/model/namespaceInfoDTO.ts | 4 +- src/infrastructure/model/namespaceMetaDTO.ts | 4 +- src/infrastructure/model/namespaceNameDTO.ts | 4 +- src/infrastructure/model/namespaceTypeEnum.ts | 4 +- src/infrastructure/model/networkTypeDTO.ts | 4 +- src/infrastructure/model/nodeInfoDTO.ts | 4 +- src/infrastructure/model/nodeTimeDTO.ts | 4 +- src/infrastructure/model/receiptTypeEnum.ts | 4 +- .../model/resolutionEntryDTO.ts | 4 +- .../model/resolutionStatementDTO.ts | 4 +- src/infrastructure/model/rolesTypeEnum.ts | 4 +- src/infrastructure/model/serverDTO.ts | 4 +- src/infrastructure/model/serverInfoDTO.ts | 4 +- src/infrastructure/model/sourceDTO.ts | 4 +- src/infrastructure/model/statementsDTO.ts | 4 +- src/infrastructure/model/storageInfoDTO.ts | 4 +- src/infrastructure/model/transactionHashes.ts | 4 +- src/infrastructure/model/transactionIds.ts | 4 +- .../model/transactionInfoDTO.ts | 4 +- .../model/transactionMetaDTO.ts | 4 +- .../model/transactionPayload.ts | 4 +- .../model/transactionStatementDTO.ts | 4 +- .../model/transactionStatusDTO.ts | 4 +- ...nsAddressModificationTransactionSchema.ts} | 6 +- ...ntityTypeModificationTransactionSchema.ts} | 6 +- ...onsMosaicModificationTransactionSchema.ts} | 6 +- .../transaction/CreateTransactionFromDTO.ts | 12 +- .../CreateTransactionFromPayload.ts | 14 +- .../transaction/SerializeTransactionToJSON.ts | 12 +- ...dressRestrictionModificationTransaction.ts | 15 +- ...osaicRestrictionModificationTransaction.ts | 15 +- ...ationRestrictionModificationTransaction.ts | 15 +- .../AccountRestrictionModification.ts | 14 +- .../AccountRestrictionTransaction.ts | 18 +-- src/model/transaction/TransactionType.ts | 12 +- src/model/transaction/TransactionVersion.ts | 12 +- test/core/utils/TransactionMapping.spec.ts | 96 ++++++------ .../SerializeTransactionToJSON.spec.ts | 48 +++--- test/model/account/AccountRestriction.spec.ts | 16 +- .../model/account/AccountRestrictions.spec.ts | 30 ++-- .../account/AccountRestrictionsInfo.spec.ts | 38 ++--- ... => AccountRestrictionTransaction.spec.ts} | 132 ++++++++-------- 104 files changed, 1115 insertions(+), 1117 deletions(-) rename src/infrastructure/buffers/{AccountPropertiesAddressTransactionBuffer.ts => AccountRestrictionsAddressTransactionBuffer.ts} (58%) rename src/infrastructure/buffers/{AccountPropertiesEntityTypeTransactionBuffer.ts => AccountRestrictionsEntityTypeTransactionBuffer.ts} (57%) rename src/infrastructure/buffers/{AccountPropertiesMosaicTransactionBuffer.ts => AccountRestrictionsMosaicTransactionBuffer.ts} (59%) delete mode 100644 src/infrastructure/builders/AccountPropertiesAddressTransaction.ts delete mode 100644 src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts delete mode 100644 src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts create mode 100644 src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts rename src/infrastructure/model/{accountPropertyDTO.ts => accountRestrictionDTO.ts} (72%) rename src/infrastructure/model/{accountPropertyTypeEnum.ts => accountRestrictionTypeEnum.ts} (56%) rename src/infrastructure/model/{accountPropertiesDTO.ts => accountRestrictionsDTO.ts} (76%) rename src/infrastructure/model/{accountPropertiesInfoDTO.ts => accountRestrictionsInfoDTO.ts} (71%) rename src/infrastructure/schemas/{AccountPropertiesAddressModificationTransactionSchema.ts => AccountRestrictionsAddressModificationTransactionSchema.ts} (87%) rename src/infrastructure/schemas/{AccountPropertiesEntityTypeModificationTransactionSchema.ts => AccountRestrictionsEntityTypeModificationTransactionSchema.ts} (87%) rename src/infrastructure/schemas/{AccountPropertiesMosaicModificationTransactionSchema.ts => AccountRestrictionsMosaicModificationTransactionSchema.ts} (87%) rename test/model/transaction/{AccountPropertyTransaction.spec.ts => AccountRestrictionTransaction.spec.ts} (54%) diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts index c6eabef382..89c0ba90ff 100644 --- a/e2e/infrastructure/AccountHttp.spec.ts +++ b/e2e/infrastructure/AccountHttp.spec.ts @@ -198,7 +198,7 @@ describe('AccountHttp', () => { RestrictionModificationType.Add, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, [addressPropertyFilter], @@ -282,22 +282,22 @@ describe('AccountHttp', () => { }); }); - describe('getAccountProperty', () => { - it('should call getAccountProperty successfully', (done) => { + describe('getAccountRestrictions', () => { + it('should call getAccountRestrictions successfully', (done) => { setTimeout(() => { - accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => { - deepEqual(accountProperty.accountRestrictions.address, accountAddress); + accountHttp.getAccountRestrictions(accountAddress).subscribe((accountRestrictions) => { + deepEqual(accountRestrictions.accountRestrictions.address, accountAddress); done(); }); }, 1000); }); }); - describe('getAccountProperties', () => { - it('should call getAccountProperties successfully', (done) => { + describe('getAccountRestrictions', () => { + it('should call getAccountRestrictions successfully', (done) => { setTimeout(() => { - accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => { - deepEqual(accountProperties[0]!.accountRestrictions.address, accountAddress); + accountHttp.getAccountRestrictionsFromAccounts([accountAddress]).subscribe((accountRestrictions) => { + deepEqual(accountRestrictions[0]!.accountRestrictions.address, accountAddress); done(); }); }, 1000); @@ -409,7 +409,7 @@ describe('AccountHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('Remove test AccountProperty - Address', () => { + describe('Remove test AccountRestriction - Address', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -424,7 +424,7 @@ describe('AccountHttp', () => { RestrictionModificationType.Remove, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, [addressPropertyFilter], diff --git a/e2e/infrastructure/TransactionHttp.spec.ts b/e2e/infrastructure/TransactionHttp.spec.ts index 9e9ab624b2..dbee30b256 100644 --- a/e2e/infrastructure/TransactionHttp.spec.ts +++ b/e2e/infrastructure/TransactionHttp.spec.ts @@ -24,10 +24,8 @@ import { NamespaceHttp } from '../../src/infrastructure/infrastructure'; import {Listener} from '../../src/infrastructure/Listener'; import {TransactionHttp} from '../../src/infrastructure/TransactionHttp'; import {Account} from '../../src/model/account/Account'; -import {Address} from '../../src/model/account/Address'; import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../src/model/account/RestrictionType'; -import {PublicAccount} from '../../src/model/account/PublicAccount'; import {NetworkType} from '../../src/model/blockchain/NetworkType'; import { Mosaic } from '../../src/model/mosaic/Mosaic'; import {MosaicId} from '../../src/model/mosaic/MosaicId'; @@ -38,31 +36,26 @@ import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosai import { AliasActionType } from '../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../src/model/namespace/NamespaceId'; import { AccountAddressRestrictionModificationTransaction } from '../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../src/model/transaction/AccountLinkTransaction'; import { AccountMosaicRestrictionModificationTransaction } from '../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; +import { AccountOperationRestrictionModificationTransaction } from '../../src/model/transaction/AccountOperationRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction'; import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction'; import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction'; -import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction'; import {Deadline} from '../../src/model/transaction/Deadline'; import { HashLockTransaction } from '../../src/model/transaction/HashLockTransaction'; import {HashType} from '../../src/model/transaction/HashType'; import { LinkAction } from '../../src/model/transaction/LinkAction'; import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction'; -import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../src/model/transaction/MosaicAliasTransaction'; import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction'; import {MosaicSupplyChangeTransaction} from '../../src/model/transaction/MosaicSupplyChangeTransaction'; -import {MultisigCosignatoryModification} from '../../src/model/transaction/MultisigCosignatoryModification'; -import {MultisigCosignatoryModificationType} from '../../src/model/transaction/MultisigCosignatoryModificationType'; -import {EmptyMessage, PlainMessage} from '../../src/model/transaction/PlainMessage'; +import { PlainMessage } from '../../src/model/transaction/PlainMessage'; import {RegisterNamespaceTransaction} from '../../src/model/transaction/RegisterNamespaceTransaction'; import {SecretLockTransaction} from '../../src/model/transaction/SecretLockTransaction'; import {SecretProofTransaction} from '../../src/model/transaction/SecretProofTransaction'; -import {SignedTransaction} from '../../src/model/transaction/SignedTransaction'; import {Transaction} from '../../src/model/transaction/Transaction'; import {TransactionType} from '../../src/model/transaction/TransactionType'; import {TransferTransaction} from '../../src/model/transaction/TransferTransaction'; @@ -283,14 +276,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account, generationHash); @@ -299,7 +292,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -320,14 +313,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Remove, account3.address, ); - const addressModification = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), @@ -358,14 +351,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account, generationHash); @@ -374,7 +367,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account.address).subscribe((error) => { @@ -395,14 +388,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Remove, mosaicId, ); - const addressModification = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), @@ -422,7 +415,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountRestrictionTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - Operation', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -433,14 +426,14 @@ describe('TransactionHttp', () => { }); it('standalone', (done) => { - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const signedTransaction = addressModification.signWith(account3, generationHash); @@ -449,7 +442,7 @@ describe('TransactionHttp', () => { expect(transaction.modifications, 'Modifications').not.to.be.undefined; expect(transaction.modifications[0].modificationType, 'Modifications.ModificationType').not.to.be.undefined; expect(transaction.modifications[0].value, 'Modifications.Value').not.to.be.undefined; - expect(transaction.restrictionType, 'PropertyType').not.to.be.undefined; + expect(transaction.restrictionType, 'RestrictionType').not.to.be.undefined; done(); }); listener.status(account3.address).subscribe((error) => { @@ -460,7 +453,7 @@ describe('TransactionHttp', () => { transactionHttp.announce(signedTransaction); }); }); - describe('AccountRestrictionTransaction - EntityType', () => { + describe('AccountRestrictionTransaction - Operation', () => { let listener: Listener; before (() => { listener = new Listener(config.apiUrl); @@ -470,14 +463,14 @@ describe('TransactionHttp', () => { return listener.close(); }); it('aggregate', (done) => { - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Remove, TransactionType.LINK_ACCOUNT, ); - const addressModification = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const addressModification = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.BlockTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(), diff --git a/src/core/utils/DtoMapping.ts b/src/core/utils/DtoMapping.ts index 20b184e8ad..9a0e2b77d1 100644 --- a/src/core/utils/DtoMapping.ts +++ b/src/core/utils/DtoMapping.ts @@ -14,9 +14,9 @@ * limitations under the License. */ +import { AccountRestriction } from '../../model/account/AccountRestriction'; import { AccountRestrictions } from '../../model/account/AccountRestrictions'; import { AccountRestrictionsInfo } from '../../model/account/AccountRestrictionsInfo'; -import { AccountRestriction } from '../../model/account/AccountRestriction'; import { Address } from '../../model/account/Address'; import { RestrictionType } from '../../model/account/RestrictionType'; import { MosaicId } from '../../model/mosaic/MosaicId'; @@ -24,29 +24,29 @@ import { MosaicId } from '../../model/mosaic/MosaicId'; export class DtoMapping { /** - * Create AccountPropertyInfo class from Json. - * @param {object} dataJson The account property json object. - * @returns {module: model/Account/AccountPropertiesInfo} The AccountPropertiesInfo class. + * Create AccountRestrictionsInfo class from Json. + * @param {object} dataJson The account restriction json object. + * @returns {module: model/Account/AccountRestrictionsInfo} The AccountRestrictionsInfo class. */ - public static extractAccountPropertyFromDto(accountProperties): AccountRestrictionsInfo { + public static extractAccountRestrictionFromDto(accountRestrictions): AccountRestrictionsInfo { return new AccountRestrictionsInfo( - accountProperties.meta, - new AccountRestrictions(Address.createFromEncoded(accountProperties.accountProperties.address), - accountProperties.accountProperties.properties.map((prop) => { - switch (prop.propertyType) { + accountRestrictions.meta, + new AccountRestrictions(Address.createFromEncoded(accountRestrictions.accountRestrictions.address), + accountRestrictions.accountRestrictions.restrictions.map((prop) => { + switch (prop.restrictionType) { case RestrictionType.AllowAddress: case RestrictionType.BlockAddress: - return new AccountRestriction(prop.propertyType, + return new AccountRestriction(prop.restrictionType, prop.values.map((value) => Address.createFromEncoded(value))); case RestrictionType.AllowMosaic: case RestrictionType.BlockMosaic: - return new AccountRestriction(prop.propertyType, + return new AccountRestriction(prop.restrictionType, prop.values.map((value) => new MosaicId(value))); case RestrictionType.AllowTransaction: case RestrictionType.BlockTransaction: - return new AccountRestriction(prop.propertyType, prop.values); + return new AccountRestriction(prop.restrictionType, prop.values); default: - throw new Error(`Invalid property type: ${prop.propertyType}`); + throw new Error(`Invalid restriction type: ${prop.restrictionType}`); } }))); } diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts index a174f27a81..6ef6ba3fae 100644 --- a/src/infrastructure/AccountHttp.ts +++ b/src/infrastructure/AccountHttp.ts @@ -34,8 +34,8 @@ import {UInt64} from '../model/UInt64'; import {AccountRepository} from './AccountRepository'; import { AccountInfoDTO, AccountNamesDTO, - AccountPropertiesDTO, - AccountPropertiesInfoDTO, + AccountRestrictionsDTO, + AccountRestrictionsInfoDTO, AccountRoutesApi, MosaicDTO, MultisigAccountGraphInfoDTO, @@ -93,31 +93,31 @@ export class AccountHttp extends Http implements AccountRepository { } /** - * Gets Account property. + * Get Account restrictions. * @param publicAccount public account - * @returns Observable + * @returns Observable */ - public getAccountProperties(address: Address): Observable { - return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())) - .pipe(map((accountProperties: AccountPropertiesInfoDTO) => { - return DtoMapping.extractAccountPropertyFromDto(accountProperties); + public getAccountRestrictions(address: Address): Observable { + return observableFrom(this.accountRoutesApi.getAccountRestrictions(address.plain())) + .pipe(map((accountRestrictions: AccountRestrictionsInfoDTO) => { + return DtoMapping.extractAccountRestrictionFromDto(accountRestrictions); })); } /** - * Gets Account properties. + * Get Account restrictions. * @param address list of addresses - * @returns Observable + * @returns Observable */ - public getAccountPropertiesFromAccounts(addresses: Address[]): Observable { + public getAccountRestrictionsFromAccounts(addresses: Address[]): Observable { const accountIds = { addresses: addresses.map((address) => address.plain()), }; return observableFrom( - this.accountRoutesApi.getAccountPropertiesFromAccounts(accountIds)) - .pipe(map((accountProperties: AccountPropertiesDTO[]) => { - return accountProperties.map((property) => { - return DtoMapping.extractAccountPropertyFromDto(property); + this.accountRoutesApi.getAccountRestrictionsFromAccounts(accountIds)) + .pipe(map((accountRestrictions: AccountRestrictionsDTO[]) => { + return accountRestrictions.map((restriction) => { + return DtoMapping.extractAccountRestrictionFromDto(restriction); }); })); } diff --git a/src/infrastructure/AccountRepository.ts b/src/infrastructure/AccountRepository.ts index 1fe6fa5e94..a853840b49 100644 --- a/src/infrastructure/AccountRepository.ts +++ b/src/infrastructure/AccountRepository.ts @@ -56,18 +56,18 @@ export interface AccountRepository { getAccountsNames(accountIds: Address[]): Observable; /** - * Gets Account property. + * Gets Account restrictions. * @param publicAccount public account - * @returns Observable + * @returns Observable */ - getAccountProperties(address: Address): Observable; + getAccountRestrictions(address: Address): Observable; /** - * Gets Account properties. + * Gets Account restrictions. * @param address list of addresses - * @returns Observable + * @returns Observable */ - getAccountPropertiesFromAccounts(addresses: Address[]): Observable; + getAccountRestrictionsFromAccounts(addresses: Address[]): Observable; /** * Gets a MultisigAccountInfo for an account. diff --git a/src/infrastructure/api.ts b/src/infrastructure/api.ts index 6d1bd548c9..590b4eacdd 100644 --- a/src/infrastructure/api.ts +++ b/src/infrastructure/api.ts @@ -14,16 +14,17 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * Do not edit the class manually. */ + // This is the entrypoint for the package export * from './api/apis'; export * from './model/models'; \ No newline at end of file diff --git a/src/infrastructure/api/accountRoutesApi.ts b/src/infrastructure/api/accountRoutesApi.ts index cdf01391d3..529245b7a5 100644 --- a/src/infrastructure/api/accountRoutesApi.ts +++ b/src/infrastructure/api/accountRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -32,7 +32,7 @@ import http = require('http'); import { AccountIds } from '../model/accountIds'; import { AccountInfoDTO } from '../model/accountInfoDTO'; import { AccountNamesDTO } from '../model/accountNamesDTO'; -import { AccountPropertiesInfoDTO } from '../model/accountPropertiesInfoDTO'; +import { AccountRestrictionsInfoDTO } from '../model/accountRestrictionsInfoDTO'; import { MultisigAccountGraphInfoDTO } from '../model/multisigAccountGraphInfoDTO'; import { MultisigAccountInfoDTO } from '../model/multisigAccountInfoDTO'; import { TransactionInfoDTO } from '../model/transactionInfoDTO'; @@ -262,12 +262,12 @@ export class AccountRoutesApi { }); } /** - * Returns the configurable properties for a given account. - * @summary Get account configurable properties information + * Returns the account restrictions for a given account. + * @summary Get the account restrictions * @param accountId The public key or address of the account. */ - public async getAccountProperties (accountId: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: AccountPropertiesInfoDTO; }> { - const localVarPath = this.basePath + '/account/{accountId}/properties/' + public async getAccountRestrictions (accountId: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: AccountRestrictionsInfoDTO; }> { + const localVarPath = this.basePath + '/account/{accountId}/restrictions/' .replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId))); let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); @@ -275,7 +275,7 @@ export class AccountRoutesApi { // verify required parameter 'accountId' is not null or undefined if (accountId === null || accountId === undefined) { - throw new Error('Required parameter accountId was null or undefined when calling getAccountProperties.'); + throw new Error('Required parameter accountId was null or undefined when calling getAccountRestrictions.'); } (Object).assign(localVarHeaderParams, options.headers); @@ -300,12 +300,12 @@ export class AccountRoutesApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.ClientResponse; body: AccountPropertiesInfoDTO; }>((resolve, reject) => { + return new Promise<{ response: http.ClientResponse; body: AccountRestrictionsInfoDTO; }>((resolve, reject) => { localVarRequest(localVarRequestOptions, (error, response, body) => { if (error) { reject(error); } else { - body = ObjectSerializer.deserialize(body, "AccountPropertiesInfoDTO"); + body = ObjectSerializer.deserialize(body, "AccountRestrictionsInfoDTO"); if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) { resolve(body); } else { @@ -319,19 +319,19 @@ export class AccountRoutesApi { }); } /** - * Returns the configurable properties for a given array of addresses. - * @summary Get account properties for given array of addresses + * Returns the account restrictions for a given array of addresses. + * @summary Get account restrictions for given array of addresses * @param accountIds */ - public async getAccountPropertiesFromAccounts (accountIds: AccountIds, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: Array; }> { - const localVarPath = this.basePath + '/account/properties'; + public async getAccountRestrictionsFromAccounts (accountIds: AccountIds, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: Array; }> { + const localVarPath = this.basePath + '/account/restrictions'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this.defaultHeaders); let localVarFormParams: any = {}; // verify required parameter 'accountIds' is not null or undefined if (accountIds === null || accountIds === undefined) { - throw new Error('Required parameter accountIds was null or undefined when calling getAccountPropertiesFromAccounts.'); + throw new Error('Required parameter accountIds was null or undefined when calling getAccountRestrictionsFromAccounts.'); } (Object).assign(localVarHeaderParams, options.headers); @@ -357,12 +357,12 @@ export class AccountRoutesApi { localVarRequestOptions.form = localVarFormParams; } } - return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => { + return new Promise<{ response: http.ClientResponse; body: Array; }>((resolve, reject) => { localVarRequest(localVarRequestOptions, (error, response, body) => { if (error) { reject(error); } else { - body = ObjectSerializer.deserialize(body, "Array"); + body = ObjectSerializer.deserialize(body, "Array"); if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) { resolve(body); } else { diff --git a/src/infrastructure/api/apis.ts b/src/infrastructure/api/apis.ts index b32f7659da..8772c3573e 100644 --- a/src/infrastructure/api/apis.ts +++ b/src/infrastructure/api/apis.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/blockRoutesApi.ts b/src/infrastructure/api/blockRoutesApi.ts index 81abddbdc6..881fb16997 100644 --- a/src/infrastructure/api/blockRoutesApi.ts +++ b/src/infrastructure/api/blockRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/chainRoutesApi.ts b/src/infrastructure/api/chainRoutesApi.ts index b5f3e17326..4e0706620c 100644 --- a/src/infrastructure/api/chainRoutesApi.ts +++ b/src/infrastructure/api/chainRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/diagnosticRoutesApi.ts b/src/infrastructure/api/diagnosticRoutesApi.ts index d05fc09bfe..e70a25623f 100644 --- a/src/infrastructure/api/diagnosticRoutesApi.ts +++ b/src/infrastructure/api/diagnosticRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/mosaicRoutesApi.ts b/src/infrastructure/api/mosaicRoutesApi.ts index 7470668f53..dfb0e36a8b 100644 --- a/src/infrastructure/api/mosaicRoutesApi.ts +++ b/src/infrastructure/api/mosaicRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/namespaceRoutesApi.ts b/src/infrastructure/api/namespaceRoutesApi.ts index ed7857bdf3..7ce0824c7b 100644 --- a/src/infrastructure/api/namespaceRoutesApi.ts +++ b/src/infrastructure/api/namespaceRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/networkRoutesApi.ts b/src/infrastructure/api/networkRoutesApi.ts index 368aa05c7d..1e9fa0422c 100644 --- a/src/infrastructure/api/networkRoutesApi.ts +++ b/src/infrastructure/api/networkRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/nodeRoutesApi.ts b/src/infrastructure/api/nodeRoutesApi.ts index bd2b829091..cd2b0ca19b 100644 --- a/src/infrastructure/api/nodeRoutesApi.ts +++ b/src/infrastructure/api/nodeRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/api/transactionRoutesApi.ts b/src/infrastructure/api/transactionRoutesApi.ts index e06468ad30..39618d7377 100644 --- a/src/infrastructure/api/transactionRoutesApi.ts +++ b/src/infrastructure/api/transactionRoutesApi.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts similarity index 58% rename from src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts index 128442e660..7f71878ffc 100644 --- a/src/infrastructure/buffers/AccountPropertiesAddressTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsAddressTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyAddressModificationBuffer = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyAddressModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.__init = function(i /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyAddressModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @param {Catapult.Buffers.RestrictionAddressModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.PropertyAddressModificationBuffer.getRootAsPropertyAddressModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyAddressModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionAddressModificationBuffer.getRootAsRestrictionAddressModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionAddressModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.modificationType = * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.value = function(index) { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.value = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.value = function(in /** * @returns {number} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueLength = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.valueLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueLength = funct /** * @returns {Uint8Array} */ -Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueArray = function() { +Catapult.Buffers.RestrictionAddressModificationBuffer.prototype.valueArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.prototype.valueArray = functi /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyAddressModificationBuffer.startPropertyAddressModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionAddressModificationBuffer.startRestrictionAddressModificationBuffer = function(builder) { builder.startObject(2); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.startPropertyAddressModificat * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyAddressModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionAddressModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.addModificationType = functio * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} valueOffset */ -Catapult.Buffers.PropertyAddressModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionAddressModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldOffset(1, valueOffset, 0); }; @@ -124,7 +124,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.addValue = function(builder, * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyAddressModificationBuffer.createValueVector = function(builder, data) { +Catapult.Buffers.RestrictionAddressModificationBuffer.createValueVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -136,7 +136,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.createValueVector = function( * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.PropertyAddressModificationBuffer.startValueVector = function(builder, numElems) { +Catapult.Buffers.RestrictionAddressModificationBuffer.startValueVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -144,7 +144,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.startValueVector = function(b * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyAddressModificationBuffer.endPropertyAddressModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionAddressModificationBuffer.endRestrictionAddressModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -152,7 +152,7 @@ Catapult.Buffers.PropertyAddressModificationBuffer.endPropertyAddressModificatio /** * @constructor */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -167,9 +167,9 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -177,17 +177,17 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.__init = fu /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesAddressTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.getRootAsAccountPropertiesAddressTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesAddressTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.getRootAsAccountRestrictionsAddressTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -196,7 +196,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.size = func * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -204,7 +204,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signature = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -212,7 +212,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureLe /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -221,7 +221,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signatureAr * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -229,7 +229,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signer = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -237,7 +237,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerLengt /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -245,7 +245,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.signerArray /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -253,7 +253,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.version = f /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -262,7 +262,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.type = func * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -270,7 +270,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.fee = funct /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -278,7 +278,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeLength = /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -287,7 +287,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.feeArray = * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -295,7 +295,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadline = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -303,7 +303,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineLen /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -311,7 +311,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.deadlineArr /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -320,25 +320,25 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.propertyTyp /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyAddressModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyAddressModificationBuffer} + * @param {Catapult.Buffers.RestrictionAddressModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionAddressModificationBuffer} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyAddressModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionAddressModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.prototype.modificatio /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startAccountPropertiesAddressTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startAccountRestrictionsAddressTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startAccountPropertie * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -362,7 +362,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSize = function(bu * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -371,7 +371,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSignature = functi * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignatureVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignatureVector * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -400,7 +400,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addSigner = function( * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -412,7 +412,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createSignerVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startSignerVector = f * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addVersion = function * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -436,7 +436,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addType = function(bu * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -445,7 +445,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addFee = function(bui * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -457,7 +457,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createFeeVector = fun * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -465,7 +465,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startFeeVector = func * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addDeadline = functio * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -486,16 +486,16 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createDeadlineVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addPropertyType = fun * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -511,7 +511,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModificationCount * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -520,7 +520,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.addModifications = fu * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -532,7 +532,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.createModificationsVe * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -540,7 +540,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.startModificationsVec * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.endAccountPropertiesAddressTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.endAccountRestrictionsAddressTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -549,7 +549,7 @@ Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.endAccountPropertiesA * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesAddressTransactionBuffer.finishAccountPropertiesAddressTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsAddressTransactionBuffer.finishAccountRestrictionsAddressTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts similarity index 57% rename from src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts index 0994479bf7..b842f8d776 100644 --- a/src/infrastructure/buffers/AccountPropertiesEntityTypeTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsEntityTypeTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.__init = functio /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyEntityTypeModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @param {Catapult.Buffers.RestrictionEntityTypeModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.getRootAsPropertyEntityTypeModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyEntityTypeModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.getRootAsRestrictionEntityTypeModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionEntityTypeModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.modificationType * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.value = function() { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.prototype.value = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.prototype.value = function /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.startPropertyEntityTypeModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.startRestrictionEntityTypeModificationBuffer = function(builder) { builder.startObject(2); }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.startPropertyEntityTypeMod * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.addModificationType = func * @param {flatbuffers.Builder} builder * @param {number} valueOffset */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldInt16(1, valueOffset, 0); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.addValue = function(builde * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionEntityTypeModificationBuffer.endRestrictionEntityTypeModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModif /** * @constructor */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -130,9 +130,9 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -140,17 +140,17 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.__init = /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.getRootAsAccountPropertiesEntityTypeTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.getRootAsAccountRestrictionsEntityTypeTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -159,7 +159,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.size = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -167,7 +167,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -175,7 +175,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -184,7 +184,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signatur * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -192,7 +192,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signer = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -200,7 +200,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerLe /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -208,7 +208,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.signerAr /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -216,7 +216,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.version /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -225,7 +225,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.type = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -233,7 +233,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.fee = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -241,7 +241,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeLengt /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -250,7 +250,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.feeArray * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -258,7 +258,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -266,7 +266,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -274,7 +274,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.deadline /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -283,25 +283,25 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.property /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyEntityTypeModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyEntityTypeModificationBuffer} + * @param {Catapult.Buffers.RestrictionEntityTypeModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionEntityTypeModificationBuffer} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyEntityTypeModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionEntityTypeModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -309,7 +309,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.prototype.modifica /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startAccountPropertiesEntityTypeTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startAccountRestrictionsEntityTypeTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -317,7 +317,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startAccountProper * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -325,7 +325,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSize = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -334,7 +334,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSignature = fun * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignatureVec * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignatureVect * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -363,7 +363,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addSigner = functi * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -375,7 +375,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createSignerVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startSignerVector * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addVersion = funct * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -399,7 +399,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addType = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -408,7 +408,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addFee = function( * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createFeeVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startFeeVector = f * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -437,7 +437,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addDeadline = func * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -449,16 +449,16 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createDeadlineVect * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -466,7 +466,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addPropertyType = * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModificationCou * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -483,7 +483,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.addModifications = * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -495,7 +495,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.createModification * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.startModifications * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.endAccountPropertiesEntityTypeTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.endAccountRestrictionsEntityTypeTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -512,7 +512,7 @@ Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.endAccountProperti * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesEntityTypeTransactionBuffer.finishAccountPropertiesEntityTypeTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsEntityTypeTransactionBuffer.finishAccountRestrictionsEntityTypeTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts b/src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts similarity index 59% rename from src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts rename to src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts index 59241cc50e..2fde91933f 100644 --- a/src/infrastructure/buffers/AccountPropertiesMosaicTransactionBuffer.ts +++ b/src/infrastructure/buffers/AccountRestrictionsMosaicTransactionBuffer.ts @@ -31,7 +31,7 @@ Catapult.Buffers = Catapult.Buffers || {}; /** * @constructor */ -Catapult.Buffers.PropertyMosaicModificationBuffer = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -46,9 +46,9 @@ Catapult.Buffers.PropertyMosaicModificationBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -56,17 +56,17 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.__init = function(i, /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.PropertyMosaicModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @param {Catapult.Buffers.RestrictionMosaicModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.getRootAsPropertyMosaicModificationBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.PropertyMosaicModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.RestrictionMosaicModificationBuffer.getRootAsRestrictionMosaicModificationBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.RestrictionMosaicModificationBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.modificationType = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.modificationType = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -75,7 +75,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.modificationType = f * @param {number} index * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.value = function(index) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.value = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -83,7 +83,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.value = function(ind /** * @returns {number} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueLength = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.valueLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -91,7 +91,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueLength = functi /** * @returns {Uint8Array} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueArray = function() { +Catapult.Buffers.RestrictionMosaicModificationBuffer.prototype.valueArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -99,7 +99,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.prototype.valueArray = functio /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.PropertyMosaicModificationBuffer.startPropertyMosaicModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.startRestrictionMosaicModificationBuffer = function(builder) { builder.startObject(2); }; @@ -107,7 +107,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.startPropertyMosaicModificatio * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.PropertyMosaicModificationBuffer.addModificationType = function(builder, type) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.addModificationType = function(builder, type) { builder.addFieldInt8(0, type, 0); }; @@ -115,7 +115,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.addModificationType = function * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} valueOffset */ -Catapult.Buffers.PropertyMosaicModificationBuffer.addValue = function(builder, valueOffset) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.addValue = function(builder, valueOffset) { builder.addFieldOffset(1, valueOffset, 0); }; @@ -124,7 +124,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.addValue = function(builder, v * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.createValueVector = function(builder, data) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.createValueVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -136,7 +136,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.createValueVector = function(b * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.PropertyMosaicModificationBuffer.startValueVector = function(builder, numElems) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.startValueVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -144,7 +144,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.startValueVector = function(bu * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.PropertyMosaicModificationBuffer.endPropertyMosaicModificationBuffer = function(builder) { +Catapult.Buffers.RestrictionMosaicModificationBuffer.endRestrictionMosaicModificationBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -152,7 +152,7 @@ Catapult.Buffers.PropertyMosaicModificationBuffer.endPropertyMosaicModificationB /** * @constructor */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer = function() { /** * @type {flatbuffers.ByteBuffer} */ @@ -167,9 +167,9 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer = function() { /** * @param {number} i * @param {flatbuffers.ByteBuffer} bb - * @returns {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer} + * @returns {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.__init = function(i, bb) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.__init = function(i, bb) { this.bb_pos = i; this.bb = bb; return this; @@ -177,17 +177,17 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.__init = fun /** * @param {flatbuffers.ByteBuffer} bb - * @param {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer=} obj - * @returns {Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer} + * @param {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer=} obj + * @returns {Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.getRootAsAccountPropertiesMosaicTransactionBuffer = function(bb, obj) { - return (obj || new Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.getRootAsAccountRestrictionsMosaicTransactionBuffer = function(bb, obj) { + return (obj || new Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer).__init(bb.readInt32(bb.position()) + bb.position(), bb); }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.size = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.size = function() { var offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.readUint32(this.bb_pos + offset) : 0; }; @@ -196,7 +196,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.size = funct * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signature = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signature = function(index) { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -204,7 +204,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signature = /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signatureLength = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -212,7 +212,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureLen /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signatureArray = function() { var offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -221,7 +221,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signatureArr * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signer = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signer = function(index) { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.readUint8(this.bb.__vector(this.bb_pos + offset) + index) : 0; }; @@ -229,7 +229,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signer = fun /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signerLength = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -237,7 +237,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerLength /** * @returns {Uint8Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.signerArray = function() { var offset = this.bb.__offset(this.bb_pos, 8); return offset ? new Uint8Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -245,7 +245,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.signerArray /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.version = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.version = function() { var offset = this.bb.__offset(this.bb_pos, 10); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -253,7 +253,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.version = fu /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.type = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.type = function() { var offset = this.bb.__offset(this.bb_pos, 12); return offset ? this.bb.readUint16(this.bb_pos + offset) : 0; }; @@ -262,7 +262,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.type = funct * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.fee = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.fee = function(index) { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -270,7 +270,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.fee = functi /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.feeLength = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -278,7 +278,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeLength = /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.feeArray = function() { var offset = this.bb.__offset(this.bb_pos, 14); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -287,7 +287,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.feeArray = f * @param {number} index * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadline = function(index) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadline = function(index) { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.readUint32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; }; @@ -295,7 +295,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadline = f /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadlineLength = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -303,7 +303,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineLeng /** * @returns {Uint32Array} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineArray = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.deadlineArray = function() { var offset = this.bb.__offset(this.bb_pos, 16); return offset ? new Uint32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; }; @@ -311,7 +311,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.deadlineArra /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.propertyType = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.restrictionType = function() { var offset = this.bb.__offset(this.bb_pos, 18); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; @@ -320,25 +320,25 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.propertyType /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modificationCount = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modificationCount = function() { var offset = this.bb.__offset(this.bb_pos, 20); return offset ? this.bb.readUint8(this.bb_pos + offset) : 0; }; /** * @param {number} index - * @param {Catapult.Buffers.PropertyMosaicModificationBuffer=} obj - * @returns {Catapult.Buffers.PropertyMosaicModificationBuffer} + * @param {Catapult.Buffers.RestrictionMosaicModificationBuffer=} obj + * @returns {Catapult.Buffers.RestrictionMosaicModificationBuffer} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modifications = function(index, obj) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modifications = function(index, obj) { var offset = this.bb.__offset(this.bb_pos, 22); - return offset ? (obj || new Catapult.Buffers.PropertyMosaicModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; + return offset ? (obj || new Catapult.Buffers.RestrictionMosaicModificationBuffer).__init(this.bb.__indirect(this.bb.__vector(this.bb_pos + offset) + index * 4), this.bb) : null; }; /** * @returns {number} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modificationsLength = function() { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.prototype.modificationsLength = function() { var offset = this.bb.__offset(this.bb_pos, 22); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; }; @@ -346,7 +346,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.prototype.modification /** * @param {flatbuffers.Builder} builder */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startAccountPropertiesMosaicTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startAccountRestrictionsMosaicTransactionBuffer = function(builder) { builder.startObject(11); }; @@ -354,7 +354,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startAccountProperties * @param {flatbuffers.Builder} builder * @param {number} size */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSize = function(builder, size) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSize = function(builder, size) { builder.addFieldInt32(0, size, 0); }; @@ -362,7 +362,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSize = function(bui * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signatureOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSignature = function(builder, signatureOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSignature = function(builder, signatureOffset) { builder.addFieldOffset(1, signatureOffset, 0); }; @@ -371,7 +371,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSignature = functio * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignatureVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createSignatureVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -383,7 +383,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignatureVector * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignatureVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startSignatureVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -391,7 +391,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignatureVector = * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} signerOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSigner = function(builder, signerOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addSigner = function(builder, signerOffset) { builder.addFieldOffset(2, signerOffset, 0); }; @@ -400,7 +400,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addSigner = function(b * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignerVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createSignerVector = function(builder, data) { builder.startVector(1, data.length, 1); for (var i = data.length - 1; i >= 0; i--) { builder.addInt8(data[i]); @@ -412,7 +412,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createSignerVector = f * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignerVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startSignerVector = function(builder, numElems) { builder.startVector(1, numElems, 1); }; @@ -420,7 +420,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startSignerVector = fu * @param {flatbuffers.Builder} builder * @param {number} version */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addVersion = function(builder, version) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addVersion = function(builder, version) { builder.addFieldInt16(3, version, 0); }; @@ -428,7 +428,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addVersion = function( * @param {flatbuffers.Builder} builder * @param {number} type */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addType = function(builder, type) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addType = function(builder, type) { builder.addFieldInt16(4, type, 0); }; @@ -436,7 +436,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addType = function(bui * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} feeOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addFee = function(builder, feeOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addFee = function(builder, feeOffset) { builder.addFieldOffset(5, feeOffset, 0); }; @@ -445,7 +445,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addFee = function(buil * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createFeeVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createFeeVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -457,7 +457,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createFeeVector = func * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startFeeVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startFeeVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -465,7 +465,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startFeeVector = funct * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} deadlineOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addDeadline = function(builder, deadlineOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addDeadline = function(builder, deadlineOffset) { builder.addFieldOffset(6, deadlineOffset, 0); }; @@ -474,7 +474,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addDeadline = function * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createDeadlineVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createDeadlineVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addInt32(data[i]); @@ -486,16 +486,16 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createDeadlineVector = * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startDeadlineVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startDeadlineVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; /** * @param {flatbuffers.Builder} builder - * @param {number} propertyType + * @param {number} restrictionType */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addPropertyType = function(builder, propertyType) { - builder.addFieldInt8(7, propertyType, 0); +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addRestrictionType = function(builder, restrictionType) { + builder.addFieldInt8(7, restrictionType, 0); }; @@ -503,7 +503,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addPropertyType = func * @param {flatbuffers.Builder} builder * @param {number} modificationCount */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModificationCount = function(builder, modificationCount) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addModificationCount = function(builder, modificationCount) { builder.addFieldInt8(8, modificationCount, 0); }; @@ -511,7 +511,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModificationCount = * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} modificationsOffset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModifications = function(builder, modificationsOffset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.addModifications = function(builder, modificationsOffset) { builder.addFieldOffset(9, modificationsOffset, 0); }; @@ -520,7 +520,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.addModifications = fun * @param {Array.} data * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createModificationsVector = function(builder, data) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.createModificationsVector = function(builder, data) { builder.startVector(4, data.length, 4); for (var i = data.length - 1; i >= 0; i--) { builder.addOffset(data[i]); @@ -532,7 +532,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.createModificationsVec * @param {flatbuffers.Builder} builder * @param {number} numElems */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startModificationsVector = function(builder, numElems) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.startModificationsVector = function(builder, numElems) { builder.startVector(4, numElems, 4); }; @@ -540,7 +540,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.startModificationsVect * @param {flatbuffers.Builder} builder * @returns {flatbuffers.Offset} */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMosaicTransactionBuffer = function(builder) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.endAccountRestrictionsMosaicTransactionBuffer = function(builder) { var offset = builder.endObject(); return offset; }; @@ -549,7 +549,7 @@ Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMo * @param {flatbuffers.Builder} builder * @param {flatbuffers.Offset} offset */ -Catapult.Buffers.AccountPropertiesMosaicTransactionBuffer.finishAccountPropertiesMosaicTransactionBufferBuffer = function(builder, offset) { +Catapult.Buffers.AccountRestrictionsMosaicTransactionBuffer.finishAccountRestrictionsMosaicTransactionBufferBuffer = function(builder, offset) { builder.finish(offset); }; diff --git a/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts b/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts deleted file mode 100644 index 13ac8e7da3..0000000000 --- a/src/infrastructure/builders/AccountPropertiesAddressTransaction.ts +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesAddressTransaction - */ -import { RawAddress as address } from '../../core/format'; -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesAddressTransactionBufferPackage from '../buffers/AccountPropertiesAddressTransactionBuffer'; -import AccountPropertiesAddressModificationTransactionSchema from '../schemas/AccountPropertiesAddressModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; -const { - AccountPropertiesAddressTransactionBuffer, - PropertyAddressModificationBuffer, -} = AccountPropertiesAddressTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesAddressTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesAddressModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - const addressModificationVector = PropertyAddressModificationBuffer - .createValueVector(builder, address.stringToAddress(modification.value)); - PropertyAddressModificationBuffer.startPropertyAddressModificationBuffer(builder); - PropertyAddressModificationBuffer.addModificationType(builder, modification.type); - PropertyAddressModificationBuffer.addValue(builder, addressModificationVector); - modificationsArray.push(PropertyAddressModificationBuffer.endPropertyAddressModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesAddressTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesAddressTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesAddressTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesAddressTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesAddressTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesAddressTransactionBuffer.startAccountPropertiesAddressTransactionBuffer(builder); - AccountPropertiesAddressTransactionBuffer.addSize(builder, 122 + (26 * this.modifications.length)); - AccountPropertiesAddressTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesAddressTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesAddressTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesAddressTransactionBuffer.addType(builder, this.type); - AccountPropertiesAddressTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesAddressTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesAddressTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesAddressTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesAddressTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesAddress = - AccountPropertiesAddressTransactionBuffer.endAccountPropertiesAddressTransactionBuffer(builder); - builder.finish(codedAccountPropertiesAddress); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesAddressTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts b/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts deleted file mode 100644 index 094d2bb1dc..0000000000 --- a/src/infrastructure/builders/AccountPropertiesEntityTypeTransaction.ts +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesEntityTypeTransaction - */ -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesEntityTypeTransactionBufferPackage from '../buffers/AccountPropertiesEntityTypeTransactionBuffer'; -import AccountPropertiesEntityTypeModificationTransactionSchema from '../schemas/AccountPropertiesEntityTypeModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; - -const { - AccountPropertiesEntityTypeTransactionBuffer, - PropertyEntityTypeModificationBuffer, -} = AccountPropertiesEntityTypeTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesEntityTypeTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesEntityTypeModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - PropertyEntityTypeModificationBuffer.startPropertyEntityTypeModificationBuffer(builder); - PropertyEntityTypeModificationBuffer.addModificationType(builder, modification.type); - PropertyEntityTypeModificationBuffer.addValue(builder, modification.value); - modificationsArray.push(PropertyEntityTypeModificationBuffer.endPropertyEntityTypeModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesEntityTypeTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesEntityTypeTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesEntityTypeTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesEntityTypeTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesEntityTypeTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesEntityTypeTransactionBuffer.startAccountPropertiesEntityTypeTransactionBuffer(builder); - AccountPropertiesEntityTypeTransactionBuffer.addSize(builder, 122 + (3 * this.modifications.length)); - AccountPropertiesEntityTypeTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesEntityTypeTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesEntityTypeTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesEntityTypeTransactionBuffer.addType(builder, this.type); - AccountPropertiesEntityTypeTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesEntityTypeTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesEntityTypeTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesEntityTypeTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesEntityTypeTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesAddress = AccountPropertiesEntityTypeTransactionBuffer - .endAccountPropertiesEntityTypeTransactionBuffer(builder); - builder.finish(codedAccountPropertiesAddress); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesEntityTypeTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts b/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts deleted file mode 100644 index 3842421260..0000000000 --- a/src/infrastructure/builders/AccountPropertiesMosaicTransaction.ts +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2019 NEM - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @module transactions/AccountPropertiesMosaicTransaction - */ -import { TransactionType } from '../../model/transaction/TransactionType'; -import AccountPropertiesMosaicTransactionBufferPackage from '../buffers/AccountPropertiesMosaicTransactionBuffer'; -import AccountPropertiesMosaicModificationTransactionSchema from '../schemas/AccountPropertiesMosaicModificationTransactionSchema'; -import { VerifiableTransaction } from './VerifiableTransaction'; - -const { - AccountPropertiesMosaicTransactionBuffer, - PropertyMosaicModificationBuffer, -} = AccountPropertiesMosaicTransactionBufferPackage.Buffers; - -import {flatbuffers} from 'flatbuffers'; - -export default class AccountPropertiesMosaicTransaction extends VerifiableTransaction { - constructor(bytes) { - super(bytes, AccountPropertiesMosaicModificationTransactionSchema); - } -} - -// tslint:disable-next-line:max-classes-per-file -export class Builder { - maxFee: any; - version: any; - type: any; - deadline: any; - propertyType: any; - modifications: any; - constructor() { - this.maxFee = [0, 0]; - this.type = TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC; - } - - addFee(maxFee) { - this.maxFee = maxFee; - return this; - } - - addVersion(version) { - this.version = version; - return this; - } - - addType(type) { - this.type = type; - return this; - } - - addDeadline(deadline) { - this.deadline = deadline; - return this; - } - - addPropertyType(propertyType) { - this.propertyType = propertyType; - return this; - } - - addModifications(modifications) { - this.modifications = modifications; - return this; - } - - build() { - const builder = new flatbuffers.Builder(1); - - // Create modifications - const modificationsArray: any = []; - this.modifications.forEach((modification) => { - const addressModificationVector = PropertyMosaicModificationBuffer - .createValueVector(builder, modification.value); - PropertyMosaicModificationBuffer.startPropertyMosaicModificationBuffer(builder); - PropertyMosaicModificationBuffer.addModificationType(builder, modification.type); - PropertyMosaicModificationBuffer.addValue(builder, addressModificationVector); - modificationsArray.push(PropertyMosaicModificationBuffer.endPropertyMosaicModificationBuffer(builder)); - }); - - // Create vectors - const signatureVector = AccountPropertiesMosaicTransactionBuffer - .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); - const signerVector = AccountPropertiesMosaicTransactionBuffer - .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); - const deadlineVector = AccountPropertiesMosaicTransactionBuffer - .createDeadlineVector(builder, this.deadline); - const feeVector = AccountPropertiesMosaicTransactionBuffer - .createFeeVector(builder, this.maxFee); - const modificationVector = AccountPropertiesMosaicTransactionBuffer - .createModificationsVector(builder, modificationsArray); - - AccountPropertiesMosaicTransactionBuffer.startAccountPropertiesMosaicTransactionBuffer(builder); - AccountPropertiesMosaicTransactionBuffer.addSize(builder, 122 + (9 * this.modifications.length)); - AccountPropertiesMosaicTransactionBuffer.addSignature(builder, signatureVector); - AccountPropertiesMosaicTransactionBuffer.addSigner(builder, signerVector); - AccountPropertiesMosaicTransactionBuffer.addVersion(builder, this.version); - AccountPropertiesMosaicTransactionBuffer.addType(builder, this.type); - AccountPropertiesMosaicTransactionBuffer.addFee(builder, feeVector); - AccountPropertiesMosaicTransactionBuffer.addDeadline(builder, deadlineVector); - AccountPropertiesMosaicTransactionBuffer.addPropertyType(builder, this.propertyType); - AccountPropertiesMosaicTransactionBuffer.addModificationCount(builder, this.modifications.length); - AccountPropertiesMosaicTransactionBuffer.addModifications(builder, modificationVector); - - // Calculate size - const codedAccountPropertiesMosaic = AccountPropertiesMosaicTransactionBuffer.endAccountPropertiesMosaicTransactionBuffer(builder); - builder.finish(codedAccountPropertiesMosaic); - - const bytes = builder.asUint8Array(); - - return new AccountPropertiesMosaicTransaction(bytes); - } -} diff --git a/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts b/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts new file mode 100644 index 0000000000..452e4c30b7 --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsAddressTransaction.ts @@ -0,0 +1,128 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsAddressTransaction + */ +import { RawAddress as address } from '../../core/format'; +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsAddressTransactionBufferPackage from '../buffers/AccountRestrictionsAddressTransactionBuffer'; +import AccountRestrictionsAddressModificationTransactionSchema from '../schemas/AccountRestrictionsAddressModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; +const { + AccountRestrictionsAddressTransactionBuffer, + RestrictionAddressModificationBuffer, +} = AccountRestrictionsAddressTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsAddressTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsAddressModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + const addressModificationVector = RestrictionAddressModificationBuffer + .createValueVector(builder, address.stringToAddress(modification.value)); + RestrictionAddressModificationBuffer.startRestrictionAddressModificationBuffer(builder); + RestrictionAddressModificationBuffer.addModificationType(builder, modification.type); + RestrictionAddressModificationBuffer.addValue(builder, addressModificationVector); + modificationsArray.push(RestrictionAddressModificationBuffer.endRestrictionAddressModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsAddressTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsAddressTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsAddressTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsAddressTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsAddressTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsAddressTransactionBuffer.startAccountRestrictionsAddressTransactionBuffer(builder); + AccountRestrictionsAddressTransactionBuffer.addSize(builder, 122 + (26 * this.modifications.length)); + AccountRestrictionsAddressTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsAddressTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsAddressTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsAddressTransactionBuffer.addType(builder, this.type); + AccountRestrictionsAddressTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsAddressTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsAddressTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsAddressTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsAddressTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsAddress = + AccountRestrictionsAddressTransactionBuffer.endAccountRestrictionsAddressTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsAddress); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsAddressTransaction(bytes); + } +} diff --git a/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts b/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts new file mode 100644 index 0000000000..edfed292ba --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsEntityTypeTransaction.ts @@ -0,0 +1,126 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsEntityTypeTransaction + */ +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsEntityTypeTransactionBufferPackage from '../buffers/AccountRestrictionsEntityTypeTransactionBuffer'; +import AccountRestrictionsEntityTypeModificationTransactionSchema from '../schemas/AccountRestrictionsEntityTypeModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; + +const { + AccountRestrictionsEntityTypeTransactionBuffer, + RestrictionEntityTypeModificationBuffer, +} = AccountRestrictionsEntityTypeTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsEntityTypeTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsEntityTypeModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + RestrictionEntityTypeModificationBuffer.startRestrictionEntityTypeModificationBuffer(builder); + RestrictionEntityTypeModificationBuffer.addModificationType(builder, modification.type); + RestrictionEntityTypeModificationBuffer.addValue(builder, modification.value); + modificationsArray.push(RestrictionEntityTypeModificationBuffer.endRestrictionEntityTypeModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsEntityTypeTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsEntityTypeTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsEntityTypeTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsEntityTypeTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsEntityTypeTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsEntityTypeTransactionBuffer.startAccountRestrictionsEntityTypeTransactionBuffer(builder); + AccountRestrictionsEntityTypeTransactionBuffer.addSize(builder, 122 + (3 * this.modifications.length)); + AccountRestrictionsEntityTypeTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsEntityTypeTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsEntityTypeTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsEntityTypeTransactionBuffer.addType(builder, this.type); + AccountRestrictionsEntityTypeTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsEntityTypeTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsEntityTypeTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsEntityTypeTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsEntityTypeTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsAddress = AccountRestrictionsEntityTypeTransactionBuffer + .endAccountRestrictionsEntityTypeTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsAddress); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsEntityTypeTransaction(bytes); + } +} diff --git a/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts b/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts new file mode 100644 index 0000000000..ec97bcc02e --- /dev/null +++ b/src/infrastructure/builders/AccountRestrictionsMosaicTransaction.ts @@ -0,0 +1,127 @@ +/* + * Copyright 2019 NEM + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @module transactions/AccountRestrictionsMosaicTransaction + */ +import { TransactionType } from '../../model/transaction/TransactionType'; +import AccountRestrictionsMosaicTransactionBufferPackage from '../buffers/AccountRestrictionsMosaicTransactionBuffer'; +import AccountRestrictionsMosaicModificationTransactionSchema from '../schemas/AccountRestrictionsMosaicModificationTransactionSchema'; +import { VerifiableTransaction } from './VerifiableTransaction'; + +const { + AccountRestrictionsMosaicTransactionBuffer, + RestrictionMosaicModificationBuffer, +} = AccountRestrictionsMosaicTransactionBufferPackage.Buffers; + +import {flatbuffers} from 'flatbuffers'; + +export default class AccountRestrictionsMosaicTransaction extends VerifiableTransaction { + constructor(bytes) { + super(bytes, AccountRestrictionsMosaicModificationTransactionSchema); + } +} + +// tslint:disable-next-line:max-classes-per-file +export class Builder { + maxFee: any; + version: any; + type: any; + deadline: any; + restrictionType: any; + modifications: any; + constructor() { + this.maxFee = [0, 0]; + this.type = TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC; + } + + addFee(maxFee) { + this.maxFee = maxFee; + return this; + } + + addVersion(version) { + this.version = version; + return this; + } + + addType(type) { + this.type = type; + return this; + } + + addDeadline(deadline) { + this.deadline = deadline; + return this; + } + + addRestrictionType(restrictionType) { + this.restrictionType = restrictionType; + return this; + } + + addModifications(modifications) { + this.modifications = modifications; + return this; + } + + build() { + const builder = new flatbuffers.Builder(1); + + // Create modifications + const modificationsArray: any = []; + this.modifications.forEach((modification) => { + const addressModificationVector = RestrictionMosaicModificationBuffer + .createValueVector(builder, modification.value); + RestrictionMosaicModificationBuffer.startRestrictionMosaicModificationBuffer(builder); + RestrictionMosaicModificationBuffer.addModificationType(builder, modification.type); + RestrictionMosaicModificationBuffer.addValue(builder, addressModificationVector); + modificationsArray.push(RestrictionMosaicModificationBuffer.endRestrictionMosaicModificationBuffer(builder)); + }); + + // Create vectors + const signatureVector = AccountRestrictionsMosaicTransactionBuffer + .createSignatureVector(builder, Array(...Array(64)).map(Number.prototype.valueOf, 0)); + const signerVector = AccountRestrictionsMosaicTransactionBuffer + .createSignerVector(builder, Array(...Array(32)).map(Number.prototype.valueOf, 0)); + const deadlineVector = AccountRestrictionsMosaicTransactionBuffer + .createDeadlineVector(builder, this.deadline); + const feeVector = AccountRestrictionsMosaicTransactionBuffer + .createFeeVector(builder, this.maxFee); + const modificationVector = AccountRestrictionsMosaicTransactionBuffer + .createModificationsVector(builder, modificationsArray); + + AccountRestrictionsMosaicTransactionBuffer.startAccountRestrictionsMosaicTransactionBuffer(builder); + AccountRestrictionsMosaicTransactionBuffer.addSize(builder, 122 + (9 * this.modifications.length)); + AccountRestrictionsMosaicTransactionBuffer.addSignature(builder, signatureVector); + AccountRestrictionsMosaicTransactionBuffer.addSigner(builder, signerVector); + AccountRestrictionsMosaicTransactionBuffer.addVersion(builder, this.version); + AccountRestrictionsMosaicTransactionBuffer.addType(builder, this.type); + AccountRestrictionsMosaicTransactionBuffer.addFee(builder, feeVector); + AccountRestrictionsMosaicTransactionBuffer.addDeadline(builder, deadlineVector); + AccountRestrictionsMosaicTransactionBuffer.addRestrictionType(builder, this.restrictionType); + AccountRestrictionsMosaicTransactionBuffer.addModificationCount(builder, this.modifications.length); + AccountRestrictionsMosaicTransactionBuffer.addModifications(builder, modificationVector); + + // Calculate size + const codedAccountRestrictionsMosaic = AccountRestrictionsMosaicTransactionBuffer.endAccountRestrictionsMosaicTransactionBuffer(builder); + builder.finish(codedAccountRestrictionsMosaic); + + const bytes = builder.asUint8Array(); + + return new AccountRestrictionsMosaicTransaction(bytes); + } +} diff --git a/src/infrastructure/model/accountDTO.ts b/src/infrastructure/model/accountDTO.ts index a312272c82..0b3890eea9 100644 --- a/src/infrastructure/model/accountDTO.ts +++ b/src/infrastructure/model/accountDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountIds.ts b/src/infrastructure/model/accountIds.ts index 2152a05918..1da22f763f 100644 --- a/src/infrastructure/model/accountIds.ts +++ b/src/infrastructure/model/accountIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountInfoDTO.ts b/src/infrastructure/model/accountInfoDTO.ts index b29f9fffa6..e2a190f4d9 100644 --- a/src/infrastructure/model/accountInfoDTO.ts +++ b/src/infrastructure/model/accountInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountMetaDTO.ts b/src/infrastructure/model/accountMetaDTO.ts index fd30c7da9a..f5b7b16602 100644 --- a/src/infrastructure/model/accountMetaDTO.ts +++ b/src/infrastructure/model/accountMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/accountNamesDTO.ts b/src/infrastructure/model/accountNamesDTO.ts index 5a4bbf42a3..b6e99a36cb 100644 --- a/src/infrastructure/model/accountNamesDTO.ts +++ b/src/infrastructure/model/accountNamesDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export class AccountNamesDTO { /** - * The address of the account in base 32. + * The address of the account in hexadecimal. */ 'address': string; /** diff --git a/src/infrastructure/model/accountPropertyDTO.ts b/src/infrastructure/model/accountRestrictionDTO.ts similarity index 72% rename from src/infrastructure/model/accountPropertyDTO.ts rename to src/infrastructure/model/accountRestrictionDTO.ts index 8b1cdef1a3..0da2925a92 100644 --- a/src/infrastructure/model/accountPropertyDTO.ts +++ b/src/infrastructure/model/accountRestrictionDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,12 +25,12 @@ * Do not edit the class manually. */ -import { AccountPropertyTypeEnum } from './accountPropertyTypeEnum'; +import { AccountRestrictionTypeEnum } from './accountRestrictionTypeEnum'; -export class AccountPropertyDTO { - 'propertyType': AccountPropertyTypeEnum; +export class AccountRestrictionDTO { + 'restrictionType': AccountRestrictionTypeEnum; /** - * The address, transaction type or mosaic id to filter. + * The address, transaction type or mosaic id to restrict. */ 'values': Array; @@ -38,9 +38,9 @@ export class AccountPropertyDTO { static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "propertyType", - "baseName": "propertyType", - "type": "AccountPropertyTypeEnum" + "name": "restrictionType", + "baseName": "restrictionType", + "type": "AccountRestrictionTypeEnum" }, { "name": "values", @@ -49,7 +49,7 @@ export class AccountPropertyDTO { } ]; static getAttributeTypeMap() { - return AccountPropertyDTO.attributeTypeMap; + return AccountRestrictionDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertyTypeEnum.ts b/src/infrastructure/model/accountRestrictionTypeEnum.ts similarity index 56% rename from src/infrastructure/model/accountPropertyTypeEnum.ts rename to src/infrastructure/model/accountRestrictionTypeEnum.ts index 6195456edd..f23969ad40 100644 --- a/src/infrastructure/model/accountPropertyTypeEnum.ts +++ b/src/infrastructure/model/accountRestrictionTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,9 +27,9 @@ /** -* The account properties type: * 0x01 (1 decimal) - The property type only allows receiving transactions from an address. * 0x02 (2 decimal) - The property type only allows receiving transactions containing a mosaic id. * 0x04 (4 decimal) - The property type only allows sending transactions with a given transaction type. * 0x05 (5 decimal) - Property type sentinel. * 0x81 (129 decimal) - The property type blocks receiving transactions from an address. * 0x82 (130 decimal) - The property type blocks receiving transactions containing a mosaic id. * 0x84 (132 decimal) - The property type blocks sending transactions with a given transaction type. +* The account restriction type: * 0x01 (1 decimal) - Allow only receiving transactions from an address. * 0x02 (2 decimal) - Allow only receiving transactions containing a mosaic id. * 0x04 (4 decimal) - Allow only sending transactions with a given transaction type. * 0x05 (5 decimal) - Restriction type sentinel. * 0x81 (129 decimal) - Block receiving transactions from an address. * 0x82 (130 decimal) - Block receiving transactions containing a mosaic id. * 0x84 (132 decimal) - Block sending transactions with a given transaction type. */ -export class AccountPropertyTypeEnum { +export class AccountRestrictionTypeEnum { static discriminator: string | undefined = undefined; @@ -37,7 +37,7 @@ export class AccountPropertyTypeEnum { ]; static getAttributeTypeMap() { - return AccountPropertyTypeEnum.attributeTypeMap; + return AccountRestrictionTypeEnum.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertiesDTO.ts b/src/infrastructure/model/accountRestrictionsDTO.ts similarity index 76% rename from src/infrastructure/model/accountPropertiesDTO.ts rename to src/infrastructure/model/accountRestrictionsDTO.ts index 27cd8a4dba..61512ce91f 100644 --- a/src/infrastructure/model/accountPropertiesDTO.ts +++ b/src/infrastructure/model/accountRestrictionsDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,14 +25,14 @@ * Do not edit the class manually. */ -import { AccountPropertyDTO } from './accountPropertyDTO'; +import { AccountRestrictionDTO } from './accountRestrictionDTO'; -export class AccountPropertiesDTO { +export class AccountRestrictionsDTO { /** * The address of the account in hexadecimal. */ 'address': string; - 'properties': Array; + 'restrictions': Array; static discriminator: string | undefined = undefined; @@ -43,13 +43,13 @@ export class AccountPropertiesDTO { "type": "string" }, { - "name": "properties", - "baseName": "properties", - "type": "Array" + "name": "restrictions", + "baseName": "restrictions", + "type": "Array" } ]; static getAttributeTypeMap() { - return AccountPropertiesDTO.attributeTypeMap; + return AccountRestrictionsDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/accountPropertiesInfoDTO.ts b/src/infrastructure/model/accountRestrictionsInfoDTO.ts similarity index 71% rename from src/infrastructure/model/accountPropertiesInfoDTO.ts rename to src/infrastructure/model/accountRestrictionsInfoDTO.ts index 097a9c9649..8dc7cacf80 100644 --- a/src/infrastructure/model/accountPropertiesInfoDTO.ts +++ b/src/infrastructure/model/accountRestrictionsInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,22 +25,22 @@ * Do not edit the class manually. */ -import { AccountPropertiesDTO } from './accountPropertiesDTO'; +import { AccountRestrictionsDTO } from './accountRestrictionsDTO'; -export class AccountPropertiesInfoDTO { - 'accountProperties': AccountPropertiesDTO; +export class AccountRestrictionsInfoDTO { + 'accountRestrictions': AccountRestrictionsDTO; static discriminator: string | undefined = undefined; static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ { - "name": "accountProperties", - "baseName": "accountProperties", - "type": "AccountPropertiesDTO" + "name": "accountRestrictions", + "baseName": "accountRestrictions", + "type": "AccountRestrictionsDTO" } ]; static getAttributeTypeMap() { - return AccountPropertiesInfoDTO.attributeTypeMap; + return AccountRestrictionsInfoDTO.attributeTypeMap; } } diff --git a/src/infrastructure/model/aliasDTO.ts b/src/infrastructure/model/aliasDTO.ts index c1d05bdeb7..06056e902c 100644 --- a/src/infrastructure/model/aliasDTO.ts +++ b/src/infrastructure/model/aliasDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/aliasTypeEnum.ts b/src/infrastructure/model/aliasTypeEnum.ts index c3eb306311..8035ecd711 100644 --- a/src/infrastructure/model/aliasTypeEnum.ts +++ b/src/infrastructure/model/aliasTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/announceTransactionInfoDTO.ts b/src/infrastructure/model/announceTransactionInfoDTO.ts index 9a0bd590cc..298c4d310e 100644 --- a/src/infrastructure/model/announceTransactionInfoDTO.ts +++ b/src/infrastructure/model/announceTransactionInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockDTO.ts b/src/infrastructure/model/blockDTO.ts index 178c52f7a0..4182db536a 100644 --- a/src/infrastructure/model/blockDTO.ts +++ b/src/infrastructure/model/blockDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockInfoDTO.ts b/src/infrastructure/model/blockInfoDTO.ts index 8472c92e20..e64ced621a 100644 --- a/src/infrastructure/model/blockInfoDTO.ts +++ b/src/infrastructure/model/blockInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockMetaDTO.ts b/src/infrastructure/model/blockMetaDTO.ts index 42cf4d7f93..d37bd8c65d 100644 --- a/src/infrastructure/model/blockMetaDTO.ts +++ b/src/infrastructure/model/blockMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/blockchainScoreDTO.ts b/src/infrastructure/model/blockchainScoreDTO.ts index e878826403..a5498b09d4 100644 --- a/src/infrastructure/model/blockchainScoreDTO.ts +++ b/src/infrastructure/model/blockchainScoreDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/communicationTimestamps.ts b/src/infrastructure/model/communicationTimestamps.ts index aac9258c6e..e44d99a240 100644 --- a/src/infrastructure/model/communicationTimestamps.ts +++ b/src/infrastructure/model/communicationTimestamps.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/cosignature.ts b/src/infrastructure/model/cosignature.ts index c3f5fea38f..4e078d0794 100644 --- a/src/infrastructure/model/cosignature.ts +++ b/src/infrastructure/model/cosignature.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/heightInfoDTO.ts b/src/infrastructure/model/heightInfoDTO.ts index 14276bc9a3..53f49ef78a 100644 --- a/src/infrastructure/model/heightInfoDTO.ts +++ b/src/infrastructure/model/heightInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merklePathItem.ts b/src/infrastructure/model/merklePathItem.ts index 475550c6f5..fe4e09e439 100644 --- a/src/infrastructure/model/merklePathItem.ts +++ b/src/infrastructure/model/merklePathItem.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merkleProofInfo.ts b/src/infrastructure/model/merkleProofInfo.ts index 1b43545088..736671acb0 100644 --- a/src/infrastructure/model/merkleProofInfo.ts +++ b/src/infrastructure/model/merkleProofInfo.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/merkleProofInfoDTO.ts b/src/infrastructure/model/merkleProofInfoDTO.ts index d11326ff87..8e46199b97 100644 --- a/src/infrastructure/model/merkleProofInfoDTO.ts +++ b/src/infrastructure/model/merkleProofInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/models.ts b/src/infrastructure/model/models.ts index e80d56cb48..79ac71b3db 100644 --- a/src/infrastructure/model/models.ts +++ b/src/infrastructure/model/models.ts @@ -29,10 +29,10 @@ export * from './accountIds'; export * from './accountInfoDTO'; export * from './accountMetaDTO'; export * from './accountNamesDTO'; -export * from './accountPropertiesDTO'; -export * from './accountPropertiesInfoDTO'; -export * from './accountPropertyDTO'; -export * from './accountPropertyTypeEnum'; +export * from './accountRestrictionDTO'; +export * from './accountRestrictionTypeEnum'; +export * from './accountRestrictionsDTO'; +export * from './accountRestrictionsInfoDTO'; export * from './aliasDTO'; export * from './aliasTypeEnum'; export * from './announceTransactionInfoDTO'; @@ -91,10 +91,10 @@ import { AccountIds } from './accountIds'; import { AccountInfoDTO } from './accountInfoDTO'; import { AccountMetaDTO } from './accountMetaDTO'; import { AccountNamesDTO } from './accountNamesDTO'; -import { AccountPropertiesDTO } from './accountPropertiesDTO'; -import { AccountPropertiesInfoDTO } from './accountPropertiesInfoDTO'; -import { AccountPropertyDTO } from './accountPropertyDTO'; -import { AccountPropertyTypeEnum } from './accountPropertyTypeEnum'; +import { AccountRestrictionDTO } from './accountRestrictionDTO'; +import { AccountRestrictionTypeEnum } from './accountRestrictionTypeEnum'; +import { AccountRestrictionsDTO } from './accountRestrictionsDTO'; +import { AccountRestrictionsInfoDTO } from './accountRestrictionsInfoDTO'; import { AliasDTO } from './aliasDTO'; import { AliasTypeEnum } from './aliasTypeEnum'; import { AnnounceTransactionInfoDTO } from './announceTransactionInfoDTO'; @@ -159,7 +159,7 @@ let primitives = [ ]; let enumsMap: {[index: string]: any} = { - "AccountPropertyTypeEnum": AccountPropertyTypeEnum, + "AliasTypeEnum": AliasTypeEnum, "MosaicPropertyIdEnum": MosaicPropertyIdEnum, "MultisigModificationTypeEnum": MultisigModificationTypeEnum, @@ -174,9 +174,10 @@ let typeMap: {[index: string]: any} = { "AccountInfoDTO": AccountInfoDTO, "AccountMetaDTO": AccountMetaDTO, "AccountNamesDTO": AccountNamesDTO, - "AccountPropertiesDTO": AccountPropertiesDTO, - "AccountPropertiesInfoDTO": AccountPropertiesInfoDTO, - "AccountPropertyDTO": AccountPropertyDTO, + "AccountRestrictionDTO": AccountRestrictionDTO, + "AccountRestrictionTypeEnum": AccountRestrictionTypeEnum, + "AccountRestrictionsDTO": AccountRestrictionsDTO, + "AccountRestrictionsInfoDTO": AccountRestrictionsInfoDTO, "AliasDTO": AliasDTO, "AnnounceTransactionInfoDTO": AnnounceTransactionInfoDTO, "BlockDTO": BlockDTO, diff --git a/src/infrastructure/model/mosaicDTO.ts b/src/infrastructure/model/mosaicDTO.ts index 6d378dd0e7..a929869893 100644 --- a/src/infrastructure/model/mosaicDTO.ts +++ b/src/infrastructure/model/mosaicDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicDefinitionDTO.ts b/src/infrastructure/model/mosaicDefinitionDTO.ts index 852beca482..a4582269be 100644 --- a/src/infrastructure/model/mosaicDefinitionDTO.ts +++ b/src/infrastructure/model/mosaicDefinitionDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicIds.ts b/src/infrastructure/model/mosaicIds.ts index 1835e0f87c..0cf86352e0 100644 --- a/src/infrastructure/model/mosaicIds.ts +++ b/src/infrastructure/model/mosaicIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicInfoDTO.ts b/src/infrastructure/model/mosaicInfoDTO.ts index 3c47234a50..d3f22605f6 100644 --- a/src/infrastructure/model/mosaicInfoDTO.ts +++ b/src/infrastructure/model/mosaicInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicMetaDTO.ts b/src/infrastructure/model/mosaicMetaDTO.ts index 25725c93aa..845c13a39a 100644 --- a/src/infrastructure/model/mosaicMetaDTO.ts +++ b/src/infrastructure/model/mosaicMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicNamesDTO.ts b/src/infrastructure/model/mosaicNamesDTO.ts index b45f1934f9..e9413ce9be 100644 --- a/src/infrastructure/model/mosaicNamesDTO.ts +++ b/src/infrastructure/model/mosaicNamesDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicPropertyDTO.ts b/src/infrastructure/model/mosaicPropertyDTO.ts index 9f480d6fa0..90f9bde59c 100644 --- a/src/infrastructure/model/mosaicPropertyDTO.ts +++ b/src/infrastructure/model/mosaicPropertyDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/mosaicPropertyIdEnum.ts b/src/infrastructure/model/mosaicPropertyIdEnum.ts index 02542b4b78..6f739ec065 100644 --- a/src/infrastructure/model/mosaicPropertyIdEnum.ts +++ b/src/infrastructure/model/mosaicPropertyIdEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigAccountGraphInfoDTO.ts b/src/infrastructure/model/multisigAccountGraphInfoDTO.ts index 20a3e027ae..d004a7ce63 100644 --- a/src/infrastructure/model/multisigAccountGraphInfoDTO.ts +++ b/src/infrastructure/model/multisigAccountGraphInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigAccountInfoDTO.ts b/src/infrastructure/model/multisigAccountInfoDTO.ts index 5cc02e4c4d..59b5c8e55c 100644 --- a/src/infrastructure/model/multisigAccountInfoDTO.ts +++ b/src/infrastructure/model/multisigAccountInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigDTO.ts b/src/infrastructure/model/multisigDTO.ts index 3ad10b6d94..011353a2f3 100644 --- a/src/infrastructure/model/multisigDTO.ts +++ b/src/infrastructure/model/multisigDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/multisigModificationTypeEnum.ts b/src/infrastructure/model/multisigModificationTypeEnum.ts index 248b06a1ba..3107b46071 100644 --- a/src/infrastructure/model/multisigModificationTypeEnum.ts +++ b/src/infrastructure/model/multisigModificationTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceDTO.ts b/src/infrastructure/model/namespaceDTO.ts index 6836a3564c..68f20c9d7b 100644 --- a/src/infrastructure/model/namespaceDTO.ts +++ b/src/infrastructure/model/namespaceDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceIds.ts b/src/infrastructure/model/namespaceIds.ts index 684e8c89a9..24f633f1c4 100644 --- a/src/infrastructure/model/namespaceIds.ts +++ b/src/infrastructure/model/namespaceIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceInfoDTO.ts b/src/infrastructure/model/namespaceInfoDTO.ts index 084ba6da75..dceebf799a 100644 --- a/src/infrastructure/model/namespaceInfoDTO.ts +++ b/src/infrastructure/model/namespaceInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceMetaDTO.ts b/src/infrastructure/model/namespaceMetaDTO.ts index 13f3557d7f..cb6640b594 100644 --- a/src/infrastructure/model/namespaceMetaDTO.ts +++ b/src/infrastructure/model/namespaceMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceNameDTO.ts b/src/infrastructure/model/namespaceNameDTO.ts index 9a8eef6567..7cd704e180 100644 --- a/src/infrastructure/model/namespaceNameDTO.ts +++ b/src/infrastructure/model/namespaceNameDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/namespaceTypeEnum.ts b/src/infrastructure/model/namespaceTypeEnum.ts index 81ae70d2af..9e78121039 100644 --- a/src/infrastructure/model/namespaceTypeEnum.ts +++ b/src/infrastructure/model/namespaceTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/networkTypeDTO.ts b/src/infrastructure/model/networkTypeDTO.ts index 8994ce3c30..0df44f1af7 100644 --- a/src/infrastructure/model/networkTypeDTO.ts +++ b/src/infrastructure/model/networkTypeDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/nodeInfoDTO.ts b/src/infrastructure/model/nodeInfoDTO.ts index c4786b709d..a44c736793 100644 --- a/src/infrastructure/model/nodeInfoDTO.ts +++ b/src/infrastructure/model/nodeInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/nodeTimeDTO.ts b/src/infrastructure/model/nodeTimeDTO.ts index d1a61ad09d..dda0b6eaa4 100644 --- a/src/infrastructure/model/nodeTimeDTO.ts +++ b/src/infrastructure/model/nodeTimeDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/receiptTypeEnum.ts b/src/infrastructure/model/receiptTypeEnum.ts index 3083c95477..7c2b4981fa 100644 --- a/src/infrastructure/model/receiptTypeEnum.ts +++ b/src/infrastructure/model/receiptTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/resolutionEntryDTO.ts b/src/infrastructure/model/resolutionEntryDTO.ts index 32569b9855..e0f1328c48 100644 --- a/src/infrastructure/model/resolutionEntryDTO.ts +++ b/src/infrastructure/model/resolutionEntryDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/resolutionStatementDTO.ts b/src/infrastructure/model/resolutionStatementDTO.ts index d7de883078..ab58575eb1 100644 --- a/src/infrastructure/model/resolutionStatementDTO.ts +++ b/src/infrastructure/model/resolutionStatementDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/rolesTypeEnum.ts b/src/infrastructure/model/rolesTypeEnum.ts index a0b91d7a13..1b7cd9a3bb 100644 --- a/src/infrastructure/model/rolesTypeEnum.ts +++ b/src/infrastructure/model/rolesTypeEnum.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/serverDTO.ts b/src/infrastructure/model/serverDTO.ts index 0cb1e94b98..ea725312b5 100644 --- a/src/infrastructure/model/serverDTO.ts +++ b/src/infrastructure/model/serverDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/serverInfoDTO.ts b/src/infrastructure/model/serverInfoDTO.ts index 9a1ce8b75f..6dd2fd1b2d 100644 --- a/src/infrastructure/model/serverInfoDTO.ts +++ b/src/infrastructure/model/serverInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/sourceDTO.ts b/src/infrastructure/model/sourceDTO.ts index b88167f350..d57091485c 100644 --- a/src/infrastructure/model/sourceDTO.ts +++ b/src/infrastructure/model/sourceDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/statementsDTO.ts b/src/infrastructure/model/statementsDTO.ts index a7f5016e89..35d64d7a68 100644 --- a/src/infrastructure/model/statementsDTO.ts +++ b/src/infrastructure/model/statementsDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/storageInfoDTO.ts b/src/infrastructure/model/storageInfoDTO.ts index 78c7bacd71..672a18ba13 100644 --- a/src/infrastructure/model/storageInfoDTO.ts +++ b/src/infrastructure/model/storageInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionHashes.ts b/src/infrastructure/model/transactionHashes.ts index 00a2aaf043..40b833628d 100644 --- a/src/infrastructure/model/transactionHashes.ts +++ b/src/infrastructure/model/transactionHashes.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionIds.ts b/src/infrastructure/model/transactionIds.ts index 9f9c4c8ed0..745788bae6 100644 --- a/src/infrastructure/model/transactionIds.ts +++ b/src/infrastructure/model/transactionIds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionInfoDTO.ts b/src/infrastructure/model/transactionInfoDTO.ts index 935036c58a..73901a3a24 100644 --- a/src/infrastructure/model/transactionInfoDTO.ts +++ b/src/infrastructure/model/transactionInfoDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionMetaDTO.ts b/src/infrastructure/model/transactionMetaDTO.ts index d264c1c74c..c6e9e626a4 100644 --- a/src/infrastructure/model/transactionMetaDTO.ts +++ b/src/infrastructure/model/transactionMetaDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionPayload.ts b/src/infrastructure/model/transactionPayload.ts index dcd42913a6..ff83fbb12a 100644 --- a/src/infrastructure/model/transactionPayload.ts +++ b/src/infrastructure/model/transactionPayload.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionStatementDTO.ts b/src/infrastructure/model/transactionStatementDTO.ts index 999e49a2e2..7f0a9959e9 100644 --- a/src/infrastructure/model/transactionStatementDTO.ts +++ b/src/infrastructure/model/transactionStatementDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/model/transactionStatusDTO.ts b/src/infrastructure/model/transactionStatusDTO.ts index 69d24befd9..8ae13588c0 100644 --- a/src/infrastructure/model/transactionStatusDTO.ts +++ b/src/infrastructure/model/transactionStatusDTO.ts @@ -14,10 +14,10 @@ * limitations under the License. */ /** - * Catapult REST API Reference + * Catapult REST Endpoints * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * - * The version of the OpenAPI document: 0.7.15 + * The version of the OpenAPI document: 0.7.16 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts index 288fb34f23..f08fd0cda3 100644 --- a/src/infrastructure/schemas/AccountPropertiesAddressModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsAddressModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesAddressModificationTransactionSchema + * @module schema/AccountRestrictionsAddressModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restriction address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts index 5c2373b1cc..6d9090a5c0 100644 --- a/src/infrastructure/schemas/AccountPropertiesEntityTypeModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsEntityTypeModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesEntityTypeModificationTransactionSchema + * @module schema/AccountRestrictionsEntityTypeModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restrictions address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts b/src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts similarity index 87% rename from src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts rename to src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts index ce323b9e8c..557c38898e 100644 --- a/src/infrastructure/schemas/AccountPropertiesMosaicModificationTransactionSchema.ts +++ b/src/infrastructure/schemas/AccountRestrictionsMosaicModificationTransactionSchema.ts @@ -24,11 +24,11 @@ import { } from './Schema'; /** - * @module schema/AccountPropertiesMosaicModificationTransactionSchema + * @module schema/AccountRestrictionsMosaicModificationTransactionSchema */ /** - * Account properties address transaction schema + * Account restrictions address transaction schema * @const {module:schema/Schema} */ export default new Schema([ @@ -39,7 +39,7 @@ export default new Schema([ ushort('type'), array('fee', TypeSize.INT), array('deadline', TypeSize.INT), - ubyte('propertyType'), + ubyte('restrictionType'), ubyte('modificationCount'), tableArray('modifications', [ ubyte('modificationType'), diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts index 24ec79df98..aa094d8499 100644 --- a/src/infrastructure/transaction/CreateTransactionFromDTO.ts +++ b/src/infrastructure/transaction/CreateTransactionFromDTO.ts @@ -276,13 +276,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS) { return new AccountAddressRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, @@ -292,13 +292,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION) { return new AccountOperationRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, @@ -308,13 +308,13 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr extractNetworkType(transactionDTO.version)) : undefined, transactionInfo, ); - } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC) { + } else if (transactionDTO.type === TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC) { return new AccountMosaicRestrictionModificationTransaction( extractNetworkType(transactionDTO.version), extractTransactionVersion(transactionDTO.version), Deadline.createFromDTO(transactionDTO.deadline), new UInt64(transactionDTO.maxFee || [0, 0]), - transactionDTO.propertyType, + transactionDTO.restrictionType, transactionDTO.modifications ? transactionDTO.modifications.map((modificationDTO) => new AccountRestrictionModification( modificationDTO.type, modificationDTO.value, diff --git a/src/infrastructure/transaction/CreateTransactionFromPayload.ts b/src/infrastructure/transaction/CreateTransactionFromPayload.ts index 7deb62836c..2759ad3f3c 100644 --- a/src/infrastructure/transaction/CreateTransactionFromPayload.ts +++ b/src/infrastructure/transaction/CreateTransactionFromPayload.ts @@ -98,9 +98,9 @@ export const CreateTransactionFromPayload = (transactionBinary: string): Transac */ const CreateTransaction = (type: number, transactionData: string, networkType: NetworkType, deadline: number[]): Transaction => { switch (type) { - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: const propertyTypeLength = 2; const modificationCountOffset = propertyTypeLength; @@ -112,7 +112,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N const modificationArray = modifications.match(/.{1,52}/g); switch (type) { - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: const t = AccountAddressRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -123,7 +123,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); return t; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: return AccountMosaicRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -133,7 +133,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N )) : [], networkType, ); - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: return AccountOperationRestrictionModificationTransaction.create( Deadline.createFromDTO(deadline), parseInt(convert.uint8ToHex(convert.hexToUint8(propertyType).reverse()), 16), @@ -145,7 +145,7 @@ const CreateTransaction = (type: number, transactionData: string, networkType: N networkType, ); } - throw new Error ('Account property transaction type not recognised.'); + throw new Error ('Account restriction transaction type not recognised.'); case TransactionType.LINK_ACCOUNT: // read bytes const remoteAccountKey = transactionData.substring(0, 64); diff --git a/src/infrastructure/transaction/SerializeTransactionToJSON.ts b/src/infrastructure/transaction/SerializeTransactionToJSON.ts index 9f97dc3f60..c73bd0bd93 100644 --- a/src/infrastructure/transaction/SerializeTransactionToJSON.ts +++ b/src/infrastructure/transaction/SerializeTransactionToJSON.ts @@ -68,25 +68,25 @@ export const SerializeTransactionToJSON = (transaction: Transaction): any => { duration: (transaction as LockFundsTransaction).duration.toDTO(), hash: (transaction as LockFundsTransaction).hash, }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS: return { - propertyType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountAddressRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountAddressRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION: return { - propertyType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountOperationRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountOperationRestrictionModificationTransaction). modifications.map((modification) => { return modification.toDTO(); }), }; - case TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC: + case TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC: return { - propertyType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, + restrictionType: (transaction as AccountMosaicRestrictionModificationTransaction).restrictionType, modifications: (transaction as AccountMosaicRestrictionModificationTransaction).modifications.map((modification) => { return modification.toDTO(); }), diff --git a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts index 3d3859b116..3a9d99f813 100644 --- a/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountAddressRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesAddressTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsAddressTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountAddressRestrictionModificationTransaction { return new AccountAddressRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ADDRESS, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_ADDRESS, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio // - 25 bytes for the modification value (address) const byteModifications = 26 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountAddressRestrictionModificationTransaction extends Transactio .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts index ea0f25213a..3a32656795 100644 --- a/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountMosaicRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesMosaicTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsMosaicTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountMosaicRestrictionModificationTransaction { return new AccountMosaicRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_MOSAIC, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_MOSAIC, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction // - 8 bytes for the modification value (mosaicId) const byteModifications = 9 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountMosaicRestrictionModificationTransaction extends Transaction .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts index 946dd024ed..38160cc79d 100644 --- a/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts +++ b/src/model/transaction/AccountOperationRestrictionModificationTransaction.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { Builder } from '../../infrastructure/builders/AccountPropertiesEntityTypeTransaction'; +import { Builder } from '../../infrastructure/builders/AccountRestrictionsEntityTypeTransaction'; import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction'; -import { RestrictionType } from '../account/RestrictionType'; import { PublicAccount } from '../account/PublicAccount'; +import { RestrictionType } from '../account/RestrictionType'; import { NetworkType } from '../blockchain/NetworkType'; import { UInt64 } from '../UInt64'; import { AccountRestrictionModification } from './AccountRestrictionModification'; @@ -44,7 +44,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact networkType: NetworkType, maxFee: UInt64 = new UInt64([0, 0])): AccountOperationRestrictionModificationTransaction { return new AccountOperationRestrictionModificationTransaction(networkType, - TransactionVersion.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, + TransactionVersion.MODIFY_ACCOUNT_RESTRICTION_ENTITY_TYPE, deadline, maxFee, restrictionType, @@ -71,7 +71,8 @@ export class AccountOperationRestrictionModificationTransaction extends Transact signature?: string, signer?: PublicAccount, transactionInfo?: TransactionInfo) { - super(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE, networkType, version, deadline, maxFee, signature, signer, transactionInfo); + super(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION, + networkType, version, deadline, maxFee, signature, signer, transactionInfo); } /** @@ -84,7 +85,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact const byteSize = super.size; // set static byte size fields - const bytePropertyType = 1; + const byteRestrictionType = 1; const byteModificationCount = 1; // each modification contains : @@ -92,7 +93,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact // - 2 bytes for the modification value (transaction type) const byteModifications = 3 * this.modifications.length; - return byteSize + bytePropertyType + byteModificationCount + byteModifications; + return byteSize + byteRestrictionType + byteModificationCount + byteModifications; } /** @@ -104,7 +105,7 @@ export class AccountOperationRestrictionModificationTransaction extends Transact .addDeadline(this.deadline.toDTO()) .addFee(this.maxFee.toDTO()) .addVersion(this.versionToDTO()) - .addPropertyType(this.restrictionType) + .addRestrictionType(this.restrictionType) .addModifications(this.modifications.map((modification) => modification.toDTO())) .build(); } diff --git a/src/model/transaction/AccountRestrictionModification.ts b/src/model/transaction/AccountRestrictionModification.ts index 8cbecf298a..599a61ae65 100644 --- a/src/model/transaction/AccountRestrictionModification.ts +++ b/src/model/transaction/AccountRestrictionModification.ts @@ -39,7 +39,7 @@ export class AccountRestrictionModification { } /** - * Create an address filter for account property modification + * Create an address filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove * @param address - modification value (Address) * @returns {AccountRestrictionModification} @@ -49,7 +49,7 @@ export class AccountRestrictionModification { return new AccountRestrictionModification(modificationType, address.plain()); } /** - * Create an mosaic filter for account property modification + * Create an mosaic filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove * @param mosaicId - modification value (Mosaic) * @returns {AccountRestrictionModification} @@ -60,14 +60,14 @@ export class AccountRestrictionModification { } /** - * Create an entity type filter for account property modification + * Create an operation filter for account restriction modification * @param modificationType - modification type. 0: Add, 1: Remove - * @param entityType - modification value (Transaction Type) + * @param operation - modification value (Transaction Type) * @returns {AccountRestrictionModification} */ - public static createForEntityType(modificationType: RestrictionModificationType, - entityType: number): AccountRestrictionModification { - return new AccountRestrictionModification(modificationType, entityType); + public static createForOperation(modificationType: RestrictionModificationType, + operation: number): AccountRestrictionModification { + return new AccountRestrictionModification(modificationType, operation); } /** diff --git a/src/model/transaction/AccountRestrictionTransaction.ts b/src/model/transaction/AccountRestrictionTransaction.ts index e5de1db525..7e0f26c313 100644 --- a/src/model/transaction/AccountRestrictionTransaction.ts +++ b/src/model/transaction/AccountRestrictionTransaction.ts @@ -34,7 +34,7 @@ export class AccountRestrictionTransaction { * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountAddressRestrictionModificationTransaction} */ - public static createAddressPropertyModificationTransaction( + public static createAddressRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -42,7 +42,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountAddressRestrictionModificationTransaction { if (![RestrictionType.AllowAddress, RestrictionType.BlockAddress].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountAddressRestrictionModificationTransaction.create( deadline, @@ -62,7 +62,7 @@ export class AccountRestrictionTransaction { * @param maxFee - (Optional) Max fee defined by the sender * @returns {AccountMosaicRestrictionModificationTransaction} */ - public static createMosaicPropertyModificationTransaction( + public static createMosaicRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -70,7 +70,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountMosaicRestrictionModificationTransaction { if (![RestrictionType.AllowMosaic, RestrictionType.BlockMosaic].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountMosaicRestrictionModificationTransaction.create( deadline, @@ -84,13 +84,13 @@ export class AccountRestrictionTransaction { /** * Create an account operation restriction transaction object * @param deadline - The deadline to include the transaction. - * @param restrictionType - Type of account property transaction - * @param modification - array of entity type modifications + * @param restrictionType - Type of account restriction transaction + * @param modification - array of operation modifications * @param networkType - The network type. * @param maxFee - (Optional) Max fee defined by the sender - * @returns {AccountOperationRestrictionModificationTransaction} + * @returns {createOperationRestrictionModificationTransaction} */ - public static createEntityTypePropertyModificationTransaction( + public static createOperationRestrictionModificationTransaction( deadline: Deadline, restrictionType: RestrictionType, modifications: Array>, @@ -98,7 +98,7 @@ export class AccountRestrictionTransaction { maxFee: UInt64 = new UInt64([0, 0]), ): AccountOperationRestrictionModificationTransaction { if (![RestrictionType.AllowTransaction, RestrictionType.BlockTransaction].includes(restrictionType)) { - throw new Error ('Property type is not allowed.'); + throw new Error ('Restriction type is not allowed.'); } return AccountOperationRestrictionModificationTransaction.create( deadline, diff --git a/src/model/transaction/TransactionType.ts b/src/model/transaction/TransactionType.ts index 07632512a1..2ff0f82e50 100644 --- a/src/model/transaction/TransactionType.ts +++ b/src/model/transaction/TransactionType.ts @@ -91,22 +91,22 @@ export class TransactionType { public static readonly SECRET_PROOF = 0x4252; /** - * Account property address transaction type + * Account restriction address transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ADDRESS = 0x4150; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ADDRESS = 0x4150; /** - * Account property mosaic transaction type + * Account restriction mosaic transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_MOSAIC = 0x4250; + public static readonly MODIFY_ACCOUNT_RESTRICTION_MOSAIC = 0x4250; /** - * Account property entity type transaction type + * Account restriction operation transaction type * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE = 0x4350; + public static readonly MODIFY_ACCOUNT_RESTRICTION_OPERATION = 0x4350; /** * Link account transaction type diff --git a/src/model/transaction/TransactionVersion.ts b/src/model/transaction/TransactionVersion.ts index 5f90e38a46..d7446f12ec 100644 --- a/src/model/transaction/TransactionVersion.ts +++ b/src/model/transaction/TransactionVersion.ts @@ -101,22 +101,22 @@ export class TransactionVersion { public static readonly MOSAIC_ALIAS = 0x01; /** - * Account Property address transaction version + * Account Restriction address transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ADDRESS = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ADDRESS = 0x01; /** - * Account Property mosaic transaction version + * Account Restriction mosaic transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_MOSAIC = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_MOSAIC = 0x01; /** - * Account Property entity type transaction version + * Account Restriction operation transaction version * @type {number} */ - public static readonly MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE = 0x01; + public static readonly MODIFY_ACCOUNT_RESTRICTION_ENTITY_TYPE = 0x01; /** * Link account transaction version diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index 4d2c31247a..c536e14c06 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -21,9 +21,9 @@ import {Convert as convert} from '../../../src/core/format'; import { TransactionMapping } from '../../../src/core/utils/TransactionMapping'; import { Account } from '../../../src/model/account/Account'; import { Address } from '../../../src/model/account/Address'; +import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -import { PublicAccount } from '../../../src/model/account/PublicAccount'; import { NetworkType } from '../../../src/model/blockchain/NetworkType'; import { EncryptedMessage } from '../../../src/model/model'; import { MosaicId } from '../../../src/model/mosaic/MosaicId'; @@ -34,7 +34,9 @@ import { NetworkCurrencyMosaic } from '../../../src/model/mosaic/NetworkCurrency import { AliasActionType } from '../../../src/model/namespace/AliasActionType'; import { NamespaceId } from '../../../src/model/namespace/NamespaceId'; import { NamespaceType } from '../../../src/model/namespace/NamespaceType'; +import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; import { AccountLinkTransaction } from '../../../src/model/transaction/AccountLinkTransaction'; +import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { AccountRestrictionModification } from '../../../src/model/transaction/AccountRestrictionModification'; import { AccountRestrictionTransaction } from '../../../src/model/transaction/AccountRestrictionTransaction'; import { AddressAliasTransaction } from '../../../src/model/transaction/AddressAliasTransaction'; @@ -44,8 +46,6 @@ import { HashType } from '../../../src/model/transaction/HashType'; import { LinkAction } from '../../../src/model/transaction/LinkAction'; import { LockFundsTransaction } from '../../../src/model/transaction/LockFundsTransaction'; import { MessageType } from '../../../src/model/transaction/MessageType'; -import { AccountAddressRestrictionModificationTransaction } from '../../../src/model/transaction/AccountAddressRestrictionModificationTransaction'; -import { AccountMosaicRestrictionModificationTransaction } from '../../../src/model/transaction/AccountMosaicRestrictionModificationTransaction'; import { ModifyMultisigAccountTransaction } from '../../../src/model/transaction/ModifyMultisigAccountTransaction'; import { MosaicAliasTransaction } from '../../../src/model/transaction/MosaicAliasTransaction'; import { MosaicDefinitionTransaction } from '../../../src/model/transaction/MosaicDefinitionTransaction'; @@ -68,20 +68,20 @@ describe('TransactionMapping - createFromPayload', () => { account = TestingAccount; }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); + const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; @@ -90,20 +90,20 @@ describe('TransactionMapping - createFromPayload', () => { expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); + const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); @@ -112,24 +112,24 @@ describe('TransactionMapping - createFromPayload', () => { expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionOperationTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); + const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AccountAddressRestrictionModificationTransaction; expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); - expect(transaction.modifications[0].value).to.be.equal(entityType); + expect(transaction.modifications[0].value).to.be.equal(operation); expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); @@ -144,7 +144,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = addressAliasTransaction.signWith(account,generationHash); + const signedTransaction = addressAliasTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AddressAliasTransaction; @@ -190,7 +190,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -215,7 +215,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -238,7 +238,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -261,7 +261,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -284,7 +284,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicDefinitionTransaction.signWith(account,generationHash); + const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as MosaicDefinitionTransaction; @@ -327,7 +327,7 @@ describe('TransactionMapping - createFromPayload', () => { NetworkType.MIJIN_TEST, ); - const signedTransaction = transferTransaction.signWith(account,generationHash); + const signedTransaction = transferTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as TransferTransaction; @@ -468,7 +468,7 @@ describe('TransactionMapping - createFromPayload', () => { signedTransaction, NetworkType.MIJIN_TEST); - const signedLockFundTransaction = lockTransaction.signWith(account,generationHash); + const signedLockFundTransaction = lockTransaction.signWith(account, generationHash); const transaction = TransactionMapping.createFromPayload(signedLockFundTransaction.payload) as LockFundsTransaction; @@ -597,65 +597,65 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => expect(transaction.linkAction).to.be.equal(LinkAction.Link); }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(addressPropertyTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; + TransactionMapping.createFromDTO(addressRestrictionTransaction.toJSON()) as AccountAddressRestrictionModificationTransaction; expect(transaction.modifications[0].value).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); expect(transaction.modifications[0].modificationType).to.be.equal(RestrictionModificationType.Add); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(mosaicPropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; + TransactionMapping.createFromDTO(mosaicRestrictionTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; - expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); + expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionMosaicTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); const transaction = - TransactionMapping.createFromDTO(entityTypePropertyTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; + TransactionMapping.createFromDTO(operationRestrictionTransaction.toJSON()) as AccountMosaicRestrictionModificationTransaction; - expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); + expect(transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION); expect(transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(transaction.modifications.length).to.be.equal(1); }); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index c2a3ab5b1c..5a13ee0d28 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -19,9 +19,9 @@ import { sha3_256 } from 'js-sha3'; import {Convert as convert} from '../../src/core/format'; import { Account } from '../../src/model/account/Account'; import { Address } from '../../src/model/account/Address'; +import { PublicAccount } from '../../src/model/account/PublicAccount'; import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../src/model/account/RestrictionType'; -import { PublicAccount } from '../../src/model/account/PublicAccount'; import { NetworkType } from '../../src/model/blockchain/NetworkType'; import { MosaicId } from '../../src/model/mosaic/MosaicId'; import { MosaicNonce } from '../../src/model/mosaic/MosaicNonce'; @@ -75,63 +75,63 @@ describe('SerializeTransactionToJSON', () => { expect(json.transaction.action).to.be.equal(LinkAction.Link); }); - it('should create AccountPropertyAddressTransaction', () => { + it('should create AccountRestrictionAddressTransaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = addressPropertyTransaction.toJSON(); + const json = addressRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ADDRESS); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowAddress); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_ADDRESS); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowAddress); expect(json.transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { + it('should create AccountRestrictionMosaicTransaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = mosaicPropertyTransaction.toJSON(); + const json = mosaicRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_MOSAIC); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowMosaic); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_MOSAIC); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowMosaic); expect(json.transaction.modifications.length).to.be.equal(1); }); - it('should create AccountPropertyMosaicTransaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create AccountRestrictionOperationTransaction', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const json = entityTypePropertyTransaction.toJSON(); + const json = operationRestrictionTransaction.toJSON(); - expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_PROPERTY_ENTITY_TYPE); - expect(json.transaction.propertyType).to.be.equal(RestrictionType.AllowTransaction); + expect(json.transaction.type).to.be.equal(TransactionType.MODIFY_ACCOUNT_RESTRICTION_OPERATION); + expect(json.transaction.restrictionType).to.be.equal(RestrictionType.AllowTransaction); expect(json.transaction.modifications.length).to.be.equal(1); }); diff --git a/test/model/account/AccountRestriction.spec.ts b/test/model/account/AccountRestriction.spec.ts index 4f8481fc0e..5bc3e189b6 100644 --- a/test/model/account/AccountRestriction.spec.ts +++ b/test/model/account/AccountRestriction.spec.ts @@ -19,22 +19,22 @@ import {expect} from 'chai'; import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { Address } from '../../../src/model/account/Address'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -describe('AccountProperty', () => { +describe('AccountRestriction', () => { - it('should createComplete an AccountProperty object', () => { - const accountPropertyDTO = { - propertyType: RestrictionType.AllowAddress, + it('should createComplete an AccountRestriction object', () => { + const accountRestrictionDTO = { + restrictionType: RestrictionType.AllowAddress, values: ['906415867F121D037AF447E711B0F5E4D52EBBF066D96860EB'], }; const accountRestriction = new AccountRestriction( - accountPropertyDTO.propertyType, - accountPropertyDTO.values.map((value) => { + accountRestrictionDTO.restrictionType, + accountRestrictionDTO.values.map((value) => { return Address.createFromEncoded(value); }), ); - expect(accountRestriction.restrictionType).to.be.equal(accountPropertyDTO.propertyType); - deepEqual(accountRestriction.values.length, accountPropertyDTO.values.length); + expect(accountRestriction.restrictionType).to.be.equal(accountRestrictionDTO.restrictionType); + deepEqual(accountRestriction.values.length, accountRestrictionDTO.values.length); }); }); diff --git a/test/model/account/AccountRestrictions.spec.ts b/test/model/account/AccountRestrictions.spec.ts index 5f6d15059c..1ad76d7daa 100644 --- a/test/model/account/AccountRestrictions.spec.ts +++ b/test/model/account/AccountRestrictions.spec.ts @@ -19,13 +19,13 @@ import {expect} from 'chai'; import {Address} from '../../../src/model/account/Address'; import { AccountRestrictions, RestrictionModificationType, RestrictionType, AccountRestriction } from '../../../src/model/model'; -describe('AccountProperties', () => { +describe('AccountRestrictions', () => { - it('should createComplete an AccountProperties object', () => { - const accountPropertiesDTO = { + it('should createComplete an AccountRestrictions object', () => { + const accountRestrictionsDTO = { address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'), - properties: [{ - propertyType: RestrictionType.AllowAddress, + restrictions: [{ + restrictionType: RestrictionType.AllowAddress, values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], @@ -33,21 +33,21 @@ describe('AccountProperties', () => { }; const accountRestrictions = new AccountRestrictions( - accountPropertiesDTO.address, - accountPropertiesDTO.properties.map((r) => { + accountRestrictionsDTO.address, + accountRestrictionsDTO.restrictions.map((r) => { return new AccountRestriction( - r.propertyType, + r.restrictionType, r.values, ); }), ); - expect(accountRestrictions.address).to.be.equal(accountPropertiesDTO.address); - deepEqual(accountPropertiesDTO.properties.length, accountPropertiesDTO.properties.length); - deepEqual(accountPropertiesDTO.properties[0].propertyType, accountPropertiesDTO.properties[0].propertyType); - deepEqual(accountPropertiesDTO.properties[0].values.length, accountPropertiesDTO.properties[0].values.length); - deepEqual(accountPropertiesDTO.properties[0].values[0].modificationType, - accountPropertiesDTO.properties[0].values[0].modificationType); - deepEqual(accountPropertiesDTO.properties[0].values[0].value, accountPropertiesDTO.properties[0].values[0].value); + expect(accountRestrictions.address).to.be.equal(accountRestrictionsDTO.address); + deepEqual(accountRestrictions.restrictions.length, accountRestrictionsDTO.restrictions.length); + deepEqual(accountRestrictions.restrictions[0].restrictionType, accountRestrictionsDTO.restrictions[0].restrictionType); + deepEqual(accountRestrictions.restrictions[0].values.length, accountRestrictionsDTO.restrictions[0].values.length); + deepEqual((accountRestrictions.restrictions[0].values[0] as any).modificationType, + accountRestrictionsDTO.restrictions[0].values[0].modificationType); + deepEqual((accountRestrictions.restrictions[0].values[0] as any).value, accountRestrictionsDTO.restrictions[0].values[0].value); }); }); diff --git a/test/model/account/AccountRestrictionsInfo.spec.ts b/test/model/account/AccountRestrictionsInfo.spec.ts index 04d5f6f2fb..01ac4771f9 100644 --- a/test/model/account/AccountRestrictionsInfo.spec.ts +++ b/test/model/account/AccountRestrictionsInfo.spec.ts @@ -15,23 +15,23 @@ */ import {deepEqual} from 'assert'; +import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import { AccountRestrictions } from '../../../src/model/account/AccountRestrictions'; import { AccountRestrictionsInfo } from '../../../src/model/account/AccountRestrictionsInfo'; -import { AccountRestriction } from '../../../src/model/account/AccountRestriction'; import {Address} from '../../../src/model/account/Address'; import { RestrictionModificationType } from '../../../src/model/account/RestrictionModificationType'; import { RestrictionType } from '../../../src/model/account/RestrictionType'; -describe('AccountPropertiesInfo', () => { +describe('AccountRestrictionsInfo', () => { - it('should createComplete an AccountPropertiesInfo object', () => { + it('should createComplete an AccountRestrictionsInfo object', () => { - const accountPropertiesInfoDTO = { + const accountRestrictionsInfoDTO = { meta: {id: '12345'}, - accountProperties: { + accountRestrictions: { address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142', - properties: [{ - propertyType: RestrictionType.AllowAddress, + restrictions: [{ + restrictionType: RestrictionType.AllowAddress, values: [{modificationType: RestrictionModificationType.Add, value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM', }], @@ -39,19 +39,19 @@ describe('AccountPropertiesInfo', () => { }, }; - const accountPropertiesInfo = new AccountRestrictionsInfo( - accountPropertiesInfoDTO.meta, - new AccountRestrictions(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address), - accountPropertiesInfoDTO.accountProperties.properties.map((prop) => - new AccountRestriction(prop.propertyType, prop.values))), + const accountRestrictionsInfo = new AccountRestrictionsInfo( + accountRestrictionsInfoDTO.meta, + new AccountRestrictions(Address.createFromEncoded(accountRestrictionsInfoDTO.accountRestrictions.address), + accountRestrictionsInfoDTO.accountRestrictions.restrictions.map((prop) => + new AccountRestriction(prop.restrictionType, prop.values))), ); - deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id); - deepEqual(accountPropertiesInfo.accountRestrictions.address, - Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address)); - deepEqual(accountPropertiesInfo.accountRestrictions.restrictions.length, - accountPropertiesInfoDTO.accountProperties.properties.length); - deepEqual(accountPropertiesInfo.accountRestrictions.restrictions[0].values[0], - accountPropertiesInfoDTO.accountProperties.properties[0].values[0]); + deepEqual(accountRestrictionsInfo.meta.id, accountRestrictionsInfoDTO.meta.id); + deepEqual(accountRestrictionsInfo.accountRestrictions.address, + Address.createFromEncoded(accountRestrictionsInfoDTO.accountRestrictions.address)); + deepEqual(accountRestrictionsInfo.accountRestrictions.restrictions.length, + accountRestrictionsInfoDTO.accountRestrictions.restrictions.length); + deepEqual(accountRestrictionsInfo.accountRestrictions.restrictions[0].values[0], + accountRestrictionsInfoDTO.accountRestrictions.restrictions[0].values[0]); }); }); diff --git a/test/model/transaction/AccountPropertyTransaction.spec.ts b/test/model/transaction/AccountRestrictionTransaction.spec.ts similarity index 54% rename from test/model/transaction/AccountPropertyTransaction.spec.ts rename to test/model/transaction/AccountRestrictionTransaction.spec.ts index de24268e9d..04ef489a07 100644 --- a/test/model/transaction/AccountPropertyTransaction.spec.ts +++ b/test/model/transaction/AccountRestrictionTransaction.spec.ts @@ -34,135 +34,135 @@ describe('AccountRestrictionTransaction', () => { before(() => { account = TestingAccount; }); - it('should create address property filter', () => { + it('should create address restriction filter', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - expect(addressPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(addressPropertyFilter.value).to.be.equal(address.plain()); + expect(addressRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(addressRestrictionFilter.value).to.be.equal(address.plain()); }); - it('should create mosaic property filter', () => { + it('should create mosaic restriction filter', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - expect(mosaicPropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(mosaicPropertyFilter.value[0]).to.be.equal(mosaicId.id.lower); - expect(mosaicPropertyFilter.value[1]).to.be.equal(mosaicId.id.higher); + expect(mosaicRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(mosaicRestrictionFilter.value[0]).to.be.equal(mosaicId.id.lower); + expect(mosaicRestrictionFilter.value[1]).to.be.equal(mosaicId.id.higher); }); - it('should create entity type property filter', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + it('should create operation restriction filter', () => { + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - expect(entityTypePropertyFilter.modificationType).to.be.equal(RestrictionModificationType.Add); - expect(entityTypePropertyFilter.value).to.be.equal(entityType); + expect(operationRestrictionFilter.modificationType).to.be.equal(RestrictionModificationType.Add); + expect(operationRestrictionFilter.value).to.be.equal(operation); }); describe('size', () => { it('should return 148 for AccountAddressRestrictionModificationTransaction transaction byte size with 1 modification', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(addressPropertyTransaction.size).to.be.equal(148); + expect(addressRestrictionTransaction.size).to.be.equal(148); }); it('should return 131 for AccountMosaicRestrictionModificationTransaction transaction byte size with 1 modification', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(mosaicPropertyTransaction.size).to.be.equal(131); + expect(mosaicRestrictionTransaction.size).to.be.equal(131); }); it('should return 125 for AccountOperationRestrictionModificationTransaction transaction byte size with 1 modification', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(entityTypePropertyTransaction.size).to.be.equal(125); + expect(operationRestrictionTransaction.size).to.be.equal(125); }); }); it('should default maxFee field be set to 0', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - expect(addressPropertyTransaction.maxFee.higher).to.be.equal(0); - expect(addressPropertyTransaction.maxFee.lower).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.higher).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.lower).to.be.equal(0); }); it('should filled maxFee override transaction maxFee', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, new UInt64([1, 0]), ); - expect(addressPropertyTransaction.maxFee.higher).to.be.equal(0); - expect(addressPropertyTransaction.maxFee.lower).to.be.equal(1); + expect(addressRestrictionTransaction.maxFee.higher).to.be.equal(0); + expect(addressRestrictionTransaction.maxFee.lower).to.be.equal(1); }); - it('should create address property transaction', () => { + it('should create address restriction transaction', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); - const addressPropertyTransaction = AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + const addressRestrictionTransaction = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowAddress, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = addressPropertyTransaction.signWith(account, generationHash); + const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240, @@ -171,40 +171,40 @@ describe('AccountRestrictionTransaction', () => { }); - it('should throw exception when create address property transaction with wrong type', () => { + it('should throw exception when create address restriction transaction with wrong type', () => { const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'); - const addressPropertyFilter = AccountRestrictionModification.createForAddress( + const addressRestrictionFilter = AccountRestrictionModification.createForAddress( RestrictionModificationType.Add, address, ); expect(() => { - AccountRestrictionTransaction.createAddressPropertyModificationTransaction( + AccountRestrictionTransaction.createAddressRestrictionModificationTransaction( Deadline.create(), RestrictionType.Sentinel, - [addressPropertyFilter], + [addressRestrictionFilter], NetworkType.MIJIN_TEST, ); - }).to.throw(Error, 'Property type is not allowed.'); + }).to.throw(Error, 'Restriction type is not allowed.'); }); - it('should create mosaic property transaction', () => { + it('should create mosaic restriction transaction', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); - const mosaicPropertyTransaction = AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + const mosaicRestrictionTransaction = AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowMosaic, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = mosaicPropertyTransaction.signWith(account, generationHash); + const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240, @@ -213,40 +213,40 @@ describe('AccountRestrictionTransaction', () => { }); - it('should throw exception when create mosaic property transaction with wrong type', () => { + it('should throw exception when create mosaic restriction transaction with wrong type', () => { const mosaicId = new MosaicId([2262289484, 3405110546]); - const mosaicPropertyFilter = AccountRestrictionModification.createForMosaic( + const mosaicRestrictionFilter = AccountRestrictionModification.createForMosaic( RestrictionModificationType.Add, mosaicId, ); expect(() => { - AccountRestrictionTransaction.createMosaicPropertyModificationTransaction( + AccountRestrictionTransaction.createMosaicRestrictionModificationTransaction( Deadline.create(), RestrictionType.Sentinel, - [mosaicPropertyFilter], + [mosaicRestrictionFilter], NetworkType.MIJIN_TEST, ); - }).to.throw(Error, 'Property type is not allowed.'); + }).to.throw(Error, 'Restriction type is not allowed.'); }); - it('should create entity type property transaction', () => { + it('should create operation restriction transaction', () => { - const entityType = TransactionType.ADDRESS_ALIAS; - const entityTypePropertyFilter = AccountRestrictionModification.createForEntityType( + const operation = TransactionType.ADDRESS_ALIAS; + const operationRestrictionFilter = AccountRestrictionModification.createForOperation( RestrictionModificationType.Add, - entityType, + operation, ); - const entityTypePropertyTransaction = AccountRestrictionTransaction.createEntityTypePropertyModificationTransaction( + const operationRestrictionTransaction = AccountRestrictionTransaction.createOperationRestrictionModificationTransaction( Deadline.create(), RestrictionType.AllowTransaction, - [entityTypePropertyFilter], + [operationRestrictionFilter], NetworkType.MIJIN_TEST, ); - const signedTransaction = entityTypePropertyTransaction.signWith(account, generationHash); + const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); expect(signedTransaction.payload.substring( 240,