status-im/keycard-redeem
2
0
Fork 0
mirror of https://github.com/status-im/keycard-redeem.git synced 2025-01-11 20:54:25 +00:00
Code Issues Projects Releases Wiki Activity

move block info to Message interface

Browse Source
This commit is contained in:
Andrea Franz 2020-04-03 12:49:22 +02:00
parent 46ee4862b4
commit 3da8c8c43c
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/js/actions/redeem.ts
View File

@ -17,6 +17,13 @@ const sleep = (ms: number) => {
interface RedeemMessage { interface RedeemMessage {
receiver: string receiver: string
code: string code: string
blockNumber: number
blockHash: string
}
interface SignRedeemResponse {
sig: string
address: string
} }
export const ERROR_REDEEMING = "ERROR_REDEEMING"; export const ERROR_REDEEMING = "ERROR_REDEEMING";
@ -85,7 +92,7 @@ const redeemDone = (txHash: string) => ({
}); });
export const redeem = (bucketAddress: string, recipientAddress: string, code: string) => { export const redeem = (bucketAddress: string, recipientAddress: string, code: string) => {
return (dispatch: Dispatch, getState: () => RootState) => { return async (dispatch: Dispatch, getState: () => RootState) => {
dispatch(redeeming()); dispatch(redeeming());
const state = getState(); const state = getState();
const web3Type = state.web3.type; const web3Type = state.web3.type;
@ -93,10 +100,13 @@ export const redeem = (bucketAddress: string, recipientAddress: string, code: st
const bucket = newBucketContract(bucketAddress); const bucket = newBucketContract(bucketAddress);
const codeHash = sha3(code); const codeHash = sha3(code);
const account = state.web3.account; const account = state.web3.account;
const block = await config.web3!.eth.getBlock("latest");
const message = { const message = {
receiver: state.web3.account, receiver: state.web3.account,
code: codeHash, code: codeHash,
blockNumber: block.number,
blockHash: block.hash,
}; };
//FIXME: is signer needed? //FIXME: is signer needed?
@ -104,6 +114,7 @@ export const redeem = (bucketAddress: string, recipientAddress: string, code: st
const recipient = state.bucket.recipient; const recipient = state.bucket.recipient;
//FIXME: remove! hack to wait for the request screen to slide down //FIXME: remove! hack to wait for the request screen to slide down
await sleep(3000); await sleep(3000);
if (address.toLowerCase() != recipient.toLowerCase()) { if (address.toLowerCase() != recipient.toLowerCase()) {
//FIXME: handle error //FIXME: handle error
dispatch(wrongSigner(recipient, address)); dispatch(wrongSigner(recipient, address));
@ -125,19 +136,8 @@ export const redeem = (bucketAddress: string, recipientAddress: string, code: st
} }
} }
interface SignRedeemResponse {
sig: string
address: string
}
async function signRedeem(web3Type: Web3Type, contractAddress: string, signer: string, message: RedeemMessage): Promise<SignRedeemResponse> { async function signRedeem(web3Type: Web3Type, contractAddress: string, signer: string, message: RedeemMessage): Promise<SignRedeemResponse> {
const chainId = await config.web3!.eth.net.getId(); const chainId = await config.web3!.eth.net.getId();
const block = await config.web3!.eth.getBlock("latest");
const finalMessage = {
...message,
blockNumber: block.number,
blockHash: block.hash
};
const domain = [ const domain = [
{ name: "name", type: "string" }, { name: "name", type: "string" },
@ -167,7 +167,7 @@ async function signRedeem(web3Type: Web3Type, contractAddress: string, signer: s
}, },
primaryType: ("Redeem" as const), primaryType: ("Redeem" as const),
domain: domainData, domain: domainData,
message: finalMessage message: message,
}; };
if (web3Type === Web3Type.Status) { if (web3Type === Web3Type.Status) {
@ -177,7 +177,7 @@ async function signRedeem(web3Type: Web3Type, contractAddress: string, signer: s
} }
} }
const signWithWeb3 = (signer: string, data: any) => { const signWithWeb3 = (signer: string, data: any): Promise<SignRedeemResponse> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
(window as any).ethereum.sendAsync({ (window as any).ethereum.sendAsync({
method: "eth_signTypedData_v3", method: "eth_signTypedData_v3",
@ -199,7 +199,7 @@ const signWithWeb3 = (signer: string, data: any) => {
}); });
} }
const signWithKeycard = (signer: string, data: any) => { const signWithKeycard = (signer: string, data: any): Promise<SignRedeemResponse> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
(window as any).ethereum.send("keycard_signTypedData", [signer, JSON.stringify(data)]).then(resp => { (window as any).ethereum.send("keycard_signTypedData", [signer, JSON.stringify(data)]).then(resp => {
const sig = resp.result; const sig = resp.result;