Skip to content

fix(claim): checksum SIWE wallet address before signing #269

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

Merged
GsCommand merged 1 commit into from
May 22, 2026
Merged

fix(claim): checksum SIWE wallet address before signing #269

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
27 changes: 22 additions & 5 deletions public/claim.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ <h3>Payment and provisioning are coming next.</h3>
</div>
</footer>

<script src="https://cdn.jsdelivr.net/npm/ethers@6.16.0/dist/ethers.umd.min.js" crossorigin="anonymous"></script>
<script>
// ── DATA ──────────────────────────────────────────────────────────────────────
const PACKS = [
Expand Down Expand Up @@ -775,6 +776,21 @@ <h3>Payment and provisioning are coming next.</h3>

function shortAddr(addr){return addr?`${addr.slice(0,6)}...${addr.slice(-4)}`:'';}

function toChecksumAddress(address){
if(!address || typeof address!=='string'){
throw new Error('Invalid wallet address returned by provider.');
}
const e=(window.ethers && (window.ethers.ethers || window.ethers)) || null;
if(!e || typeof e.getAddress!=='function'){
throw new Error('Wallet checksum utility unavailable. Please refresh and try again.');
}
try {
return e.getAddress(address);
} catch (_) {
throw new Error('Invalid wallet address returned by provider.');
}
}

function updateSiweModeHint(){
const el=document.getElementById('siweModeHint');
if(!el) return;
Expand All @@ -801,10 +817,11 @@ <h3>Payment and provisioning are coming next.</h3>
statusEl.textContent='Connecting wallet...';
if(!window.ethereum){ throw new Error('No Ethereum wallet detected. Install MetaMask, Rabby, Coinbase Wallet, or another browser wallet.'); }
const accounts=await window.ethereum.request({ method:'eth_requestAccounts' });
const address=accounts && accounts[0];
if(!address){ throw new Error('Wallet connection rejected.'); }
state.connectedWalletAddress=address;
walletEl.textContent=`Wallet connected: ${shortAddr(address)}`;
const rawAddress=accounts && accounts[0];
if(!rawAddress){ throw new Error('Wallet connection rejected.'); }
const checksumAddress=toChecksumAddress(rawAddress);
state.connectedWalletAddress=checksumAddress;
walletEl.textContent=`Wallet connected: ${shortAddr(checksumAddress)}`;
statusEl.textContent='Wallet connected';
connectBtn.textContent='Wallet Connected';
siweBtn.style.display='inline-flex';
Expand Down Expand Up @@ -833,7 +850,7 @@ <h3>Payment and provisioning are coming next.</h3>
btn.disabled=true;
btn.textContent='Signing...';
if(!window.ethereum){ throw new Error('No wallet detected'); }
const address=state.connectedWalletAddress;
const address=toChecksumAddress(state.connectedWalletAddress);
if(!address){ throw new Error('Connect wallet first.'); }
updateSiweModeHint();
statusEl.textContent='Requesting SIWE nonce...';
Expand Down
Loading