feat: Updating TransactionId for scheduled transactions

hiero-ledger · Mar 4, 2021 · 2cf4c37 · 2cf4c37
1 parent 93be701
commit 2cf4c37
Show file tree

Hide file tree

Showing 39 changed files with 103 additions and 55 deletions.
diff --git a/account_create_transaction.go b/account_create_transaction.go
@@ -235,7 +235,7 @@ func (transaction *AccountCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/account_delete_transaction.go b/account_delete_transaction.go
@@ -152,7 +152,7 @@ func (transaction *AccountDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/account_update_transaction.go b/account_update_transaction.go
@@ -188,7 +188,7 @@ func (transaction *AccountUpdateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/contract_create_transaction.go b/contract_create_transaction.go
@@ -233,7 +233,7 @@ func (transaction *ContractCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/contract_delete_transaction.go b/contract_delete_transaction.go
@@ -161,7 +161,7 @@ func (transaction *ContractDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/contract_execute_transaction.go b/contract_execute_transaction.go
@@ -186,7 +186,7 @@ func (transaction *ContractExecuteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/contract_update_transaction.go b/contract_update_transaction.go
@@ -228,7 +228,7 @@ func (transaction *ContractUpdateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/file_append_transaction.go b/file_append_transaction.go
@@ -183,7 +183,7 @@ func (transaction *FileAppendTransaction) ExecuteAll(
 		return []TransactionResponse{}, errors.New("transactionID list is empty")
 	}
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,
@@ -294,7 +294,9 @@ func (transaction *FileAppendTransaction) FreezeWith(client *Client) (*FileAppen
 			})
 		}
 
-		nextTransactionID.ValidStart = nextTransactionID.ValidStart.Add(1 * time.Nanosecond)
+		validStart := *nextTransactionID.ValidStart
+
+		*nextTransactionID.ValidStart = validStart.Add(1 * time.Nanosecond)
 	}
 
 	return transaction, nil

diff --git a/file_create_transaction.go b/file_create_transaction.go
@@ -198,7 +198,7 @@ func (transaction *FileCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/file_delete_transaction.go b/file_delete_transaction.go
@@ -132,7 +132,7 @@ func (transaction *FileDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/file_update_transaction.go b/file_update_transaction.go
@@ -179,7 +179,7 @@ func (transaction *FileUpdateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/freeze_transaction.go b/freeze_transaction.go
@@ -155,7 +155,7 @@ func (transaction *FreezeTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/live_hash_add_transaction.go b/live_hash_add_transaction.go
@@ -179,7 +179,7 @@ func (transaction *LiveHashAddTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/live_hash_delete_transaction.go b/live_hash_delete_transaction.go
@@ -142,7 +142,7 @@ func (transaction *LiveHashDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/schedule_create_transaction.go b/schedule_create_transaction.go
@@ -192,7 +192,7 @@ func (transaction *ScheduleCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,
@@ -223,9 +223,10 @@ func (transaction *ScheduleCreateTransaction) Execute(
 	hash, err := transaction.GetTransactionHash()
 
 	return TransactionResponse{
-		TransactionID: transaction.GetTransactionID(),
-		NodeID:        resp.transaction.NodeID,
-		Hash:          hash,
+		TransactionID:          transaction.GetTransactionID(),
+		NodeID:                 resp.transaction.NodeID,
+		Hash:                   hash,
+		ScheduledTransactionId: transaction.GetTransactionID(),
 	}, nil
 }
 
@@ -252,6 +253,8 @@ func (transaction *ScheduleCreateTransaction) FreezeWith(client *Client) (*Sched
 		return transaction, err
 	}
 
+	transaction.transactionIDs[0] = transaction.transactionIDs[0].SetScheduled(true)
+
 	if !transaction.onFreeze(transaction.pbBody) {
 		return transaction, nil
 	}

diff --git a/schedule_delete_transaction.go b/schedule_delete_transaction.go
@@ -132,7 +132,7 @@ func (transaction *ScheduleDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/schedule_sign_transaction.go b/schedule_sign_transaction.go
@@ -176,7 +176,7 @@ func (transaction *ScheduleSignTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/system_delete_transaction.go b/system_delete_transaction.go
@@ -165,7 +165,7 @@ func (transaction *SystemDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/system_undelete_transaction.go b/system_undelete_transaction.go
@@ -149,7 +149,7 @@ func (transaction *SystemUndeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_associate_transaction.go b/token_associate_transaction.go
@@ -183,7 +183,7 @@ func (transaction *TokenAssociateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_burn_transaction.go b/token_burn_transaction.go
@@ -158,7 +158,7 @@ func (transaction *TokenBurnTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_create_transaction.go b/token_create_transaction.go
@@ -326,7 +326,7 @@ func (transaction *TokenCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_delete_transaction.go b/token_delete_transaction.go
@@ -137,7 +137,7 @@ func (transaction *TokenDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_dissociate_transaction.go b/token_dissociate_transaction.go
@@ -165,7 +165,7 @@ func (transaction *TokenDissociateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_freeze_transaction.go b/token_freeze_transaction.go
@@ -155,7 +155,7 @@ func (transaction *TokenFreezeTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_grant_kyc_transaction.go b/token_grant_kyc_transaction.go
@@ -153,7 +153,7 @@ func (transaction *TokenGrantKycTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_mint_transaction.go b/token_mint_transaction.go
@@ -153,7 +153,7 @@ func (transaction *TokenMintTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_revoke_kcy_transaction.go b/token_revoke_kcy_transaction.go
@@ -153,7 +153,7 @@ func (transaction *TokenRevokeKycTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_unfreeze_transaction.go b/token_unfreeze_transaction.go
@@ -149,7 +149,7 @@ func (transaction *TokenUnfreezeTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_update_transaction.go b/token_update_transaction.go
@@ -296,7 +296,7 @@ func (transaction *TokenUpdateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/token_wipe_transaction.go b/token_wipe_transaction.go
@@ -171,7 +171,7 @@ func (transaction *TokenWipeTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/topic_create_transaction.go b/topic_create_transaction.go
@@ -197,7 +197,7 @@ func (transaction *TopicCreateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/topic_delete_transaction.go b/topic_delete_transaction.go
@@ -136,7 +136,7 @@ func (transaction *TopicDeleteTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/topic_message_submit_transaction.go b/topic_message_submit_transaction.go
@@ -172,7 +172,7 @@ func (transaction *TopicMessageSubmitTransaction) ExecuteAll(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,
@@ -276,7 +276,9 @@ func (transaction *TopicMessageSubmitTransaction) FreezeWith(client *Client) (*T
 			})
 		}
 
-		nextTransactionID.ValidStart = nextTransactionID.ValidStart.Add(1 * time.Nanosecond)
+		validStart := *nextTransactionID.ValidStart
+
+		*nextTransactionID.ValidStart = validStart.Add(1 * time.Nanosecond)
 	}
 
 	return transaction, nil

diff --git a/topic_update_transaction.go b/topic_update_transaction.go
@@ -237,7 +237,7 @@ func (transaction *TopicUpdateTransaction) Execute(
 
 	transactionID := transaction.GetTransactionID()
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,

diff --git a/transaction.go b/transaction.go
@@ -86,7 +86,7 @@ func TransactionFromBytes(data []byte) (interface{}, error) {
 		found := false
 
 		for _, id := range tx.transactionIDs {
-			if id == transactionID {
+			if id.AccountID == transactionID.AccountID && id.ValidStart == transactionID.ValidStart {
 				found = true
 				break
 			}