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

Jump to bottom

PP-105: signature verification on createUserSmartWallet call #183

Merged
merged 7 commits into from
Dec 2, 2022
Merged

PP-105: signature verification on createUserSmartWallet call #183

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3eabf13
update package.json
mortelli Jan 12, 2022
4b12e98
fix first batch of SW factory tests
mortelli Jan 13, 2022
9f22157
fix final batch of SW factory tests
mortelli Jan 13, 2022
5ab978b
Merge remote-tracking branch 'origin/develop' into PP-105/signature-v…
mortelli Jan 17, 2022
fceec93
Merge branch 'develop' into PP-105/signature-verify
antomor Nov 28, 2022
acdb496
chore: Update rif-relay dependencies
antomor Dec 1, 2022
d49f06b
test: fix relayHub test message
antomor Dec 1, 2022
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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
"dependencies": {
"@openeth/truffle-typings": "0.0.6",
"@openzeppelin/contracts": "^3.2.0",
"@rsksmart/rif-relay-client": "https://github.com/infuy/rif-relay-client",
"@rsksmart/rif-relay-common": "https://github.com/infuy/rif-relay-common",
"@rsksmart/rif-relay-contracts": "https://github.com/anarancio/rif-relay-contracts",
"@rsksmart/rif-relay-server": "https://github.com/infuy/rif-relay-server",
"@rsksmart/rif-relay-client": "https://github.com/infuy/rif-relay-client#PP-105/signature-verify",
"@rsksmart/rif-relay-common": "https://github.com/infuy/rif-relay-common#PP-105/signature-verify",
"@rsksmart/rif-relay-contracts": "https://github.com/anarancio/rif-relay-contracts#PP-105/signature-verify",
"@rsksmart/rif-relay-server": "https://github.com/infuy/rif-relay-server#PP-105/signature-verify",
antomor marked this conversation as resolved.
Show resolved Hide resolved
"@truffle/contract": "^4.2.23",
"@truffle/hdwallet-provider": "1.2.4",
"@trufflesuite/web3-provider-engine": "^15.0.13-1",
Expand Down
1 change: 1 addition & 0 deletions test/Utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import * as config from './server-config.json';

export const RIF_RELAY_PORT = config.port;
export const RIF_RELAY_URL = config.url;
export const PERSONAL_SIGN_PREFIX = '\x19Ethereum Signed Message:\n';

export const networks = new Map<string, string>([
['localhost', 'http://127.0.0.1:4444'],
Expand Down
16 changes: 14 additions & 2 deletions test/Verifiers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
createSmartWallet,
bytes32
} from './TestUtils';
import { PERSONAL_SIGN_PREFIX } from './Utils';

const DeployVerifier = artifacts.require('DeployVerifier');
const RelayVerifier = artifacts.require('RelayVerifier');
Expand Down Expand Up @@ -137,14 +138,25 @@ contract(
await deployVerifier.acceptToken(token.address, {
from: verifierOwner
});
const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'uint256', v: index }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down
121 changes: 105 additions & 16 deletions test/WalletFactory.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
getDomainSeparatorHash,
TypedDeployRequestData
} from '@rsksmart/rif-relay-common';
import { PERSONAL_SIGN_PREFIX } from './Utils';

const keccak256 = web3.utils.keccak256;

Expand Down Expand Up @@ -167,16 +168,27 @@ contract('CustomSmartWalletFactory', ([from]) => {
const recoverer = constants.ZERO_ADDRESS;
const index = '0';

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'address', v: logicAddress },
{ t: 'uint256', v: index },
{ t: 'bytes', v: initParams } // Init params is empty
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -233,16 +245,27 @@ contract('CustomSmartWalletFactory', ([from]) => {
index
);

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'address', v: logicAddress },
{ t: 'uint256', v: index },
{ t: 'bytes', v: initParams }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -277,16 +300,27 @@ contract('CustomSmartWalletFactory', ([from]) => {
const recoverer = constants.ZERO_ADDRESS;
const index = '0';

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'address', v: logicAddress },
{ t: 'uint256', v: index },
{ t: 'bytes', v: initParams }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -324,16 +358,27 @@ contract('CustomSmartWalletFactory', ([from]) => {
index
);

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'address', v: logicAddress },
{ t: 'uint256', v: index },
{ t: 'bytes', v: initParams }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -985,14 +1030,25 @@ contract('SmartWalletFactory', ([from]) => {
const recoverer = constants.ZERO_ADDRESS;
const index = '0';

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'uint256', v: index }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -1036,14 +1092,25 @@ contract('SmartWalletFactory', ([from]) => {
index
);

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'uint256', v: index }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -1074,14 +1141,25 @@ contract('SmartWalletFactory', ([from]) => {
const recoverer = constants.ZERO_ADDRESS;
const index = '0';

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'uint256', v: index }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down Expand Up @@ -1113,14 +1191,25 @@ contract('SmartWalletFactory', ([from]) => {
index
);

const toSign: string =
const message: string =
web3.utils.soliditySha3(
{ t: 'bytes2', v: '0x1910' },
{ t: 'address', v: factory.address },
{ t: 'address', v: ownerAddress },
{ t: 'address', v: recoverer },
{ t: 'uint256', v: index }
) ?? '';

const toSign: string =
web3.utils.soliditySha3(
{
t: 'string',
v:
PERSONAL_SIGN_PREFIX +
web3.utils.hexToBytes(message).length
},
{ t: 'bytes32', v: message }
) ?? '';

const toSignAsBinaryArray = ethers.utils.arrayify(toSign);
const signingKey = new ethers.utils.SigningKey(ownerPrivateKey);
const signature = signingKey.signDigest(toSignAsBinaryArray);
Expand Down
Loading