add genesis id to transactions

README.md

@@ -343,6 +343,14 @@ func main() {
 	}
 	fmt.Println("Made a kmd client")
 
+	// Create an algod client
+	algodClient, err := algod.MakeClient(algodAddress, algodToken)
+	if err != nil {
+		fmt.Printf("failed to make algod client: %s\n", err)
+		return
+	}
+	fmt.Println("Made an algod client")
+
 	// Get the list of wallets
 	listResponse, err := kmdClient.ListWallets()
 	if err != nil {
@@ -388,8 +396,16 @@ func main() {
 	fmt.Printf("Generated address 2 %s\n", gen2Response.Address)
 	toAddr := gen2Response.Address
 
+	// Get the suggested transaction parameters
+	txParams, err := algodClient.SuggestedParams()
+        if err != nil {
+                fmt.Printf("error getting suggested tx params: %s\n", err)
+                return
+        }
+
 	// Make transaction
-	tx, err := transaction.MakePaymentTxn(fromAddr, toAddr, 1, 100, 300, 400, nil)
+	genID := txParams.GenesisID
+	tx, err := transaction.MakePaymentTxn(fromAddr, toAddr, 1, 100, 300, 400, nil, genID)
 	if err != nil {
 		fmt.Printf("Error creating transaction: %s\n", err)
 		return
@@ -404,13 +420,6 @@ func main() {
 
 	fmt.Printf("kmd made signed transaction with bytes: %x\n", signResponse.SignedTransaction)
 
-	// Create an algod client
-	algodClient, err := algod.MakeClient(algodAddress, algodToken)
-	if err != nil {
-		fmt.Printf("failed to make algod client: %s\n", err)
-		return
-	}
-
 	// Broadcast the transaction to the network
 	// Note that this transaction will get rejected because the accounts do not have any tokens
 	sendResponse, err := algodClient.SendRawTransaction(signResponse.SignedTransaction)

client/algod/models/models.go

@@ -278,6 +278,32 @@ type TransactionFee struct {
 	Fee uint64 `json:"fee"`
 }
 
+// TransactionParams contains the parameters that help a client construct
+// a new transaction.
+// swagger:model TransactionParams
+type TransactionParams struct {
+	// Fee is the suggested transaction fee
+	//
+	// required: true
+	Fee uint64 `json:"fee"`
+
+	// Genesis ID
+	//
+	// required: true
+	GenesisID string `json:"genesisID"`
+
+	// LastRound indicates the last round seen
+	//
+	// required: true
+	LastRound uint64 `json:"lastRound"`
+
+	// ConsensusVersion indicates the consensus protocol version
+	// as of LastRound.
+	//
+	// required: true
+	ConsensusVersion string `json:"consensusVersion"`
+}
+
 // TransactionID Description
 // swagger:model TransactionID
 type TransactionID struct {

client/algod/wrappers.go

@@ -91,6 +91,12 @@ func (client Client) SuggestedFee() (response models.TransactionFee, err error)
 	return
 }
 
+// SuggestedParams gets the suggested transaction parameters
+func (client Client) SuggestedParams() (response models.TransactionParams, err error) {
+	err = client.get(&response, "/transactions/params", nil)
+	return
+}
+
 // SendRawTransaction gets the bytes of a SignedTxn and broadcasts it to the network
 func (client Client) SendRawTransaction(stx []byte) (response models.TransactionID, err error) {
 	err = client.post(&response, "/transactions", stx)

examples/gen-addresses/main.go

@@ -97,16 +97,24 @@ func main() {
 	}
 
 	// Extract the private key of the first address
-	fmt.Printf("Extracting private key for %s", addresses[0])
+	fmt.Printf("Extracting private key for %s\n", addresses[0])
 	resp4, err := kmdClient.ExportKey(exampleWalletHandleToken, exampleWalletPassword, addresses[0])
 	if err != nil {
 		fmt.Printf("Error extracting secret key: %s\n", err)
 		return
 	}
 	privateKey := resp4.PrivateKey
 
+	// Get the suggested transaction parameters
+	txParams, err := algodClient.SuggestedParams()
+        if err != nil {
+                fmt.Printf("error getting suggested tx params: %s\n", err)
+                return
+        }
+
 	// Sign a sample transaction using this library, *not* kmd
-	tx, err := transaction.MakePaymentTxn(addresses[0], addresses[1], 1, 100, 300, 400, nil)
+	genID := txParams.GenesisID
+	tx, err := transaction.MakePaymentTxn(addresses[0], addresses[1], 1, 100, 300, 400, nil, genID)
 	if err != nil {
 		fmt.Printf("Error creating transaction: %s\n", err)
 		return

transaction/transaction.go

@@ -6,7 +6,7 @@ import (
 
 // MakePaymentTxn constructs a payment transaction using the passed parameters.
 // `from` and `to` addresses should be checksummed, human-readable addresses
-func MakePaymentTxn(from, to string, fee, amount, firstRound, lastRound uint64, note []byte) (tx types.Transaction, err error) {
+func MakePaymentTxn(from, to string, fee, amount, firstRound, lastRound uint64, note []byte, genesisID string) (tx types.Transaction, err error) {
 	// Decode from address
 	fromAddr, err := types.DecodeAddress(from)
 	if err != nil {
@@ -28,6 +28,7 @@ func MakePaymentTxn(from, to string, fee, amount, firstRound, lastRound uint64,
 			FirstValid: types.Round(firstRound),
 			LastValid:  types.Round(lastRound),
 			Note:       note,
+			GenesisID:  genesisID,
 		},
 		PaymentTxnFields: types.PaymentTxnFields{
 			Receiver: toAddr,

types/transaction.go

@@ -50,4 +50,5 @@ type Header struct {
 	FirstValid Round   `codec:"fv"`
 	LastValid  Round   `codec:"lv"`
 	Note       []byte  `codec:"note"`
+	GenesisID  string  `codec:"gen"`
 }