Skip to content

Exposed Deadline to the public in Transaction class #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
13 commits merged into from
Jul 17, 2018
Merged

Exposed Deadline to the public in Transaction class #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2b2d116
Exposed Deadline to the public in Transaction class
khawarizmus Jul 11, 2018
75d0c36
abstract function
khawarizmus Jul 16, 2018
f549100
reapply given for aggregate
khawarizmus Jul 16, 2018
82f49ab
reapply given from Lock
khawarizmus Jul 16, 2018
eb2d6da
reapply given from modification
khawarizmus Jul 16, 2018
c99bad3
reapply given for definition
khawarizmus Jul 16, 2018
b804926
reapply given for supply
khawarizmus Jul 16, 2018
380be82
reapply given for namespace
khawarizmus Jul 16, 2018
ec9747b
reapply given for secrete
khawarizmus Jul 16, 2018
c4cdb1c
reapply given for secrete
khawarizmus Jul 16, 2018
012b3a3
reapply given for transfer
khawarizmus Jul 16, 2018
06cf547
short implementation + test
khawarizmus Jul 17, 2018
142da27
followed Aleix style
khawarizmus Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions src/model/transaction/AggregateTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
* limitations under the License.
*/

import {AggregateTransaction as AggregateTransactionLibrary} from 'nem2-library';
import {Account} from '../account/Account';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {UInt64} from '../UInt64';
import {AggregateTransactionCosignature} from './AggregateTransactionCosignature';
import {Deadline} from './Deadline';
import {InnerTransaction} from './InnerTransaction';
import {SignedTransaction} from './SignedTransaction';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { AggregateTransaction as AggregateTransactionLibrary } from 'nem2-library';
import { Account } from '../account/Account';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { UInt64 } from '../UInt64';
import { AggregateTransactionCosignature } from './AggregateTransactionCosignature';
import { Deadline } from './Deadline';
import { InnerTransaction } from './InnerTransaction';
import { SignedTransaction } from './SignedTransaction';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Aggregate innerTransactions contain multiple innerTransactions that can be initiated by different accounts.
Expand Down
20 changes: 10 additions & 10 deletions src/model/transaction/LockFundsTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
* limitations under the License.
*/

