Merge branch 'main' into add-simulate-anything

Author: gregnazario

CHANGELOG.md

@@ -7,6 +7,7 @@ adheres to the format set out by [Keep a Changelog](https://keepachangelog.com/e
 
 - Add ability to simulate for any transaction including multi-agent and fee payer
 - [`Fix`] Ensure proper cleanup of response body on read error to prevent potential memory leak.
+- [`Fix`] Fixes possible conflicts between signatures of multiple goroutines
 
 # v1.5.0 (2/10/2024)
 

rawTransaction.go

@@ -5,25 +5,24 @@ import (
 	"github.com/aptos-labs/aptos-go-sdk/bcs"
 	"github.com/aptos-labs/aptos-go-sdk/crypto"
 	"golang.org/x/crypto/sha3"
+	"sync"
 )
 
 //region RawTransaction
 
 var rawTransactionPrehash []byte
+var rawTransactionWithPrehashOnce sync.Once
 
 const rawTransactionPrehashStr = "APTOS::RawTransaction"
 
 // RawTransactionPrehash Return the sha3-256 prehash for RawTransaction
 // Do not write to the []byte returned
 func RawTransactionPrehash() []byte {
 	// Cache the prehash
-	if rawTransactionPrehash == nil {
+	rawTransactionWithPrehashOnce.Do(func() {
 		b32 := sha3.Sum256([]byte(rawTransactionPrehashStr))
-		out := make([]byte, len(b32))
-		copy(out, b32[:])
-		rawTransactionPrehash = out
-		return out
-	}
+		rawTransactionPrehash = b32[:]
+	})
 	return rawTransactionPrehash
 }
 
@@ -130,21 +129,20 @@ func (txn *RawTransaction) Sign(signer crypto.Signer) (authenticator *crypto.Acc
 //region RawTransactionWithData
 
 var rawTransactionWithDataPrehash []byte
+var rawTransactionWithDataPrehashOnce sync.Once
 
 const rawTransactionWithDataPrehashStr = "APTOS::RawTransactionWithData"
 
 // RawTransactionWithDataPrehash Return the sha3-256 prehash for RawTransactionWithData
 // Do not write to the []byte returned
 func RawTransactionWithDataPrehash() []byte {
 	// Cache the prehash
-	if rawTransactionWithDataPrehash == nil {
+	rawTransactionWithDataPrehashOnce.Do(func() {
 		b32 := sha3.Sum256([]byte(rawTransactionWithDataPrehashStr))
-		out := make([]byte, len(b32))
-		copy(out, b32[:])
-		rawTransactionPrehash = out
-		return out
-	}
-	return rawTransactionPrehash
+		rawTransactionWithDataPrehash = b32[:]
+	})
+	return rawTransactionWithDataPrehash
+
 }
 
 type RawTransactionWithDataVariant uint32