Skip to content
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

feat: Add SignTypedData primaryType variants: Blur - Order, PermitBatch, PermitSingle, Seaport - BulkOrder #376

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: Add SignTypedData primaryType variants: Blur - Order, PermitBatch, PermitSingle, Seaport - BulkOrder #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a0286e
feat: add PermitSingle and PermitBatch buttons
digiwand Nov 27, 2024
56d3ee1
feat: add Blur - Order and Seaport - BulkOrder buttons
digiwand Nov 27, 2024
55de214
build: update eslint files: ['src/**/*.js'],
digiwand Nov 27, 2024
dfbc87a
refactor: reorder mock request lines
digiwand Nov 27, 2024
a8092a7
refactor: DRY signTypedData variant logic
digiwand Nov 27, 2024
7980962
fix: Blur order Permit type spec
digiwand Dec 4, 2024
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
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {

overrides: [
{
files: ['src/*.js'],
files: ['src/**/*.js'],
parserOptions: {
sourceType: 'module',
},
Expand Down
51 changes: 51 additions & 0 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,57 @@ <h4>
</div>
</div>
</div>

<div
class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-12 d-flex align-items-stretch"
>
<div class="card full-width">
<div class="card-body">
<h4>
Sign Typed Data Variants
</h4>
<button
class="btn btn-primary btn-lg btn-block mb-3"
id="signBlurOrder"
disabled
>
Blur - Order
</button>
<button
class="btn btn-primary btn-lg btn-block mb-3"
id="signPermitSingle"
disabled
>
PermitSingle
</button>

<button
class="btn btn-primary btn-lg btn-block mb-3"
id="signPermitBatch"
disabled
>
PermitBatch
</button>

<button
class="btn btn-primary btn-lg btn-block mb-3"
id="signSeaportBulkOrder"
disabled
>
Seaport - BulkOrder
</button>

<p class="info-text alert alert-warning">
Result:
<span id="signPermitVariantResult"></span>
<p class="info-text alert alert-warning" id="signPermitVariantResultR">r: </p>
<p class="info-text alert alert-warning" id="signPermitVariantResultS">s: </p>
<p class="info-text alert alert-warning" id="signPermitVariantResultV">v: </p>
</p>
</div>
</div>
</div>

<div
class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-12 d-flex align-items-stretch"
>
Expand Down
141 changes: 96 additions & 45 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ import {
walletConnect,
} from './connections';
import Constants from './constants.json';
import {
EIP712Domain,
getPermitMsgParams,
MSG_PRIMARY_TYPE,
} from './signatures/utils';
import {
ERC20_SAMPLE_CONTRACTS,
ERC721_SAMPLE_CONTRACTS,
Expand Down Expand Up @@ -259,6 +264,27 @@ const signPermitVerify = document.getElementById('signPermitVerify');
const signPermitVerifyResult = document.getElementById(
'signPermitVerifyResult',
);

// Sign Typed Data Variants

const signBlurOrder = document.getElementById('signBlurOrder');
const signPermitSingle = document.getElementById('signPermitSingle');
const signPermitBatch = document.getElementById('signPermitBatch');
const signSeaportBulkOrder = document.getElementById('signSeaportBulkOrder');

const signPermitVariantResult = document.getElementById(
'signPermitVariantResult',
);
const signPermitVariantResultR = document.getElementById(
'signPermitVariantResultR',
);
const signPermitVariantResultS = document.getElementById(
'signPermitVariantResultS',
);
const signPermitVariantResultV = document.getElementById(
'signPermitVariantResultV',
);

const siwe = document.getElementById('siwe');
const siweResources = document.getElementById('siweResources');
const siweBadDomain = document.getElementById('siweBadDomain');
Expand Down Expand Up @@ -442,8 +468,12 @@ const allConnectedButtons = [
signTypedDataV4Verify,
signTypedDataV4Batch,
signTypedDataV4Queue,
signBlurOrder,
signPermit,
signPermitSingle,
signPermitBatch,
signPermitVerify,
signSeaportBulkOrder,
siwe,
siweResources,
siweBadDomain,
Expand Down Expand Up @@ -498,7 +528,11 @@ const initialConnectedButtons = [
signTypedDataV4,
signTypedDataV4Batch,
signTypedDataV4Queue,
signBlurOrder,
signPermit,
signPermitSingle,
signPermitBatch,
signSeaportBulkOrder,
siwe,
siweResources,
siweBadDomain,
Expand Down Expand Up @@ -2696,49 +2730,6 @@ const initializeFormElements = () => {
/**
* Sign Permit
*/
const EIP712Domain = [
{ name: 'name', type: 'string' },
{ name: 'version', type: 'string' },
{ name: 'chainId', type: 'uint256' },
{ name: 'verifyingContract', type: 'address' },
];

const Permit = [
{ name: 'owner', type: 'address' },
{ name: 'spender', type: 'address' },
{ name: 'value', type: 'uint256' },
{ name: 'nonce', type: 'uint256' },
{ name: 'deadline', type: 'uint256' },
];

const permitMsgParamsDomain = {
name: 'MyToken',
version: '1',
verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
chainId: chainIdInt,
};

function getPermitMsgParams() {
const from = accounts[0];

const permit = {
owner: from,
spender: '0x5B38Da6a701c568545dCfcB03FcB875f56beddC4',
value: 3000,
nonce: 0,
deadline: 50000000000,
};

return {
types: {
EIP712Domain,
Permit,
},
primaryType: 'Permit',
domain: permitMsgParamsDomain,
message: permit,
};
}

async function getNFTMsgParams() {
return {
Expand Down Expand Up @@ -2780,7 +2771,13 @@ const initializeFormElements = () => {

signPermit.onclick = async () => {
const from = accounts[0];
const msgParams = getPermitMsgParams();
const msgParams = getPermitMsgParams(
{
primaryType: MSG_PRIMARY_TYPE.PERMIT,
chainId: chainIdInt,
},
{ fromAddress: from },
);

let sign;
let r;
Expand All @@ -2792,6 +2789,7 @@ const initializeFormElements = () => {
method: 'eth_signTypedData_v4',
params: [from, JSON.stringify(msgParams)],
});

const { _r, _s, _v } = splitSig(sign);
r = `0x${_r.toString('hex')}`;
s = `0x${_s.toString('hex')}`;
Expand All @@ -2808,12 +2806,65 @@ const initializeFormElements = () => {
}
};

async function requestSignTypedDataVariant(primaryType) {
const from = accounts[0];
const msgParams = getPermitMsgParams(
{
primaryType,
chainId: chainIdInt,
},
{ fromAddress: from },
);

let sign;
let r;
let s;
let v;

try {
sign = await provider.request({
method: 'eth_signTypedData_v4',
params: [from, JSON.stringify(msgParams)],
});

const { _r, _s, _v } = splitSig(sign);
r = `0x${_r.toString('hex')}`;
s = `0x${_s.toString('hex')}`;
v = _v.toString();

signPermitVariantResult.innerHTML = sign;
signPermitVariantResultR.innerHTML = `r: ${r}`;
signPermitVariantResultS.innerHTML = `s: ${s}`;
signPermitVariantResultV.innerHTML = `v: ${v}`;
signPermitVerify.disabled = false;
} catch (err) {
console.error(err);
signPermitVariantResult.innerHTML = `Error: ${err.message}`;
}
}

signBlurOrder.onclick = async () => {
await requestSignTypedDataVariant(MSG_PRIMARY_TYPE.BLUR_ORDER);
};
signPermitBatch.onclick = async () => {
await requestSignTypedDataVariant(MSG_PRIMARY_TYPE.PERMIT_BATCH);
};
signPermitSingle.onclick = async () => {
await requestSignTypedDataVariant(MSG_PRIMARY_TYPE.PERMIT_SINGLE);
};
signSeaportBulkOrder.onclick = async () => {
await requestSignTypedDataVariant(MSG_PRIMARY_TYPE.SEAPORT_BULK_ORDER);
};

/**
* Sign Permit Verification
*/
signPermitVerify.onclick = async () => {
const from = accounts[0];
const msgParams = getPermitMsgParams();
const msgParams = getPermitMsgParams({
primaryType: MSG_PRIMARY_TYPE.PERMIT,
chainId: chainIdInt,
});

try {
const sign = signPermitResult.innerHTML;
Expand Down
Loading
Loading