import {HashLockTransaction, VerifiableTransaction} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {Mosaic} from '../mosaic/Mosaic';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {SignedTransaction} from './SignedTransaction';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { HashLockTransaction, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { Mosaic } from '../mosaic/Mosaic';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { SignedTransaction } from './SignedTransaction';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Lock funds transaction is used before sending an Aggregate bonded transaction, as a deposit to announce the transaction.
Expand Down
19 changes: 10 additions & 9 deletions src/model/transaction/ModifyMultisigAccountTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
* limitations under the License.
*/

import {MultisigModificationTransaction as ModifyMultisigAccountTransactionLibrary, VerifiableTransaction} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {MultisigCosignatoryModification} from './MultisigCosignatoryModification';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { MultisigModificationTransaction as ModifyMultisigAccountTransactionLibrary, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { MultisigCosignatoryModification } from './MultisigCosignatoryModification';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Modify multisig account transactions are part of the NEM's multisig account system.
Expand Down Expand Up @@ -105,4 +105,5 @@ export class ModifyMultisigAccountTransaction extends Transaction {
.addModifications(this.modifications.map((modification) => modification.toDTO()))
.build();
}

}
27 changes: 12 additions & 15 deletions src/model/transaction/MosaicDefinitionTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,17 @@
* limitations under the License.
*/

import {
MosaicCreationTransaction as MosaicDefinitionTransactionLibrary,
mosaicId as mosaicIdLibrary,
VerifiableTransaction,
} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {MosaicId} from '../mosaic/MosaicId';
import {MosaicProperties} from '../mosaic/MosaicProperties';
import {NamespaceId} from '../namespace/NamespaceId';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { MosaicCreationTransaction as MosaicDefinitionTransactionLibrary, mosaicId as mosaicIdLibrary, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { MosaicId } from '../mosaic/MosaicId';
import { MosaicProperties } from '../mosaic/MosaicProperties';
import { NamespaceId } from '../namespace/NamespaceId';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Before a mosaic can be created or transferred, a corresponding definition of the mosaic has to be created and published to the network.
Expand Down Expand Up @@ -129,4 +125,5 @@ export class MosaicDefinitionTransaction extends Transaction {

return mosaicDefinitionTransaction.build();
}

}
21 changes: 11 additions & 10 deletions src/model/transaction/MosaicSupplyChangeTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
* limitations under the License.
*/

import {MosaicSupplyChangeTransaction as MosaicSupplyChangeTransactionLibrary, VerifiableTransaction} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {MosaicId} from '../mosaic/MosaicId';
import {MosaicSupplyType} from '../mosaic/MosaicSupplyType';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { MosaicSupplyChangeTransaction as MosaicSupplyChangeTransactionLibrary, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { MosaicId } from '../mosaic/MosaicId';
import { MosaicSupplyType } from '../mosaic/MosaicSupplyType';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply,
Expand Down Expand Up @@ -103,4 +103,5 @@ export class MosaicSupplyChangeTransaction extends Transaction {
.addDelta(this.delta.toDTO())
.build();
}

}
26 changes: 11 additions & 15 deletions src/model/transaction/RegisterNamespaceTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,16 @@
* limitations under the License.
*/

import {
NamespaceCreationTransaction as RegisterNamespaceTransactionLibrary,
subnamespaceNamespaceId,
subnamespaceParentId,
VerifiableTransaction,
} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {NamespaceId} from '../namespace/NamespaceId';
import {NamespaceType} from '../namespace/NamespaceType';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { NamespaceCreationTransaction as RegisterNamespaceTransactionLibrary, subnamespaceNamespaceId, subnamespaceParentId, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { NamespaceId } from '../namespace/NamespaceId';
import { NamespaceType } from '../namespace/NamespaceType';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Accounts can rent a namespace for an amount of blocks and after a this renew the contract.
Expand Down Expand Up @@ -155,4 +150,5 @@ export class RegisterNamespaceTransaction extends Transaction {

return registerNamespacetransaction.build();
}

}
23 changes: 12 additions & 11 deletions src/model/transaction/SecretLockTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {SecretLockTransaction as SecretLockTransactionLibrary, VerifiableTransaction} from 'nem2-library';
import {Address} from '../account/Address';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {Mosaic} from '../mosaic/Mosaic';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {HashType, HashTypeLengthValidator} from './HashType';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { SecretLockTransaction as SecretLockTransactionLibrary, VerifiableTransaction } from 'nem2-library';
import { Address } from '../account/Address';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { Mosaic } from '../mosaic/Mosaic';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { HashType, HashTypeLengthValidator } from './HashType';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

export class SecretLockTransaction extends Transaction {

Expand Down Expand Up @@ -125,4 +125,5 @@ export class SecretLockTransaction extends Transaction {
.addRecipient(this.recipient.plain())
.build();
}

}
19 changes: 10 additions & 9 deletions src/model/transaction/SecretProofTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {SecretProofTransaction as SecretProofTransactionLibrary, VerifiableTransaction} from 'nem2-library';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {HashType, HashTypeLengthValidator} from './HashType';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { SecretProofTransaction as SecretProofTransactionLibrary, VerifiableTransaction } from 'nem2-library';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { HashType, HashTypeLengthValidator } from './HashType';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

export class SecretProofTransaction extends Transaction {

Expand Down Expand Up @@ -95,4 +95,5 @@ export class SecretProofTransaction extends Transaction {
.addProof(this.proof)
.build();
}

}
33 changes: 23 additions & 10 deletions src/model/transaction/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
* limitations under the License.
*/

import {VerifiableTransaction} from 'nem2-library';
import {Account} from '../account/Account';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {UInt64} from '../UInt64';
import {AggregateTransactionInfo} from './AggregateTransactionInfo';
import {Deadline} from './Deadline';
import {InnerTransaction} from './InnerTransaction';
import {SignedTransaction} from './SignedTransaction';
import {TransactionInfo} from './TransactionInfo';
import { VerifiableTransaction } from 'nem2-library';
import { Account } from '../account/Account';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { UInt64 } from '../UInt64';
import { AggregateTransactionInfo } from './AggregateTransactionInfo';
import { Deadline } from './Deadline';
import { InnerTransaction } from './InnerTransaction';
import { SignedTransaction } from './SignedTransaction';
import { TransactionInfo } from './TransactionInfo';

/**
* An abstract transaction class that serves as the base class of all NEM transactions.
Expand Down Expand Up @@ -156,4 +156,17 @@ export abstract class Transaction {
const versionDTO = this.networkType.toString(16) + '0' + this.version.toString(16);
return parseInt(versionDTO, 16);
}

/**
* @description re-aplly a given value to the transaction in an immutable way
* @param {Deadline} deadline
* @returns {Transaction}
* @memberof Transaction
*/
public replyGiven(deadline: Deadline = Deadline.create()): Transaction {
if (this.isUnannounced()) {
return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {deadline});
}
throw new Error('an Announced transaction can\'t be modified');
}
}
23 changes: 12 additions & 11 deletions src/model/transaction/TransferTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
* limitations under the License.
*/

import {TransferTransaction as TransferTransactionLibrary, VerifiableTransaction,} from 'nem2-library';
import {Address} from '../account/Address';
import {PublicAccount} from '../account/PublicAccount';
import {NetworkType} from '../blockchain/NetworkType';
import {Mosaic} from '../mosaic/Mosaic';
import {UInt64} from '../UInt64';
import {Deadline} from './Deadline';
import {Message} from './Message';
import {Transaction} from './Transaction';
import {TransactionInfo} from './TransactionInfo';
import {TransactionType} from './TransactionType';
import { TransferTransaction as TransferTransactionLibrary, VerifiableTransaction } from 'nem2-library';
import { Address } from '../account/Address';
import { PublicAccount } from '../account/PublicAccount';
import { NetworkType } from '../blockchain/NetworkType';
import { Mosaic } from '../mosaic/Mosaic';
import { UInt64 } from '../UInt64';
import { Deadline } from './Deadline';
import { Message } from './Message';
import { Transaction } from './Transaction';
import { TransactionInfo } from './TransactionInfo';
import { TransactionType } from './TransactionType';

/**
* Transfer transactions contain data about transfers of mosaics and message to another account.
Expand Down Expand Up @@ -101,4 +101,5 @@ export class TransferTransaction extends Transaction {
.addMessage(this.message)
.build();
}

}
Loading