Merge pull request #584 from web3well/bw-406-aggregator-compression

Use compression in aggregator
getwax · May 2, 2023 · ffd7037 · ffd7037
2 parents daa51bc + e42ccf2
commit ffd7037
Show file tree

Hide file tree

Showing 15 changed files with 219 additions and 96 deletions.
diff --git a/aggregator/deps.ts b/aggregator/deps.ts
@@ -54,21 +54,26 @@ export type {
   PublicKey,
   Signature,
   VerificationGateway,
-} from "https://esm.sh/bls-wallet-clients@0.8.3-c34db60";
+} from "https://esm.sh/bls-wallet-clients@0.8.3-bee2034";
 
 export {
   Aggregator as AggregatorClient,
   AggregatorUtilitiesFactory,
+  BlsRegistrationCompressor,
   BlsWalletWrapper,
+  BundleCompressor,
+  ContractsConnector,
   decodeError,
+  Erc20Compressor,
   ERC20Factory,
+  FallbackCompressor,
   getConfig,
   MockERC20Factory,
   VerificationGatewayFactory,
-} from "https://esm.sh/bls-wallet-clients@0.8.3-c34db60";
+} from "https://esm.sh/bls-wallet-clients@0.8.3-bee2034";
 
 // Workaround for esbuild's export-star bug
-import blsWalletClients from "https://esm.sh/bls-wallet-clients@0.8.3-c34db60";
+import blsWalletClients from "https://esm.sh/bls-wallet-clients@0.8.3-bee2034";
 const { bundleFromDto, bundleToDto, initBlsWalletSigner } = blsWalletClients;
 export { bundleFromDto, bundleToDto, initBlsWalletSigner };
 

diff --git a/aggregator/manualTests/helpers/receiptOf.ts b/aggregator/manualTests/helpers/receiptOf.ts
@@ -0,0 +1,10 @@
+import { ethers } from "../../deps.ts";
+
+export default async function receiptOf(
+  responsePromise: Promise<ethers.providers.TransactionResponse>,
+): Promise<ethers.providers.TransactionReceipt> {
+  const response = await responsePromise;
+  const receipt = await response.wait();
+
+  return receipt;
+}
diff --git a/aggregator/manualTests/mint1ViaEthereumService.ts b/aggregator/manualTests/mint1ViaEthereumService.ts
@@ -14,8 +14,6 @@ const ethereumService = await EthereumService.create(
   (evt) => {
     console.log(evt);
   },
-  addresses.verificationGateway,
-  addresses.utilities,
   env.PRIVATE_KEY_AGG,
 );
 

diff --git a/aggregator/manualTests/registerWallet.ts b/aggregator/manualTests/registerWallet.ts
@@ -0,0 +1,34 @@
+#!/usr/bin/env -S deno run --allow-net --allow-env --allow-read
+
+import { ContractsConnector, ethers } from "../deps.ts";
+import * as env from "../src/env.ts";
+import AdminWallet from "../src/chain/AdminWallet.ts";
+import receiptOf from "./helpers/receiptOf.ts";
+
+const provider = new ethers.providers.JsonRpcProvider(env.RPC_URL);
+
+const adminWallet = AdminWallet(provider);
+
+const connector = await ContractsConnector.create(adminWallet);
+
+const addressRegistry = await connector.AddressRegistry();
+const blsPublicKeyRegistry = await connector.BLSPublicKeyRegistry();
+
+await receiptOf(
+  addressRegistry.register("0xCB1ca1e8DF1055636d7D07c3099c9de3c65CAAB4"),
+);
+
+await receiptOf(
+  blsPublicKeyRegistry.register(
+    // You can get this in Quill by running this in the console of the wallet
+    // page (the page you get by clicking on the extension icon)
+    // JSON.stringify(debug.wallets[0].blsWalletSigner.getPublicKey())
+
+    [
+      "0x0ad7e63a4bbfdad440beda1fe7fdfb77a59f2a6d991700c6cf4c3654a52389a9",
+      "0x0adaa93bdfda0f6b259a80c1af7ccf3451c35c1e175483927a8052bdbf59f801",
+      "0x1f56aa1bb1419c741f0a474e51f33da0ffc81ea870e2e2c440db72539a9efb9e",
+      "0x2f1f7e5d586d6ca5de3c8c198c3be3b998a2b6df7ee8a367a1e58f8b36fd524d",
+    ],
+  ),
+);
diff --git a/aggregator/manualTests/zeroAddressError.ts b/aggregator/manualTests/zeroAddressError.ts
@@ -15,8 +15,6 @@ const provider = new ethers.providers.JsonRpcProvider(env.RPC_URL);
 //   (evt) => {
 //     console.log(evt);
 //   },
