rollback creating identity by snap_GetEntropy

rarimo · Feb 9, 2024 · b01193c · b01193c
1 parent e9c0d3b
commit b01193c
Showing 1 changed file with 32 additions and 25 deletions.
diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
@@ -243,34 +243,41 @@ export const onRpcRequest = async ({
           },
         }));
 
-      if (res) {
-        const identity = await Identity.create(params?.privateKeyHex);
+      if (!res) {
+        throw new Error('User rejected request');
+      }
 
-        await setItemInStore(StorageKeys.identity, {
-          privateKeyHex: identity.privateKeyHex,
-          did: identity.didString,
-          didBigInt: identity.identityIdBigIntString,
-        });
+      const entropy = await snap.request({
+        method: 'snap_getEntropy',
+        params: { version: 1 },
+      });
+      const keyHex = entropy.startsWith('0x') ? entropy.substring(2) : entropy;
 
-        await snap.request({
-          method: 'snap_dialog',
-          params: {
-            type: 'alert',
-            content: panel([
-              heading('Your RariMe is ready for use!'),
-              divider(),
-              text('Your unique identifier(DID):'),
-              copyable(identity.didString),
-            ]),
-          },
-        });
+      const identity = await Identity.create(params?.privateKeyHex || keyHex);
 
-        return {
-          identityIdString: identity.didString,
-          identityIdBigIntString: identity.identityIdBigIntString,
-        };
-      }
-      throw new Error('User rejected request');
+      await setItemInStore(StorageKeys.identity, {
+        privateKeyHex: identity.privateKeyHex,
+        did: identity.didString,
+        didBigInt: identity.identityIdBigIntString,
+      });
+
+      await snap.request({
+        method: 'snap_dialog',
+        params: {
+          type: 'alert',
+          content: panel([
+            heading('Your RariMe is ready for use!'),
+            divider(),
+            text('Your unique identifier(DID):'),
+            copyable(identity.didString),
+          ]),
+        },
+      });
+
+      return {
+        identityIdString: identity.didString,
+        identityIdBigIntString: identity.identityIdBigIntString,
+      };
     }
 
     case RPCMethods.GetIdentity: {