Merge pull request #222 from getwax/wax-221-inpage-bls

Add BLS to compression plugin, use in in-page demo

packages/demos/inpage/.eslintrc.cjs

@@ -123,5 +123,8 @@ module.exports = {
     'consistent-return': 'off',
     'no-plusplus': 'off',
     'no-bitwise': 'off',
+    '@typescript-eslint/no-unsafe-argument': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-return': 'off',
   },
 };

packages/demos/inpage/demo/ChooseAccountPage.tsx

@@ -56,7 +56,7 @@ const ChooseAccountPage = () => {
                 <ul style={{ textAlign: 'left' }}>
                   <li>L2 Cost Savings</li>
                   <li>Multi-Action</li>
-                  <li>ECDSA (BLS Future)</li>
+                  <li>BLS</li>
                   <li>(Built in Safe)</li>
                 </ul>
               </div>

packages/demos/inpage/hardhat/contracts/imports.sol

@@ -3,6 +3,8 @@ pragma solidity ^0.8.0;
 
 import {EntryPoint} from "account-abstraction/contracts/core/EntryPoint.sol";
 import {SimpleAccountFactory} from "account-abstraction/contracts/samples/SimpleAccountFactory.sol";
+import {BLSSignatureAggregator} from "account-abstraction/contracts/samples/bls/BLSSignatureAggregator.sol";
+import {UserOperation} from "account-abstraction/contracts/interfaces/UserOperation.sol";
 
 import {Safe} from "../lib/plugins/lib/safe-contracts/contracts/Safe.sol";
 import {SafeECDSAFactory} from "../lib/plugins/src/safe/SafeECDSAFactory.sol";
@@ -12,4 +14,5 @@ import {SafeCompressionPlugin} from "../lib/plugins/src/safe/SafeCompressionPlug
 import {FallbackDecompressor} from "../lib/compression/src/decompressors/FallbackDecompressor.sol";
 import {AddressRegistry} from "../lib/compression/src/AddressRegistry.sol";
 import {HandleOpsCaller} from "../lib/compression/src/HandleOpsCaller.sol";
+import {HandleAggregatedOpsCaller} from "../lib/compression/src/HandleAggregatedOpsCaller.sol";
 import {SafeECDSARecoveryPlugin} from "../lib/plugins/src/safe/SafeECDSARecoveryPlugin.sol";

packages/demos/inpage/lib-ts/deterministic-deployer

@@ -0,0 +1 @@
+../../../deterministic-deployer/src

packages/demos/inpage/package.json

@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@s-libs/micro-dash": "^16.0.0",
+    "@thehubbleproject/bls": "^0.5.1",
     "@types/color": "^3.0.3",
     "color": "^4.2.3",
     "ethers": "^6.6.4",

packages/demos/inpage/src/WaxInPage.tsx

@@ -9,6 +9,9 @@ import makeLocalWaxStorage, { WaxStorage } from './WaxStorage';
 import {
   AddressRegistry,
   AddressRegistry__factory,
+  BLSOpen__factory,
+  BLSSignatureAggregator,
+  BLSSignatureAggregator__factory,
   ERC20Mock,
   ERC20Mock__factory,
   EntryPoint,
@@ -28,9 +31,6 @@ import {
   SimpleAccountFactory,
   SimpleAccountFactory__factory,
 } from '../hardhat/typechain-types';
-import SafeSingletonFactory, {
-  SafeSingletonFactoryViewer,
-} from './SafeSingletonFactory';
 import ReusablePopup from './ReusablePopup';
 import AdminPopup, { AdminPurpose } from './AdminPopup';
 import waxPrivate from './waxPrivate';
@@ -47,6 +47,9 @@ import SafeCompressionAccountWrapper from './accounts/SafeCompressionAccountWrap
 import { hexLen } from './helpers/encodeUtils';
 import JsonRpcError from './JsonRpcError';
 import measureCalldataGas from './measureCalldataGas';
+import DeterministicDeployer, {
+  DeterministicDeploymentViewer,
+} from '../lib-ts/deterministic-deployer/DeterministicDeployer';
 
 type Config = {
   logRequests?: boolean;
@@ -82,6 +85,7 @@ export type Contracts = {
   addressRegistry: AddressRegistry;
   safeECDSARecoveryPlugin: SafeECDSARecoveryPlugin;
   testToken: ERC20Mock;
+  blsSignatureAggregator: BLSSignatureAggregator;
 };
 
 export default class WaxInPage {
@@ -185,7 +189,10 @@ export default class WaxInPage {
       await this.ethereum.request({ method: 'eth_chainId' }),
     );
 
-    const viewer = new SafeSingletonFactoryViewer(this.ethersProvider, chainId);
+    const viewer = new DeterministicDeploymentViewer(
+      this.ethersProvider,
+      chainId,
+    );
 
     const assumedEntryPoint = viewer.connectAssume(EntryPoint__factory, []);
 
@@ -194,6 +201,8 @@ export default class WaxInPage {
       [],
     );
 
+    const assumedBlsOpen = viewer.connectAssume(BLSOpen__factory, []);
+
     const contracts: Contracts = {
       greeter: viewer.connectAssume(Greeter__factory, ['']).connect(runner),
       entryPoint: assumedEntryPoint,
@@ -217,6 +226,15 @@ export default class WaxInPage {
         [],
       ),
       testToken: viewer.connectAssume(ERC20Mock__factory, []),
+      blsSignatureAggregator: viewer.connectAssume(
+        DeterministicDeployer.link(BLSSignatureAggregator__factory, [
+          {
+            'account-abstraction/contracts/samples/bls/lib/BLSOpen.sol:BLSOpen':
+              await assumedBlsOpen.getAddress(),
+          },
+        ]),
+        [],
+      ),
     };
 
     if (this.#contractsDeployed) {
@@ -234,7 +252,7 @@ export default class WaxInPage {
 
     const wallet = await this.requestAdminAccount('deploy-contracts');
 
-    const factory = await SafeSingletonFactory.init(wallet);
+    const factory = await DeterministicDeployer.init(wallet);
 
     const entryPoint = await factory.connectOrDeploy(EntryPoint__factory, []);
 
@@ -243,6 +261,8 @@ export default class WaxInPage {
       [],
     );
 
+    const blsOpen = await factory.connectOrDeploy(BLSOpen__factory, []);
+
     const deployments: {
       [C in keyof Contracts]: () => Promise<Contracts[C]>;
     } = {
@@ -265,6 +285,16 @@ export default class WaxInPage {
       safeECDSARecoveryPlugin: () =>
         factory.connectOrDeploy(SafeECDSARecoveryPlugin__factory, []),
       testToken: () => factory.connectOrDeploy(ERC20Mock__factory, []),
+      blsSignatureAggregator: async () =>
+        factory.connectOrDeploy(
+          DeterministicDeployer.link(BLSSignatureAggregator__factory, [
+            {
+              'account-abstraction/contracts/samples/bls/lib/BLSOpen.sol:BLSOpen':
+                await blsOpen.getAddress(),
+            },
+          ]),
+          [],
+        ),
     };
 
     for (const deployment of Object.values(deployments)) {

packages/demos/inpage/src/accounts/SafeCompressionAccountWrapper.ts

@@ -1,13 +1,14 @@
-import { ethers } from 'ethers';
+import { ethers, getBytes, keccak256, solidityPacked } from 'ethers';
 import { z } from 'zod';
+import { signer as hubbleBlsSigner } from '@thehubbleproject/bls';
 import {
   SafeCompressionPlugin,
   SafeCompressionPlugin__factory,
 } from '../../hardhat/typechain-types';
 import EthereumRpc from '../EthereumRpc';
 import IAccount from './IAccount';
 import WaxInPage from '..';
-import { SafeCompressionFactory } from '../../hardhat/typechain-types/lib/packages/plugins/src/SafeCompressionFactory';
+import { SafeCompressionFactory } from '../../hardhat/typechain-types/lib/plugins/src/safe/SafeCompressionFactory';
 import receiptOf from '../helpers/receiptOf';
 import {
   encodeBitStack,
@@ -18,6 +19,7 @@ import {
   hexLen,
   lookupAddress,
 } from '../helpers/encodeUtils';
+import getBlsUserOpHash from '../helpers/getBlsUserOpHash';
 
 export const SafeCompressionAccountData = z.object({
   type: z.literal('SafeCompressionAccount'),
@@ -73,6 +75,8 @@ export default class SafeCompressionAccountWrapper implements IAccount {
     const createArgs = [
       contracts.safe,
       contracts.entryPoint,
+      contracts.blsSignatureAggregator,
+      (await getBlsSigner(wallet.privateKey)).pubkey,
       contracts.fallbackDecompressor,
       wallet,
       0,
@@ -175,11 +179,36 @@ export default class SafeCompressionAccountWrapper implements IAccount {
   }
 
   async sign(
-    _userOp: EthereumRpc.UserOperation,
-    userOpHash: string,
+    userOp: EthereumRpc.UserOperation,
+    _userOpHash: string,
   ): Promise<string> {
-    const ownerWallet = new ethers.Wallet(this.privateKey);
+    const blsSigner = await getBlsSigner(this.privateKey);
+    const provider = this.waxInPage.ethersProvider;
+    const contracts = await this.waxInPage.getContracts();
 
-    return await ownerWallet.signMessage(ethers.getBytes(userOpHash));
+    const blsUserOpHash = getBlsUserOpHash(
+      (await provider.getNetwork()).chainId,
+      await contracts.blsSignatureAggregator.getAddress(),
+      blsSigner.pubkey,
+      userOp,
+    );
+
+    return solidityPacked(['uint256[2]'], [blsSigner.sign(blsUserOpHash)]);
   }
 }
+
+async function getBlsSigner(ecdsaPrivateKey: string) {
+  // Note: The BLS library we use implements key derivation that allows this
+  // to work, so it's the simplest way to get a BLS private key in our
+  // context, but there should be a standard around this.
+  const blsPrivateKey = ecdsaPrivateKey;
+
+  const domain = getBytes(
+    keccak256(new TextEncoder().encode('eip4337.bls.domain')),
+  );
+
+  const signerFactory = await hubbleBlsSigner.BlsSignerFactory.new();
+  const blsSigner = signerFactory.getSigner(domain, blsPrivateKey);
+
+  return blsSigner;
+}

packages/demos/inpage/src/accounts/SafeECDSAAccountWrapper.ts

@@ -9,7 +9,7 @@ import {
 import EthereumRpc from '../EthereumRpc';
 import IAccount from './IAccount';
 import WaxInPage from '..';
-import { SafeECDSAFactory } from '../../hardhat/typechain-types/lib/packages/plugins/src/SafeECDSAFactory';
+import { SafeECDSAFactory } from '../../hardhat/typechain-types/lib/plugins/src/safe/SafeECDSAFactory';
 import receiptOf from '../helpers/receiptOf';
 import { executeContractCallWithSigners } from './execution';
 import assert from '../helpers/assert';