Skip to content

Refactor ERC-1271 validation #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdriGeorge wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor ERC-1271 validation #1484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/components/core/utils/nonceHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,15 @@ async function verifySignatureForConsumer(
// Continue to smart account check
}

// Try ERC-1271 (smart account) validation
try {
const targetChainId = chainId || Object.keys(config?.supportedNetworks || {})[0]
if (targetChainId && config?.supportedNetworks?.[targetChainId]) {
const provider = new ethers.JsonRpcProvider(
config.supportedNetworks[targetChainId].rpc
)
// An explicit chain restricts validation; otherwise try every configured network.
const targetChainIds = chainId
? [chainId]
: Object.keys(config?.supportedNetworks || {})
for (const targetChainId of targetChainIds) {
const network = config?.supportedNetworks?.[targetChainId]
if (!network) continue
try {
const provider = new ethers.JsonRpcProvider(network.rpc)

// Try custom hash format (for backward compatibility)
if (await isERC1271Valid(consumer, consumerMessage, signature, provider)) {
Expand All @@ -302,9 +304,9 @@ async function verifySignatureForConsumer(
if (await isERC1271Valid(consumer, eip191Hash, signature, provider)) {
return true
}
} catch (error) {
CORE_LOGGER.error(`ERC-1271 signature validation error: ${error?.message}`)
}
} catch (error) {
CORE_LOGGER.error(`ERC-1271 signature validation error: ${error?.message}`)
}

return false
Expand Down
Loading