Allow signature to be colleted externally

Signed-off-by: Peter Broadhurst <[email protected]>
hyperledger · Aug 5, 2024 · e28890b · e28890b
1 parent 45ec58f
commit e28890b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/ethsigner/transaction.go b/pkg/ethsigner/transaction.go
@@ -211,7 +211,10 @@ func (t *Transaction) SignEIP1559(signer secp256k1.Signer, chainID int64) ([]byt
 	if err != nil {
 		return nil, err
 	}
+	return t.FinalizeEIP1559WithSignature(signaturePayload, sig)
+}
 
+func (t *Transaction) FinalizeEIP1559WithSignature(signaturePayload *TransactionSignaturePayload, sig *secp256k1.SignatureData) ([]byte, error) {
 	// Use the direct 0/1 Y-parity value
 	sig.UpdateEIP2930()
 

diff --git a/pkg/secp256k1/signer.go b/pkg/secp256k1/signer.go
@@ -69,7 +69,10 @@ func (s *SignatureData) UpdateEIP155(chainID int64) {
 
 // EIP-2930 (/ EIP-1559) rules - 0 or 1 V value for raw Y-parity value (chainID goes into the payload)
 func (s *SignatureData) UpdateEIP2930() {
-	s.V = s.V.Sub(s.V, big.NewInt(27))
+	vi64 := s.V.Int64()
+	if vi64 == 27 || vi64 == 28 {
+		s.V = s.V.Sub(s.V, big.NewInt(27))
+	}
 }
 
 // Recover obtains the original signer from the hash of the message