From 323a4868b98ceba753aebbd00917570c828d8b72 Mon Sep 17 00:00:00 2001
From: brossetti1 <brossetti1@gmail.com>
Date: Tue, 11 Apr 2023 12:59:57 -0600
Subject: [PATCH] fixing multiple bugs

---
 .../SwitchAndPayAcknowledgement.tsx                    |  2 +-
 .../SelfRelayRegistration/SwitchAndPayRegistration.tsx |  2 +-
 components/SharedRegistration/Requirements.tsx         | 10 ++++++++--
 .../Registeree/AcknowledgeAndSign.tsx                  |  2 +-
 .../WebRtcRegistration/Registeree/RegisterAndSign.tsx  |  2 +-
 hooks/useRegBlocksLeft.tsx                             |  5 ++---
 package.json                                           |  2 +-
 pages/dapp/p2pRelay/connection.tsx                     |  2 ++
 pages/dapp/selfRelay.tsx                               |  1 +
 utils/signature.ts                                     |  7 ++++---
 utils/types.ts                                         |  6 ++++++
 11 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/components/SelfRelayRegistration/SwitchAndPayAcknowledgement.tsx b/components/SelfRelayRegistration/SwitchAndPayAcknowledgement.tsx
index da2d56d..611cd19 100644
--- a/components/SelfRelayRegistration/SwitchAndPayAcknowledgement.tsx
+++ b/components/SelfRelayRegistration/SwitchAndPayAcknowledgement.tsx
@@ -85,7 +85,7 @@ const SwitchAndPayAcknowledgement: React.FC<SwitchAndPayAcknowledgementProps> =
 	return (
 		<RegistrationSection title="Pay for Acknowledgement">
 			<Flex flexDirection="column">
-				<Text>Sign and Pay for Acknowledgement from {localState.trustedRelayer}</Text>
+				{/* <Text>Sign and Pay for Acknowledgement from {localState.trustedRelayer}</Text> */}
 				<Text mb={5}>Sign and Pay for Acknowledgement from {localState.address}</Text>
 			</Flex>
 			<Flex justifyContent="flex-end" gap={5}>
diff --git a/components/SelfRelayRegistration/SwitchAndPayRegistration.tsx b/components/SelfRelayRegistration/SwitchAndPayRegistration.tsx
index b9505b2..5f2fecf 100644
--- a/components/SelfRelayRegistration/SwitchAndPayRegistration.tsx
+++ b/components/SelfRelayRegistration/SwitchAndPayRegistration.tsx
@@ -94,7 +94,7 @@ const SwitchAndPayRegistration: React.FC<SwitchAndPayRegistrationProps> = ({
 			{expiryBlock && <Timer expiryBlock={expiryBlock} setExpiryStep={setExpiryStep} />}
 			<Flex flexDirection="column">
 				<Text>Sign and Pay for Registration from {localState.trustedRelayer}</Text>
-				<Text mb={5}>Sign and Pay for Registration from {localState.address}</Text>
+				{/* <Text mb={5}>Sign and Pay for Registration from {localState.address}</Text> */}
 			</Flex>
 			<Flex justifyContent="flex-end" gap={5}>
 				<Button isLoading={loading} onClick={signAndPay}>
diff --git a/components/SharedRegistration/Requirements.tsx b/components/SharedRegistration/Requirements.tsx
index 3d84339..c76d9fc 100644
--- a/components/SharedRegistration/Requirements.tsx
+++ b/components/SharedRegistration/Requirements.tsx
@@ -8,7 +8,13 @@ import { useNetwork } from 'wagmi';
 
 import capitalize from 'lodash/capitalize';
 import useLocalStorage from '@hooks/useLocalStorage';
-import { RegistrationValues, StandardSteps, SelfRelaySteps, RegistrationTypes } from '@utils/types';
+import {
+	RegistrationValues,
+	StandardSteps,
+	SelfRelaySteps,
+	RegistrationTypes,
+	registrationTitles,
+} from '@utils/types';
 import router from 'next/router';
 import WebRTCStarInstructions from '@components/WebRtcRegistration/WebRTCStarInstructions';
 import Loader from '@components/Loader';
@@ -125,7 +131,7 @@ const Requirements: React.FC<RequirementProps> = ({ address, isConnected, regist
 	};
 
 	return (
-		<RegistrationSection title={`${capitalize(registrationType)} Registration`}>
+		<RegistrationSection title={`${registrationTitles[registrationType]} Registration`}>
 			<Box pb={10}>Requirements:</Box>
 			{registrationType === 'standardRelay' && <StandardRequirements />}
 			{registrationType === 'selfRelay' && <SelfRelayRequirements />}
diff --git a/components/WebRtcRegistration/Registeree/AcknowledgeAndSign.tsx b/components/WebRtcRegistration/Registeree/AcknowledgeAndSign.tsx
index e5db8e0..e48aabb 100644
--- a/components/WebRtcRegistration/Registeree/AcknowledgeAndSign.tsx
+++ b/components/WebRtcRegistration/Registeree/AcknowledgeAndSign.tsx
@@ -43,7 +43,7 @@ const AcknowledgeAndSign: React.FC<AcknowledgeAndSignProps> = ({
 		}
 
 		const signatureData = {
-			signature: typedSignature?.data!,
+			value: typedSignature?.data!,
 			deadline,
 			nonce,
 			address: localState.address,
diff --git a/components/WebRtcRegistration/Registeree/RegisterAndSign.tsx b/components/WebRtcRegistration/Registeree/RegisterAndSign.tsx
index 50daccd..b67704a 100644
--- a/components/WebRtcRegistration/Registeree/RegisterAndSign.tsx
+++ b/components/WebRtcRegistration/Registeree/RegisterAndSign.tsx
@@ -43,7 +43,7 @@ const RegisterAndSign: React.FC<RegisterAndSignProps> = ({
 		}
 
 		const streamData = {
-			signature: typedSignature?.data!,
+			value: typedSignature?.data!,
 			deadline,
 			nonce,
 		};
diff --git a/hooks/useRegBlocksLeft.tsx b/hooks/useRegBlocksLeft.tsx
index 89e1d53..e9219ff 100644
--- a/hooks/useRegBlocksLeft.tsx
+++ b/hooks/useRegBlocksLeft.tsx
@@ -16,14 +16,13 @@ const useRegBlocksLeft = (address: string, signer: Signer) => {
 
 	const fetchDeadlineBlocks = async () => {
 		try {
-			const [currentBlock, expiry, start, graceBlcoks, deadlineBlcoks, isExpired] =
+			const [currentBlock, expiry, start, graceBlocks, deadlineBlcoks, isExpired] =
 				await registryContract.getDeadlines(address);
 
 			setExpiryBlock(expiry);
 			setStartBlock(start);
 			setExpired(isExpired);
-
-			const nums = [currentBlock, expiry, start, graceBlcoks, deadlineBlcoks].map((n) =>
+			const nums = [currentBlock, expiry, start, graceBlocks, deadlineBlcoks].map((n) =>
 				n.toNumber()
 			);
 
diff --git a/package.json b/package.json
index e4f2486..22f0512 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@rainbow-me/rainbowkit": "^0.8.1",
     "@svgr/webpack": "^6.5.0",
     "@wagmi/core": "^0.9.5",
-    "@wallet-hygiene/swr-contracts": "^0.0.84",
+    "@wallet-hygiene/swr-contracts": "^0.0.85",
     "axios": "^0.26.1",
     "date-fns": "^2.29.3",
     "ethers": "^5.7.2",
diff --git a/pages/dapp/p2pRelay/connection.tsx b/pages/dapp/p2pRelay/connection.tsx
index 8588ff1..cbd3894 100644
--- a/pages/dapp/p2pRelay/connection.tsx
+++ b/pages/dapp/p2pRelay/connection.tsx
@@ -81,6 +81,7 @@ export const Connection = () => {
 				}
 
 				const parsedData: RelayerMessageProps = JSON.parse(data);
+				console.log(parsedData);
 				switch (stream.stat.protocol) {
 					case PROTOCOLS.CONNECT:
 						handleRelayerCallback({ ...parsedData, step: P2PRegistereeSteps.AcknowledgeAndSign });
@@ -164,6 +165,7 @@ export const Connection = () => {
 
 						break;
 					case PROTOCOLS.ACK_SIG:
+						console.log(parsedData);
 						setSignatureLocalStorage(parsedData as setLocalStorageProps);
 
 						setLocalStorage({
diff --git a/pages/dapp/selfRelay.tsx b/pages/dapp/selfRelay.tsx
index 5d91d9a..60a590d 100644
--- a/pages/dapp/selfRelay.tsx
+++ b/pages/dapp/selfRelay.tsx
@@ -32,6 +32,7 @@ const SelfRelayRegistration: React.FC<SelfRelayRegistrationInterface> = () => {
 
 	const setNextStep = () => {
 		setLocalState({
+			address: address!,
 			trustedRelayer: tempRelayer,
 			step: SelfRelaySteps.SwitchAndPayOne,
 		});
diff --git a/utils/signature.ts b/utils/signature.ts
index ea0b19e..e65f4af 100644
--- a/utils/signature.ts
+++ b/utils/signature.ts
@@ -52,6 +52,7 @@ export const setSignatureLocalStorage = ({
 	deadline,
 	nonce,
 }: setLocalStorageProps) => {
+	console.log(keyRef, chainId, address, value, deadline, nonce);
 	const item = {
 		value,
 		deadline,
@@ -147,7 +148,7 @@ interface Domain712 {
 	version: string;
 	chainId: number;
 	verifyingContract: string;
-  salt: String0x;
+	salt: String0x;
 }
 export interface signTypedDataProps {
 	domain: TypedDataDomain;
@@ -202,7 +203,7 @@ export const buildAcknowledgementStruct = async ({
 			version: '4',
 			chainId: chain?.id!,
 			verifyingContract: CONTRACT_ADDRESSES[chain?.name!].StolenWalletRegistry,
-      salt: "0xe7e338c8a96606d405ae49875289174c38181bda641043e953b12964ad115f49"
+			salt: '0xe7e338c8a96606d405ae49875289174c38181bda641043e953b12964ad115f49',
 		},
 		value: {
 			owner: address,
@@ -250,7 +251,7 @@ export const buildRegistrationStruct = async ({
 			version: '4',
 			chainId: chain?.id!,
 			verifyingContract: CONTRACT_ADDRESSES[chain?.name!].StolenWalletRegistry,
-      salt: "0x86fdecd3151a18dd477feb379432be4107d347c2ee6bc63ca6212c6d674c17f9"
+			salt: '0x86fdecd3151a18dd477feb379432be4107d347c2ee6bc63ca6212c6d674c17f9',
 		},
 		value: {
 			owner: address,
diff --git a/utils/types.ts b/utils/types.ts
index 3e48f77..65f56cd 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -1,6 +1,12 @@
 export type String0x = `0x${string}` | undefined;
 export type RegistrationTypes = 'standardRelay' | 'selfRelay' | 'p2pRelay';
 
+export const registrationTitles = {
+	standardRelay: 'Standard Relay',
+	selfRelay: 'Self Relay',
+	p2pRelay: 'P2P Relay',
+};
+
 // TODO do these need requirements?
 // TODO convert enums to interger values
 export enum StandardSteps {