0.0.9

Author: leppaludi

packages/loopring-sdk/src/lib/generateKeyPair.spec.ts

@@ -16,6 +16,10 @@ describe('generateKeyPair', () => {
         account: '0x2345',
         accountId: 1,
         chainId: 1,
+        publicKey: {
+          x: '0x001b9a7064d6f1b27979170f9a5ce2fa32cefb77e2ac81583404e544943d620948',
+          y: '0x001bb27243185bc780f46f964ad2011d55d0ff3ed0177b62bbe400d88ce9bc8f65',
+        },
       })
     ).resolves.toEqual({
       keyPair: {

packages/loopring-sdk/src/lib/generateKeyPair.ts

@@ -14,9 +14,9 @@ export interface KeyPairParams {
   // accountId?: number;
 }
 
-// export function hexEqual(hex1: string, hex2: string) {
-//   return hex1.toLowerCase() === hex2.toLowerCase();
-// }
+export function hexEqual(hex1: string, hex2: string) {
+  return BigInt(hex1) === BigInt(hex2);
+}
 
 export async function generateKeyPair({
   signMessageAsync,
@@ -36,23 +36,23 @@ export async function generateKeyPair({
     chainId
   );
 
-  const generatedKeyPair = await generateKeyPairWasm(result.signature);
+  let generatedKeyPair = await generateKeyPairWasm(result.signature);
 
-  // if (
-  //   publicKey &&
-  //   result.signature.length > 3 &&
-  //   publicKey.x &&
-  //   publicKey.y &&
-  //   (!hexEqual(generatedKeyPair.formatedPx, publicKey.x) ||
-  //     !hexEqual(generatedKeyPair.formatedPy, publicKey.y))
-  // ) {
-  //   const value = result.signature.split('');
-  //   let end = value.splice(result.signature.length - 2, 2).join('');
-  //   end = end == '1c' ? '01' : '1c';
-  //   generatedKeyPair = await generateKeyPairWasm(
-  //     value.concat(end.split('')).join('')
-  //   );
-  // }
+  if (
+    publicKey &&
+    result.signature.length > 3 &&
+    publicKey.x &&
+    publicKey.y &&
+    (!hexEqual(generatedKeyPair.formatedPx, publicKey.x) ||
+      !hexEqual(generatedKeyPair.formatedPy, publicKey.y))
+  ) {
+    const value = result.signature.split('');
+    let end = value.splice(result.signature.length - 2, 2).join('');
+    end = end == '1c' ? '01' : '1c';
+    generatedKeyPair = await generateKeyPairWasm(
+      value.concat(end.split('')).join('')
+    );
+  }
 
   return {
     counterFactualInfo: result.counterFactualInfo,