Skip to content

Commit 287a203

Browse files
committed
Additional fallback for other 1271 variants
1 parent 6670d35 commit 287a203

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

Thirdweb/Thirdweb.Wallets/SmartWallet/SmartWallet.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,10 @@ public async Task<string> PersonalSign(string message)
715715

716716
var sig = factorySupports712
717717
? await EIP712.GenerateSignature_SmartAccount_AccountMessage("Account", "1", this._chainId, await this.GetAddress(), originalMsgHash, this._personalAccount)
718-
: await this._personalAccount.PersonalSign(originalMsgHash);
718+
: await this._personalAccount.PersonalSign(message);
719719

720720
var isValid = await this.IsValidSignature(message, sig);
721-
return isValid ? sig : throw new Exception("Invalid signature. Outside of the signer being incorrect, this can happen if the caller if not an approved target.");
721+
return isValid ? sig : throw new Exception("Invalid signature.");
722722
}
723723
else
724724
{
@@ -735,12 +735,20 @@ public async Task<bool> IsValidSignature(string message, string signature)
735735
{
736736
try
737737
{
738-
var magicValue = await ThirdwebContract.Read<byte[]>(this._accountContract, "isValidSignature", Encoding.UTF8.GetBytes(message).HashPrefixedMessage(), signature.HexToBytes());
738+
var magicValue = await ThirdwebContract.Read<byte[]>(this._accountContract, "isValidSignature", message.StringToHex(), signature.HexToBytes());
739739
return magicValue.BytesToHex() == new byte[] { 0x16, 0x26, 0xba, 0x7e }.BytesToHex();
740740
}
741741
catch
742742
{
743-
return false;
743+
try
744+
{
745+
var magicValue = await ThirdwebContract.Read<byte[]>(this._accountContract, "isValidSignature", Encoding.UTF8.GetBytes(message).HashPrefixedMessage(), signature.HexToBytes());
746+
return magicValue.BytesToHex() == new byte[] { 0x16, 0x26, 0xba, 0x7e }.BytesToHex();
747+
}
748+
catch
749+
{
750+
return false;
751+
}
744752
}
745753
}
746754

0 commit comments

Comments
 (0)