Merge pull request #453 from pavel-main/patch-1

Show more user-friendly error message if proposer key is missing

Author: devbugging

pkg/flowkit/services/accounts.go

@@ -426,8 +426,11 @@ func (a *Accounts) prepareTransaction(
 		return nil, err
 	}
 
-	tx.SetBlockReference(block).
-		SetProposer(proposer, account.Key().Index())
+	tx.SetBlockReference(block)
+
+	if err = tx.SetProposer(proposer, account.Key().Index()); err != nil {
+		return nil, err
+	}
 
 	tx, err = tx.Sign()
 	if err != nil {

pkg/flowkit/services/project.go

@@ -205,8 +205,11 @@ func (p *Project) Deploy(network string, update bool) ([]*contracts.Contract, er
 			}
 		}
 
-		tx.SetBlockReference(block).
-			SetProposer(targetAccountInfo, targetAccount.Key().Index())
+		tx.SetBlockReference(block)
+
+		if err = tx.SetProposer(targetAccountInfo, targetAccount.Key().Index()); err != nil {
+			return nil, err
+		}
 
 		tx, err = tx.Sign()
 		if err != nil {

pkg/flowkit/services/transactions.go

@@ -102,10 +102,13 @@ func (t *Transactions) Build(
 
 	tx := flowkit.NewTransaction().
 		SetPayer(payer).
-		SetProposer(proposerAccount, proposerKeyIndex).
 		SetGasLimit(gasLimit).
 		SetBlockReference(latestBlock)
 
+	if err := tx.SetProposer(proposerAccount, proposerKeyIndex); err != nil {
+		return nil, err
+	}
+
 	resolver, err := contracts.NewResolver(code)
 	if err != nil {
 		return nil, err

pkg/flowkit/transaction.go

@@ -232,7 +232,11 @@ func (t *Transaction) authorizersContains(address flow.Address) bool {
 }
 
 // SetProposer sets the proposer for transaction.
-func (t *Transaction) SetProposer(proposer *flow.Account, keyIndex int) *Transaction {
+func (t *Transaction) SetProposer(proposer *flow.Account, keyIndex int) error {
+	if len(proposer.Keys) <= keyIndex {
+		return fmt.Errorf("failed to retrieve proposer key at index %d", keyIndex)
+	}
+
 	t.proposer = proposer
 	proposerKey := proposer.Keys[keyIndex]
 
@@ -242,7 +246,7 @@ func (t *Transaction) SetProposer(proposer *flow.Account, keyIndex int) *Transac
 		proposerKey.SequenceNumber,
 	)
 
-	return t
+	return nil
 }
 
 // SetPayer sets the payer for transaction.