-//   addresses.verificationGateway,
-//   addresses.utilities,
 //   env.PRIVATE_KEY_AGG,
 // );
 

diff --git a/aggregator/src/app/AggregationStrategy.ts b/aggregator/src/app/AggregationStrategy.ts
@@ -70,6 +70,7 @@ export type AggregationStrategyResult = {
   aggregateBundle: Bundle | nil;
   includedRows: BundleRow[];
   bundleOverheadCost: BigNumber;
+  bundleOverheadLen: number;
   expectedFee: BigNumber;
   expectedMaxCost: BigNumber;
   failedRows: BundleRow[];
@@ -105,7 +106,8 @@ export default class AggregationStrategy {
   async run(eligibleRows: BundleRow[]): Promise<AggregationStrategyResult> {
     eligibleRows = await this.#filterRows(eligibleRows);
 
-    const bundleOverheadGas = await this.measureBundleOverheadGas();
+    const { bundleOverheadGas, bundleOverheadLen } = await this
+      .measureBundleOverhead();
 
     let aggregateBundle = this.blsWalletSigner.aggregate([]);
     let aggregateGas = bundleOverheadGas;
@@ -147,6 +149,7 @@ export default class AggregationStrategy {
         bundleOverheadCost: bundleOverheadGas.mul(
           (await this.ethereumService.GasConfig()).maxFeePerGas,
         ),
+        bundleOverheadLen,
         expectedFee: BigNumber.from(0),
         expectedMaxCost: BigNumber.from(0),
         failedRows,
@@ -164,6 +167,7 @@ export default class AggregationStrategy {
       bundleOverheadCost: bundleOverheadGas.mul(
         (await this.ethereumService.GasConfig()).maxFeePerGas,
       ),
+      bundleOverheadLen,
       expectedFee,
       expectedMaxCost: aggregateBundleCheck.expectedMaxCost,
       failedRows,
@@ -217,6 +221,7 @@ export default class AggregationStrategy {
         aggregateBundle: nil,
         includedRows: [],
         bundleOverheadCost: result.bundleOverheadCost,
+        bundleOverheadLen: result.bundleOverheadLen,
         expectedFee: BigNumber.from(0),
         expectedMaxCost: BigNumber.from(0),
         failedRows,
@@ -256,6 +261,7 @@ export default class AggregationStrategy {
       aggregateBundle: nil,
       includedRows: [],
       bundleOverheadCost: result.bundleOverheadCost,
+      bundleOverheadLen: result.bundleOverheadLen,
       expectedFee: BigNumber.from(0),
       expectedMaxCost: BigNumber.from(0),
       failedRows,
@@ -459,14 +465,16 @@ export default class AggregationStrategy {
       .callStaticSequenceWithMeasure(
         feeToken
           ? es.Call(feeToken, "balanceOf", [es.wallet.address])
-          : es.Call(es.utilities, "ethBalanceOf", [es.wallet.address]),
-        bundles.map((bundle) =>
+          : es.Call(es.aggregatorUtilities, "ethBalanceOf", [
+            es.wallet.address,
+          ]),
+        await Promise.all(bundles.map(async (bundle) =>
           es.Call(
-            es.verificationGateway,
-            "processBundle",
-            [bundle],
+            es.bundleCompressor.blsExpanderDelegator,
+            "run",
+            [await es.bundleCompressor.compress(bundle)],
           )
-        ),
+        )),
       );
 
     return Range(bundles.length).map((i) => {
@@ -533,10 +541,12 @@ export default class AggregationStrategy {
       return nil;
     }
 
-    bundleOverheadGas ??= await this.measureBundleOverheadGas();
+    bundleOverheadGas ??=
+      (await this.measureBundleOverhead()).bundleOverheadGas;
 
-    const gasEstimate = await this.ethereumService.verificationGateway
-      .estimateGas.processBundle(bundle);
+    const gasEstimate = await this.ethereumService.estimateCompressedGas(
+      bundle,
+    );
 
     const marginalGasEstimate = gasEstimate.sub(bundleOverheadGas);
 
@@ -625,8 +635,7 @@ export default class AggregationStrategy {
       }
 
       const gasEstimate = feeInfo?.gasEstimate ??
-        await this.ethereumService.verificationGateway
-          .estimateGas.processBundle(bundle);
+        await this.ethereumService.estimateCompressedGas(bundle);
 
       return {
         success,
@@ -639,7 +648,7 @@ export default class AggregationStrategy {
     });
   }
 
-  async measureBundleOverheadGas() {
+  async measureBundleOverhead() {
     // The simple way to do this would be to estimate the gas of an empty
     // bundle. However, an empty bundle is a bit of a special case, in
     // particular the on-chain BLS library outright refuses to validate it. So
@@ -664,15 +673,43 @@ export default class AggregationStrategy {
     });
 
     const [oneOpGasEstimate, twoOpGasEstimate] = await Promise.all([
-      es.verificationGateway.estimateGas.processBundle(bundle1),
-      es.verificationGateway.estimateGas.processBundle(
+      es.estimateCompressedGas(bundle1),
+      es.estimateCompressedGas(
         this.blsWalletSigner.aggregate([bundle1, bundle2]),
       ),
     ]);
 
     const opMarginalGasEstimate = twoOpGasEstimate.sub(oneOpGasEstimate);
 
-    return oneOpGasEstimate.sub(opMarginalGasEstimate);
+    const bundleOverheadGas = oneOpGasEstimate.sub(opMarginalGasEstimate);
+
+    const [oneOpTx, twoOpTx] = await Promise.all([
+      es.bundleCompressor.blsExpanderDelegator.populateTransaction.run(
+        await es.bundleCompressor.compress(bundle1),
+      ),
+      es.bundleCompressor.blsExpanderDelegator.populateTransaction.run(
+        await es.bundleCompressor.compress(
+          this.blsWalletSigner.aggregate([bundle1, bundle2]),
+        ),
+      ),
+    ]);
+
+    const [oneOpLen, twoOpLen] = await Promise.all([
+      es.wallet.signTransaction(oneOpTx).then((tx) =>
+        ethers.utils.hexDataLength(tx)
+      ),
+      es.wallet.signTransaction(twoOpTx).then((tx) =>
+        ethers.utils.hexDataLength(tx)
+      ),
+    ]);
+
+    const opMarginalLen = twoOpLen - oneOpLen;
+    const bundleOverheadLen = oneOpLen - opMarginalLen;
+
+    return {
+      bundleOverheadGas,
+      bundleOverheadLen,
+    };
   }
 
   async #TokenDecimals(): Promise<number> {

diff --git a/aggregator/src/app/AppEvent.ts b/aggregator/src/app/AppEvent.ts
@@ -15,6 +15,7 @@ type AppEvent =
     data: {
       includedRows: number;
       bundleOverheadCost: string;
+      bundleOverheadLen: number;
       expectedFee: string;
       expectedMaxCost: string;
     };
@@ -44,7 +45,12 @@ type AppEvent =
   | { type: "unprofitable-despite-breakeven-operations" }
   | {
     type: "submission-attempt";
-    data: { publicKeyShorts: string[]; attemptNumber: number };
+    data: {
+      publicKeyShorts: string[];
+      attemptNumber: number;
+      txLen: number;
+      compressedTxLen: number;
+    };
   }
   | {
     type: "submission-attempt-failed";
@@ -97,5 +103,4 @@ type AppEvent =
     };
   };
 
-
 export default AppEvent;
diff --git a/aggregator/src/app/BundleService.ts b/aggregator/src/app/BundleService.ts
@@ -257,6 +257,7 @@ export default class BundleService {
         aggregateBundle,
         includedRows,
         bundleOverheadCost,
+        bundleOverheadLen,
         expectedFee,
         expectedMaxCost,
         failedRows,
@@ -268,6 +269,7 @@ export default class BundleService {
         data: {
           includedRows: includedRows.length,
           bundleOverheadCost: ethers.utils.formatEther(bundleOverheadCost),
+          bundleOverheadLen,
           expectedFee: ethers.utils.formatEther(expectedFee),
           expectedMaxCost: ethers.utils.formatEther(expectedMaxCost),
         },