diff --git a/packages/model/value_transaction/constants.go b/packages/model/value_transaction/constants.go index 3025e1c74d9526fbd10d88d5c217d9443fd797a6..b20a6d4fc5215db2ec30f7c7fa1a244b7566d3c3 100644 --- a/packages/model/value_transaction/constants.go +++ b/packages/model/value_transaction/constants.go @@ -1,5 +1,11 @@ package value_transaction +import ( + "strings" + + "github.com/iotaledger/goshimmer/packages/ternary" +) + const ( ADDRESS_OFFSET = 0 VALUE_OFFSET = ADDRESS_END @@ -12,6 +18,7 @@ const ( TIMESTAMP_SIZE = 27 NONCE_SIZE = 81 SIGNATURE_MESSAGE_FRAGMENT_SIZE = 6561 + BUNDLE_ESSENCE_SIZE = ADDRESS_SIZE + VALUE_SIZE + SIGNATURE_MESSAGE_FRAGMENT_SIZE ADDRESS_END = ADDRESS_OFFSET + ADDRESS_SIZE VALUE_END = VALUE_OFFSET + VALUE_SIZE @@ -21,3 +28,7 @@ const ( TOTAL_SIZE = SIGNATURE_MESSAGE_FRAGMENT_END ) + +var ( + EMPTY_SIGNATURE = ternary.Trytes(strings.Repeat("9", SIGNATURE_MESSAGE_FRAGMENT_SIZE/ternary.NUMBER_OF_TRITS_IN_A_TRYTE)) +) diff --git a/packages/model/value_transaction/value_transaction.go b/packages/model/value_transaction/value_transaction.go index b014d3ceb3a8da0ca02359236d552481a089c30f..20054207dc06f72428469409c19dd84c70b52724 100644 --- a/packages/model/value_transaction/value_transaction.go +++ b/packages/model/value_transaction/value_transaction.go @@ -192,15 +192,17 @@ func (this *ValueTransaction) SetTimestamp(timestamp uint) bool { return false } -func (this *ValueTransaction) GetBundleEssence() (result ternary.Trytes) { +func (this *ValueTransaction) GetBundleEssence() (result ternary.Trits) { this.addressMutex.RLock() this.valueMutex.RLock() this.signatureMessageFragmentMutex.RLock() + result = make(ternary.Trits, BUNDLE_ESSENCE_SIZE) + + copy(result[0:], this.trits[ADDRESS_OFFSET:VALUE_END]) + if this.GetValue() < 0 { - result = this.trits[ADDRESS_OFFSET:VALUE_END].ToTrytes() + this.trits[SIGNATURE_MESSAGE_FRAGMENT_OFFSET:SIGNATURE_MESSAGE_FRAGMENT_END].ToTrytes() - } else { - result = this.trits[ADDRESS_OFFSET:VALUE_END].ToTrytes() + copy(result[:VALUE_END], this.trits[SIGNATURE_MESSAGE_FRAGMENT_OFFSET:SIGNATURE_MESSAGE_FRAGMENT_END]) } this.signatureMessageFragmentMutex.RUnlock() diff --git a/packages/model/valuebundle/hasher.go b/packages/model/valuebundle/hasher.go new file mode 100644 index 0000000000000000000000000000000000000000..bc2f0d99cd8c8566510fee16653d0c7252daa5b1 --- /dev/null +++ b/packages/model/valuebundle/hasher.go @@ -0,0 +1,14 @@ +package valuebundle + +import ( + "github.com/iotaledger/goshimmer/packages/curl" +) + +const ( + CURLP81_HASH_LENGTH = 243 + CURLP81_ROUNDS = 81 +) + +var ( + Hasher = curl.NewBatchHasher(CURLP81_HASH_LENGTH, CURLP81_ROUNDS) +) diff --git a/packages/model/valuebundle/metabundle.go b/packages/model/valuebundle/metabundle.go index a5714d8920226ac7d8f3c8659838ff71a25380d4..47ebb409988084ce89a5b87f3ac58eb41a317419 100644 --- a/packages/model/valuebundle/metabundle.go +++ b/packages/model/valuebundle/metabundle.go @@ -27,10 +27,5 @@ func (bundle *MetaBundle) GetHash() ternary.Trytes { } func CalculateBundleHash(transactions []*value_transaction.ValueTransaction) ternary.Trytes { - transactions[0].GetAddress() - transactions[0].GetSignatureMessageFragment() - transactions[0].GetTimestamp() - transactions[0].GetValue() - //transactions[0].GetData()[value_transaction.SIGNATURE_MESSAGE_FRAGMENT_OFFSET] - return ternary.Trytes("A") + return (<-Hasher.Hash(transactions[0].GetBundleEssence())).ToTrytes() }