[concurrent] Fix Ids between concurrent submissions

client_test.go

@@ -367,7 +367,7 @@ func Test_AccountResources(t *testing.T) {
 func Test_Concurrent_Submission(t *testing.T) {
 	const numTxns = uint64(10)
 
-	client, err := NewClient(DevnetConfig)
+	client, err := NewClient(LocalnetConfig)
 	assert.NoError(t, err)
 
 	account1, err := NewEd25519Account()
@@ -381,7 +381,7 @@ func Test_Concurrent_Submission(t *testing.T) {
 	assert.NoError(t, err)
 
 	// start submission goroutine
-	payloads := make(chan TransactionSubmissionPayload)
+	payloads := make(chan TransactionBuildPayload)
 	results := make(chan TransactionSubmissionResponse)
 	go client.nodeClient.BuildSignAndSubmitTransactions(account1, payloads, results)
 
@@ -390,7 +390,7 @@ func Test_Concurrent_Submission(t *testing.T) {
 
 	// Generate transactions
 	for i := uint64(0); i < numTxns; i++ {
-		payloads <- TransactionSubmissionPayload{
+		payloads <- TransactionBuildPayload{
 			Id:   i,
 			Type: TransactionSubmissionTypeSingle, // TODO: not needed?
 			Inner: TransactionPayload{Payload: &EntryFunction{

transactionSubmission.go

@@ -16,7 +16,7 @@ const (
 	TransactionSubmissionTypeMultiAgent TransactionSubmissionType = iota
 )
 
-type TransactionSubmissionPayload struct {
+type TransactionBuildPayload struct {
 	Id      uint64
 	Type    TransactionSubmissionType
 	Inner   TransactionPayload // The actual transaction payload
@@ -28,6 +28,10 @@ type TransactionBuildResponse struct {
 	Response RawTransactionImpl
 	Err      error
 }
+type TransactionSubmissionRequest struct {
+	Id        uint64
+	SignedTxn SignedTransaction
+}
 
 type TransactionSubmissionResponse struct {
 	Id       uint64
@@ -59,7 +63,7 @@ func (snt *SequenceNumberTracker) Update(new uint64) uint64 {
 // BuildTransactions start a goroutine to process [TransactionPayload] and spit out [RawTransactionImpl].
 //
 // TODO: add optional arguments for configuring transactions as a whole?
-func (rc *NodeClient) BuildTransactions(sender AccountAddress, payloads chan TransactionSubmissionPayload, responses chan TransactionBuildResponse, setSequenceNumber chan uint64) {
+func (rc *NodeClient) BuildTransactions(sender AccountAddress, payloads chan TransactionBuildPayload, responses chan TransactionBuildResponse, setSequenceNumber chan uint64) {
 	// Initialize state
 	account, err := rc.Account(sender)
 	if err != nil {
@@ -116,20 +120,25 @@ func (rc *NodeClient) BuildTransactions(sender AccountAddress, payloads chan Tra
 }
 
 // SubmitTransactions starts up a worker for sending signed transactions to on-chain
-func (rc *NodeClient) SubmitTransactions(signedTxns chan *SignedTransaction, responses chan TransactionSubmissionResponse) {
+func (rc *NodeClient) SubmitTransactions(requests chan TransactionSubmissionRequest, responses chan TransactionSubmissionResponse) {
 	for {
 		select {
-		case signedTxn, ok := <-signedTxns:
+		case request, ok := <-requests:
 			if !ok {
 				close(responses)
 				return
 			}
 
-			response, err := rc.SubmitTransaction(signedTxn)
+			err := request.SignedTxn.Verify()
+			if err != nil {
+				panic("transaction verification failed")
+			}
+
+			response, err := rc.SubmitTransaction(&request.SignedTxn)
 			if err != nil {
-				responses <- TransactionSubmissionResponse{Err: err}
+				responses <- TransactionSubmissionResponse{Id: request.Id, Err: err}
 			} else {
-				responses <- TransactionSubmissionResponse{Response: response}
+				responses <- TransactionSubmissionResponse{Id: request.Id, Response: response}
 			}
 		}
 	}
@@ -138,7 +147,7 @@ func (rc *NodeClient) SubmitTransactions(signedTxns chan *SignedTransaction, res
 // BuildSignAndSubmitTransactions starts up a goroutine to process transactions for a single [TransactionSender]
 func (rc *NodeClient) BuildSignAndSubmitTransactions(
 	sender TransactionSigner,
-	payloads chan TransactionSubmissionPayload,
+	payloads chan TransactionBuildPayload,
 	responses chan TransactionSubmissionResponse,
 ) {
 	singleSigner := func(rawTxn RawTransactionImpl) (*SignedTransaction, error) {
@@ -178,7 +187,7 @@ func (rc *NodeClient) BuildSignAndSubmitTransactions(
 //		sender := NewEd25519Account()
 //		feePayer := NewEd25519Account()
 //
-//		payloads := make(chan TransactionSubmissionPayload)
+//		payloads := make(chan TransactionBuildPayload)
 //		responses := make(chan TransactionSubmissionResponse)
 //
 //		signingFunc := func(rawTxn RawTransactionImpl) (*SignedTransaction, error) {
@@ -214,7 +223,7 @@ func (rc *NodeClient) BuildSignAndSubmitTransactions(
 //	}
 func (rc *NodeClient) BuildSignAndSubmitTransactionsWithSignFunction(
 	sender AccountAddress,
-	payloads chan TransactionSubmissionPayload,
+	payloads chan TransactionBuildPayload,
 	responses chan TransactionSubmissionResponse,
 	sign func(rawTxn RawTransactionImpl) (*SignedTransaction, error),
 ) {
@@ -225,8 +234,8 @@ func (rc *NodeClient) BuildSignAndSubmitTransactionsWithSignFunction(
 	setSequenceNumber := make(chan uint64)
 	go rc.BuildTransactions(sender, payloads, buildResponses, setSequenceNumber)
 
-	signedTxns := make(chan *SignedTransaction, 20)
-	go rc.SubmitTransactions(signedTxns, responses)
+	submissionRequests := make(chan TransactionSubmissionRequest, 20)
+	go rc.SubmitTransactions(submissionRequests, responses)
 
 	for {
 		select {
@@ -242,7 +251,10 @@ func (rc *NodeClient) BuildSignAndSubmitTransactionsWithSignFunction(
 					if err != nil {
 						responses <- TransactionSubmissionResponse{Id: buildResponse.Id, Err: err}
 					} else {
-						signedTxns <- signedTxn
+						submissionRequests <- TransactionSubmissionRequest{
+							Id:        buildResponse.Id,
+							SignedTxn: *signedTxn,
+						}
 					}
 				}()
 			}