mobile: accept nil for chainid as homestead signing (#14463)
This commit is contained in:
		
				
					committed by
					
						 Felix Lange
						Felix Lange
					
				
			
			
				
	
			
			
			
						parent
						
							df4e7eccf5
						
					
				
				
					commit
					90c7155ef4
				
			| @@ -115,6 +115,9 @@ func (ks *KeyStore) SignHash(address *Address, hash []byte) (signature []byte, _ | |||||||
|  |  | ||||||
| // SignTx signs the given transaction with the requested account. | // SignTx signs the given transaction with the requested account. | ||||||
| func (ks *KeyStore) SignTx(account *Account, tx *Transaction, chainID *BigInt) (*Transaction, error) { | func (ks *KeyStore) SignTx(account *Account, tx *Transaction, chainID *BigInt) (*Transaction, error) { | ||||||
|  | 	if chainID == nil { // Null passed from mobile app | ||||||
|  | 		chainID = new(BigInt) | ||||||
|  | 	} | ||||||
| 	signed, err := ks.keystore.SignTx(account.account, tx.tx, chainID.bigint) | 	signed, err := ks.keystore.SignTx(account.account, tx.tx, chainID.bigint) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
| @@ -132,6 +135,9 @@ func (ks *KeyStore) SignHashPassphrase(account *Account, passphrase string, hash | |||||||
| // SignTxPassphrase signs the transaction if the private key matching the | // SignTxPassphrase signs the transaction if the private key matching the | ||||||
| // given address can be decrypted with the given passphrase. | // given address can be decrypted with the given passphrase. | ||||||
| func (ks *KeyStore) SignTxPassphrase(account *Account, passphrase string, tx *Transaction, chainID *BigInt) (*Transaction, error) { | func (ks *KeyStore) SignTxPassphrase(account *Account, passphrase string, tx *Transaction, chainID *BigInt) (*Transaction, error) { | ||||||
|  | 	if chainID == nil { // Null passed from mobile app | ||||||
|  | 		chainID = new(BigInt) | ||||||
|  | 	} | ||||||
| 	signed, err := ks.keystore.SignTxWithPassphrase(account.account, passphrase, tx.tx, chainID.bigint) | 	signed, err := ks.keystore.SignTxWithPassphrase(account.account, passphrase, tx.tx, chainID.bigint) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user