Merge branch 'cedwies/coin-purchase-memo'

Author: cedwies

api/firmware/eth.go

@@ -211,6 +211,7 @@ func (device *Device) ETHSign(
 }
 
 // ETHSignEIP1559 signs an ethereum EIP1559 transaction. It returns a 65 byte signature (R, S, and 1 byte recID).
+// If paymentRequest is provided, firmware v9.26.0 or newer is required.
 func (device *Device) ETHSignEIP1559(
 	chainID uint64,
 	keypath []uint32,
@@ -221,11 +222,16 @@ func (device *Device) ETHSignEIP1559(
 	recipient [20]byte,
 	value *big.Int,
 	data []byte,
-	recipientAddressCase messages.ETHAddressCase) ([]byte, error) {
+	recipientAddressCase messages.ETHAddressCase,
+	paymentRequest *messages.BTCPaymentRequestRequest,
+) ([]byte, error) {
 
 	if !device.version.AtLeast(semver.NewSemVer(9, 16, 0)) {
 		return nil, UnsupportedError("9.16.0")
 	}
+	if paymentRequest != nil && !device.version.AtLeast(semver.NewSemVer(9, 26, 0)) {
+		return nil, UnsupportedError("9.26.0")
+	}
 
 	hostNonceCommitment, hostNonce, err := handleHostNonceCommitment()
 	if err != nil {
@@ -246,6 +252,7 @@ func (device *Device) ETHSignEIP1559(
 				Data:                 data,
 				HostNonceCommitment:  hostNonceCommitment,
 				AddressCase:          recipientAddressCase,
+				PaymentRequest:       paymentRequest,
 			},
 		},
 	}

api/firmware/eth_test.go

@@ -486,6 +486,7 @@ func TestSimulatorETHSignEIP1559(t *testing.T) {
 			value,
 			nil,
 			messages.ETHAddressCase_ETH_ADDRESS_CASE_MIXED,
+			nil,
 		)
 		require.NoError(t, err)
 

api/firmware/messages/btc.pb.go

@@ -246,8 +246,27 @@ message BTCPaymentRequestRequest {
     message TextMemo {
       string note = 1;
     }
+    message CoinPurchaseMemo {
+      uint32 coin_type = 1; // SLIP-44 coin type
+      string amount = 2; // Human-readable amount (e.g. "0.25 ETH")
+      string address = 3; // Address to send the purchased coins to
+      // Derivation info for verifying address ownership.
+      // NOT part of the SLIP-24 sighash.
+      message EthAddressDerivation {
+        repeated uint32 keypath = 1; // Keypath to the address
+      }
+      message BtcAddressDerivation {
+        // Script config + keypath are needed to derive BTC/LTC-family addresses.
+        BTCScriptConfigWithKeypath script_config = 1;
+      }
+      oneof address_derivation {
+        EthAddressDerivation eth = 4;
+        BtcAddressDerivation btc = 5;
+      }
+    }
     oneof memo {
       TextMemo text_memo = 1;
+      CoinPurchaseMemo coin_purchase_memo = 2;
     }
   }