Add contract audits

Update contract licenses to MIT

aggregator-proxy/package.json

@@ -21,7 +21,7 @@
     "@types/koa__cors": "^3.3.0",
     "@types/koa__router": "^8.0.11",
     "@types/node-fetch": "^2.6.1",
-    "bls-wallet-clients": "0.9.0-2a20bfe",
+    "bls-wallet-clients": "0.9.0-405e23a",
     "fp-ts": "^2.12.1",
     "io-ts": "^2.2.16",
     "io-ts-reporters": "^2.0.1",

aggregator-proxy/yarn.lock

@@ -569,16 +569,6 @@
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b"
   integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==
-  dependencies:
-    "@ethersproject/address" "^5.7.0"
-    "@ethersproject/bignumber" "^5.7.0"
-    "@ethersproject/bytes" "^5.7.0"
-    "@ethersproject/constants" "^5.7.0"
-    "@ethersproject/keccak256" "^5.7.0"
-    "@ethersproject/logger" "^5.7.0"
-    "@ethersproject/properties" "^5.7.0"
-    "@ethersproject/rlp" "^5.7.0"
-    "@ethersproject/signing-key" "^5.7.0"
 
 "@ethersproject/units@5.6.0":
   version "5.6.0"
@@ -887,10 +877,10 @@ bech32@1.1.4:
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
-bls-wallet-clients@0.9.0-2a20bfe:
-  version "0.9.0-2a20bfe"
-  resolved "https://registry.yarnpkg.com/bls-wallet-clients/-/bls-wallet-clients-0.9.0-2a20bfe.tgz#2e39757a18df3ba78d816ae15f6b88000443a2a6"
-  integrity sha512-w4efcArPBEowrAkIdVYc2mOLlkN8E5O9eIqEhoo6IrRVrN21p/JVNdoot4N3o5MAKFbeaYfid/u9lL6p2DNdiw==
+bls-wallet-clients@0.9.0-405e23a:
+  version "0.9.0-405e23a"
+  resolved "https://registry.npmjs.org/bls-wallet-clients/-/bls-wallet-clients-0.9.0-405e23a.tgz#b66121f9ec0cb4e821965606ada203e6601b773d"
+  integrity sha512-cMm6pq35VU30veCAHt6ArSavlqzXu+olQg+dzUH28fvqSeQsfWz2qiuBekGxSWOCfn8gX1j/8jHEhrGxXS509Q==
   dependencies:
     "@thehubbleproject/bls" "^0.5.1"
     ethers "^5.7.2"

aggregator/.env.example

@@ -40,3 +40,7 @@ PRIORITY_FEE_PER_GAS=0
 PREVIOUS_BASE_FEE_PERCENT_INCREASE=2
 
 BUNDLE_CHECKING_CONCURRENCY=8
+
+IS_OPTIMISM=false
+OPTIMISM_GAS_PRICE_ORACLE_ADDRESS=0x420000000000000000000000000000000000000F
+OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE=2

aggregator/.env.local.example

@@ -38,3 +38,5 @@ PRIORITY_FEE_PER_GAS=500000000
 PREVIOUS_BASE_FEE_PERCENT_INCREASE=13
 
 BUNDLE_CHECKING_CONCURRENCY=8
+
+IS_OPTIMISM=false

aggregator/.env.test

@@ -35,3 +35,5 @@ PRIORITY_FEE_PER_GAS=500000000
 PREVIOUS_BASE_FEE_PERCENT_INCREASE=13
 
 BUNDLE_CHECKING_CONCURRENCY=8
+
+IS_OPTIMISM=false

aggregator/README.md

@@ -89,32 +89,35 @@ commands.
 
 #### Environment Variables
 
-| Name                               | Example Value                                                      | Description                                                                                                                                                                                                                                                                                         |
-| ---------------------------------- | ------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| RPC_URL                            | https://localhost:8545                                             | The RPC endpoint for an EVM node that the BLS Wallet contracts are deployed on                                                                                                                                                                                                                      |
-| RPC_POLLING_INTERVAL               | 4000                                                               | How long to wait between retries, when needed (used by ethers when waiting for blocks)                                                                                                                                                                                                              |
-| USE_TEST_NET                       | false                                                              | Whether to set all transaction's `gasPrice` to 0. Workaround for some networks                                                                                                                                                                                                                      |
-| ORIGIN                             | http://localhost:3000                                              | The origin for the aggregator client. Used only in manual tests                                                                                                                                                                                                                                     |
-| PORT                               | 3000                                                               | The port to bind the aggregator to                                                                                                                                                                                                                                                                  |
-| NETWORK_CONFIG_PATH                | ../contracts/networks/local.json                                   | Path to the network config file, which contains information on deployed BLS Wallet contracts                                                                                                                                                                                                        |
-| PRIVATE_KEY_AGG                    | 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 | Private key for the EOA account used to submit bundles on chain. Transactions are paid by the account linked to PRIVATE_KEY_AGG. By default, bundles must pay for themselves by sending funds to tx.origin or the aggregator’s onchain address                                                      |
-| PRIVATE_KEY_ADMIN                  | 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d | Private key for the admin EOA account. Used only in tests                                                                                                                                                                                                                                           |
-| TEST_BLS_WALLETS_SECRET            | test-bls-wallets-secret                                            | Secret used to seed BLS Wallet private keys during tests                                                                                                                                                                                                                                            |
-| DB_PATH                            | aggregator.sqlite                                                  | File path of the sqlite db                                                                                                                                                                                                                                                                          |
-| BUNDLE_QUERY_LIMIT                 | 100                                                                | Maximum number of bundles returned from sqlite                                                                                                                                                                                                                                                      |
-| MAX_GAS_PER_BUNDLE                 | 2000000                                                            | Limits the amount of user operations which can be bundled together by using this value as the approximate limit on the amount of gas in an aggregate bundle                                                                                                                                         |
-| MAX_AGGREGATION_DELAY_MILLIS       | 5000                                                               | Maximum amount of time in milliseconds aggregator will wait before submitting bundles on chain. A higher number will allow more time for bundles to fill, but may result in longer periods before submission. A lower number allows more frequent L2 submissions, but may result in smaller bundles |
-| MAX_UNCONFIRMED_AGGREGATIONS       | 3                                                                  | Maximum unconfirmed bundle aggregations that will be submitted on chain                                                                                                                                                                                                                             |
-| LOG_QUERIES                        | false                                                              | Whether to print sqlite queries in event log. When running tests, `TEST_LOGGING` must also be enabled                                                                                                                                                                                               |
-| TEST_LOGGING                       | false                                                              | Whether to print aggregator server events to stdout during tests. Useful for debugging & logging                                                                                                                                                                                                    |
-| REQUIRE_FEES                       | true                                                               | Whether to require that user bundles pay the aggregator a sufficient fee                                                                                                                                                                                                                            |
-| BREAKEVEN_OPERATION_COUNT          | 4.5                                                                | The aggregator must pay an overhead to submit a bundle regardless of how many operations it contains. This parameter determines how much each operation must contribute to this overhead                                                                                                            |
-| ALLOW_LOSSES                       | true                                                               | Even if each user bundle pays the required fee, the aggregate bundle may not be profitable if it is too small. Setting this to true makes the aggregator submit these bundles anyway                                                                                                                |
-| FEE_TYPE                           | ether OR token:0xabcd...1234                                       | The fee type the aggregator will accept. Either `ether` for ETH/chains native currency or `token:0xabcd...1234` (token contract address) for an ERC20 token                                                                                                                                         |
-| AUTO_CREATE_INTERNAL_BLS_WALLET    | false                                                              | An internal BLS wallet is used to calculate bundle overheads. Setting this to true allows creating this wallet on startup, but might be undesirable in production (see `programs/createInternalBlsWallet.ts` for manual creation)                                                                   |
-| PRIORITY_FEE_PER_GAS               | 0                                                                  | The priority fee used when submitting bundles (and passed on as a requirement for user bundles)                                                                                                                                                                                                     |
-| PREVIOUS_BASE_FEE_PERCENT_INCREASE | 2                                                                  | Used to determine the max basefee attached to aggregator transaction (and passed on as a requirement for user bundles)s                                                                                                                                                                             |
-| BUNDLE_CHECKING_CONCURRENCY        | 8                                                                  | The maximum number of bundles that are checked concurrently (getting gas usage, detecting fees, etc)                                                                                                                                                                                                |
+| Name                                  | Example Value                                                      | Description                                                                                                                                                                                                                                                                                         |
+| ------------------------------------- | ------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| RPC_URL                               | https://localhost:8545                                             | The RPC endpoint for an EVM node that the BLS Wallet contracts are deployed on                                                                                                                                                                                                                      |
+| RPC_POLLING_INTERVAL                  | 4000                                                               | How long to wait between retries, when needed (used by ethers when waiting for blocks)                                                                                                                                                                                                              |
+| USE_TEST_NET                          | false                                                              | Whether to set all transaction's `gasPrice` to 0. Workaround for some networks                                                                                                                                                                                                                      |
+| ORIGIN                                | http://localhost:3000                                              | The origin for the aggregator client. Used only in manual tests                                                                                                                                                                                                                                     |
+| PORT                                  | 3000                                                               | The port to bind the aggregator to                                                                                                                                                                                                                                                                  |
+| NETWORK_CONFIG_PATH                   | ../contracts/networks/local.json                                   | Path to the network config file, which contains information on deployed BLS Wallet contracts                                                                                                                                                                                                        |
+| PRIVATE_KEY_AGG                       | 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 | Private key for the EOA account used to submit bundles on chain. Transactions are paid by the account linked to PRIVATE_KEY_AGG. By default, bundles must pay for themselves by sending funds to tx.origin or the aggregator’s onchain address                                                      |
+| PRIVATE_KEY_ADMIN                     | 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d | Private key for the admin EOA account. Used only in tests                                                                                                                                                                                                                                           |
+| TEST_BLS_WALLETS_SECRET               | test-bls-wallets-secret                                            | Secret used to seed BLS Wallet private keys during tests                                                                                                                                                                                                                                            |
+| DB_PATH                               | aggregator.sqlite                                                  | File path of the sqlite db                                                                                                                                                                                                                                                                          |
+| BUNDLE_QUERY_LIMIT                    | 100                                                                | Maximum number of bundles returned from sqlite                                                                                                                                                                                                                                                      |
+| MAX_GAS_PER_BUNDLE                    | 2000000                                                            | Limits the amount of user operations which can be bundled together by using this value as the approximate limit on the amount of gas in an aggregate bundle                                                                                                                                         |
+| MAX_AGGREGATION_DELAY_MILLIS          | 5000                                                               | Maximum amount of time in milliseconds aggregator will wait before submitting bundles on chain. A higher number will allow more time for bundles to fill, but may result in longer periods before submission. A lower number allows more frequent L2 submissions, but may result in smaller bundles |
+| MAX_UNCONFIRMED_AGGREGATIONS          | 3                                                                  | Maximum unconfirmed bundle aggregations that will be submitted on chain                                                                                                                                                                                                                             |
+| LOG_QUERIES                           | false                                                              | Whether to print sqlite queries in event log. When running tests, `TEST_LOGGING` must also be enabled                                                                                                                                                                                               |
+| TEST_LOGGING                          | false                                                              | Whether to print aggregator server events to stdout during tests. Useful for debugging & logging                                                                                                                                                                                                    |
+| REQUIRE_FEES                          | true                                                               | Whether to require that user bundles pay the aggregator a sufficient fee                                                                                                                                                                                                                            |
+| BREAKEVEN_OPERATION_COUNT             | 4.5                                                                | The aggregator must pay an overhead to submit a bundle regardless of how many operations it contains. This parameter determines how much each operation must contribute to this overhead                                                                                                            |
+| ALLOW_LOSSES                          | true                                                               | Even if each user bundle pays the required fee, the aggregate bundle may not be profitable if it is too small. Setting this to true makes the aggregator submit these bundles anyway                                                                                                                |
+| FEE_TYPE                              | ether OR token:0xabcd...1234                                       | The fee type the aggregator will accept. Either `ether` for ETH/chains native currency or `token:0xabcd...1234` (token contract address) for an ERC20 token                                                                                                                                         |
+| AUTO_CREATE_INTERNAL_BLS_WALLET       | false                                                              | An internal BLS wallet is used to calculate bundle overheads. Setting this to true allows creating this wallet on startup, but might be undesirable in production (see `programs/createInternalBlsWallet.ts` for manual creation)                                                                   |
+| PRIORITY_FEE_PER_GAS                  | 0                                                                  | The priority fee used when submitting bundles (and passed on as a requirement for user bundles)                                                                                                                                                                                                     |
+| PREVIOUS_BASE_FEE_PERCENT_INCREASE    | 2                                                                  | Used to determine the max basefee attached to aggregator transaction (and passed on as a requirement for user bundles)s                                                                                                                                                                             |
+| BUNDLE_CHECKING_CONCURRENCY           | 8                                                                  | The maximum number of bundles that are checked concurrently (getting gas usage, detecting fees, etc)                                                                                                                                                                                                |
+| IS_OPTIMISM                           | false                                                              | Optimism's strategy for charging for L1 fees requires special logic in the aggregator. In addition to gasEstimate * gasPrice, we need to replicate Optimism's calculation and pass it on to the user                                                                                                |
+| OPTIMISM_GAS_PRICE_ORACLE_ADDRESS     | 0x420000000000000000000000000000000000000F                         | Address for the Optimism gas price oracle contract. Required when IS_OPTIMISM is true                                                                                                                                                                                                               |
+| OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE | 2                                                                  | Similar to PREVIOUS_BASE_FEE_PERCENT_INCREASE, but for the L1 basefee for the optimism-specific calculation. This gets passed on to users. Required when IS_OPTIMISM is true                                                                                                                        |
 
 ## Running
 

aggregator/deps.ts

@@ -54,7 +54,7 @@ export type {
   PublicKey,
   Signature,
   VerificationGateway,
-} from "https://esm.sh/bls-wallet-clients@0.9.0-2a20bfe";
+} from "https://esm.sh/bls-wallet-clients@0.9.0-405e23a";
 
 export {
   Aggregator as AggregatorClient,
@@ -70,12 +70,14 @@ export {
   getConfig,
   MockERC20Factory,
   VerificationGatewayFactory,
-} from "https://esm.sh/bls-wallet-clients@0.9.0-2a20bfe";
+} from "https://esm.sh/bls-wallet-clients@0.9.0-405e23a";
 
 // Workaround for esbuild's export-star bug
-import blsWalletClients from "https://esm.sh/bls-wallet-clients@0.9.0-2a20bfe";
+import blsWalletClients from "https://esm.sh/bls-wallet-clients@0.9.0-405e23a";
 const { bundleFromDto, bundleToDto, initBlsWalletSigner } = blsWalletClients;
 export { bundleFromDto, bundleToDto, initBlsWalletSigner };
 
 export * as sqlite from "https://deno.land/x/sqlite@v3.7.0/mod.ts";
 export { Semaphore } from "https://deno.land/x/semaphore@v1.1.2/mod.ts";
+
+export { pick } from "npm:@s-libs/micro-dash@15.2.0";

aggregator/manualTests/callOptimismGasPriceOracle.ts

@@ -0,0 +1,17 @@
+#!/usr/bin/env -S deno run --allow-net --allow-env --allow-read
+
+import * as env from "../src/env.ts";
+import { ethers } from "../deps.ts";
+import OptimismGasPriceOracle from "../src/app/OptimismGasPriceOracle.ts";
+
+const oracle = new OptimismGasPriceOracle(
+  new ethers.providers.JsonRpcProvider(env.RPC_URL),
+);
+
+const { l1BaseFee, overhead, scalar, decimals } = await oracle.getAllParams();
+
+console.log({
+  l1BaseFee: `${(l1BaseFee.toNumber() / 1e9).toFixed(3)} gwei`,
+  overhead: `${overhead.toNumber()} L1 gas`,
+  scalar: scalar.toNumber() / (10 ** decimals.toNumber()),
+});

aggregator/manualTests/getOptimismL1Fee.ts

@@ -0,0 +1,17 @@
+#!/usr/bin/env -S deno run --allow-net --allow-env --allow-read
+
+import { ethers } from "../deps.ts";
+import * as env from "../src/env.ts";
+import getOptimismL1Fee from "../src/helpers/getOptimismL1Fee.ts";
+
+const provider = new ethers.providers.JsonRpcProvider(env.RPC_URL);
+
+const txHash = Deno.args[0];
+
+if (!txHash.startsWith("0x")) {
+  throw new Error("First arg should be tx hash");
+}
+
+const l1Fee = await getOptimismL1Fee(provider, txHash);
+
+console.log(`${ethers.utils.formatEther(l1Fee)} ETH`);

aggregator/manualTests/getRawTransaction.ts

@@ -0,0 +1,15 @@
+#!/usr/bin/env -S deno run --allow-net --allow-env --allow-read
+
+import { ethers } from "../deps.ts";
+import * as env from "../src/env.ts";
+import getRawTransaction from "../src/helpers/getRawTransaction.ts";
+
+const provider = new ethers.providers.JsonRpcProvider(env.RPC_URL);
+
+const txHash = Deno.args[0];
+
+if (!txHash.startsWith("0x")) {
+  throw new Error("First arg should be tx hash");
+}
+
+console.log(await getRawTransaction(provider, txHash));

aggregator/manualTests/mintNViaAggregator.ts

@@ -60,7 +60,7 @@ const bundles: Bundle[] = [];
 for (const [i, wallet] of wallets.entries()) {
   const nonce = await wallet.Nonce();
 
-  console.log("Funding wallet", i);
+  console.log("Funding wallet", i, "(1 wei to make estimateFee work)");
 
   await (await adminWallet.sendTransaction({
     to: wallet.address,
@@ -92,7 +92,7 @@ for (const [i, wallet] of wallets.entries()) {
 
   // Ensure wallet can pay the fee
   if (balance.lt(fee)) {
-    console.log("Funding wallet");
+    console.log("Funding wallet", i, "(based on estimateFee)");
 
     await (await adminWallet.sendTransaction({
       to: wallet.address,

aggregator/src/app/AggregationStrategy.ts

@@ -544,9 +544,10 @@ export default class AggregationStrategy {
     bundleOverheadGas ??=
       (await this.measureBundleOverhead()).bundleOverheadGas;
 
-    const gasEstimate = await this.ethereumService.estimateCompressedGas(
-      bundle,
-    );
+    const gasEstimate = await this.ethereumService
+      .estimateEffectiveCompressedGas(
+        bundle,
+      );
 
     const marginalGasEstimate = gasEstimate.sub(bundleOverheadGas);
 
@@ -630,12 +631,18 @@ export default class AggregationStrategy {
           expectedFee: fee,
           requiredFee: feeInfo.requiredFee,
           expectedMaxCost: feeInfo.expectedMaxCost,
-          errorReason: { message: "Insufficient fee" },
+          errorReason: {
+            message: [
+              "Insufficient fee",
+              `(provided: ${ethers.utils.formatEther(fee)},`,
+              `required: ${ethers.utils.formatEther(feeInfo.requiredFee)})`,
+            ].join(" "),
+          },
         };
       }
 
       const gasEstimate = feeInfo?.gasEstimate ??
-        await this.ethereumService.estimateCompressedGas(bundle);
+        await this.ethereumService.estimateEffectiveCompressedGas(bundle);
 
       return {
         success,
@@ -673,8 +680,8 @@ export default class AggregationStrategy {
     });
 
     const [oneOpGasEstimate, twoOpGasEstimate] = await Promise.all([
-      es.estimateCompressedGas(bundle1),
-      es.estimateCompressedGas(
+      es.estimateEffectiveCompressedGas(bundle1),
+      es.estimateEffectiveCompressedGas(
         this.blsWalletSigner.aggregate([bundle1, bundle2]),
       ),
     ]);

aggregator/src/app/AppEvent.ts

@@ -1,6 +1,7 @@
 import { HTTPMethods } from "../../deps.ts";
 
 type AppEvent =
+  | { type: "starting" }
   | { type: "listening"; data: { port: number } }
   | { type: "db-query"; data: { sql: string; params: unknown } }
   | { type: "waiting-unconfirmed-space" }

aggregator/src/app/BundleService.ts

@@ -23,6 +23,7 @@ import BundleTable, { BundleRow } from "./BundleTable.ts";
 import plus from "./helpers/plus.ts";
 import AggregationStrategy from "./AggregationStrategy.ts";
 import nil from "../helpers/nil.ts";
+import getOptimismL1Fee from "../helpers/getOptimismL1Fee.ts";
 import ExplicitAny from "../helpers/ExplicitAny.ts";
 
 export type AddBundleResponse = { hash: string } | {
@@ -36,6 +37,7 @@ export default class BundleService {
     maxAggregationDelayMillis: env.MAX_AGGREGATION_DELAY_MILLIS,
     maxUnconfirmedAggregations: env.MAX_UNCONFIRMED_AGGREGATIONS,
     maxEligibilityDelay: env.MAX_ELIGIBILITY_DELAY,
+    isOptimism: env.IS_OPTIMISM,
   };
 
   unconfirmedBundles = new Set<Bundle>();
@@ -165,7 +167,8 @@ export default class BundleService {
     if (!signedCorrectly) {
       failures.push({
         type: "invalid-signature",
-        description: `invalid bundle signature for signature ${bundle.signature}`,
+        description:
+          `invalid bundle signature for signature ${bundle.signature}`,
       });
     }
 
@@ -206,7 +209,7 @@ export default class BundleService {
 
   lookupAggregateBundle(subBundleHash: string) {
     const subBundle = this.bundleTable.findBundle(subBundleHash);
-    return this.bundleTable.findAggregateBundle(subBundle?.aggregateHash!)
+    return this.bundleTable.findAggregateBundle(subBundle?.aggregateHash!);
   }
 
   receiptFromBundle(bundle: BundleRow) {
@@ -246,17 +249,17 @@ export default class BundleService {
         gas: BigNumber.from(0),
       };
     });
-  
+
     const verifyMethodName = "verify";
     const bundleType = VerificationGatewayFactory.abi.find(
       (entry) => "name" in entry && entry.name === verifyMethodName,
     )?.inputs[0];
-  
+
     const validatedBundle = {
       ...bundle,
       operations: operationsWithZeroGas,
     };
-  
+
     const encodedBundleWithZeroSignature = ethers.utils.defaultAbiCoder.encode(
       [bundleType as ExplicitAny],
       [
@@ -266,7 +269,7 @@ export default class BundleService {
         },
       ],
     );
-  
+
     const bundleHash = ethers.utils.keccak256(encodedBundleWithZeroSignature);
     const chainId = (await this.ethereumService.provider.getNetwork()).chainId;
 
@@ -417,7 +420,16 @@ export default class BundleService {
         const profit = balanceAfter.sub(balanceBefore);
 
         /** What we paid to process the bundle */
-        const cost = receipt.gasUsed.mul(receipt.effectiveGasPrice);
+        let cost = receipt.gasUsed.mul(receipt.effectiveGasPrice);
+
+        if (this.config.isOptimism) {
+          cost = cost.add(
+            await getOptimismL1Fee(
+              this.ethereumService.provider,
+              receipt.transactionHash,
+            ),
+          );
+        }
 
         /** Fees collected from users */
         const actualFee = profit.add(cost);

aggregator/src/app/EthereumService.ts

@@ -26,6 +26,8 @@ import toPublicKeyShort from "./helpers/toPublicKeyShort.ts";
 import AsyncReturnType from "../helpers/AsyncReturnType.ts";
 import ExplicitAny from "../helpers/ExplicitAny.ts";
 import nil from "../helpers/nil.ts";
+import hexToUint8Array from "../helpers/hexToUint8Array.ts";
+import OptimismGasPriceOracle from "./OptimismGasPriceOracle.ts";
 
 export type TxCheckResult = {
   failures: TransactionFailure[];
@@ -76,6 +78,7 @@ export default class EthereumService {
     public emit: (evt: AppEvent) => void,
     public wallet: Wallet,
     public provider: ethers.providers.Provider,
+    public chainId: number,
     public blsWalletWrapper: BlsWalletWrapper,
     public blsWalletSigner: BlsWalletSigner,
     public verificationGateway: VerificationGateway,
@@ -169,6 +172,7 @@ export default class EthereumService {
       emit,
       wallet,
       provider,
+      chainId,
       blsWalletWrapper,
       blsWalletSigner,
       verificationGateway,
@@ -341,10 +345,10 @@ export default class EthereumService {
     };
 
     const attempt = async () => {
-      let txResponse: ethers.providers.TransactionResponse;
+      let response: ethers.providers.TransactionResponse;
 
       try {
-        txResponse = await this.wallet.sendTransaction(txRequest);
+        response = await this.wallet.sendTransaction(txRequest);
       } catch (error) {
         if (/\binvalid transaction nonce\b/.test(error.message)) {
           // This can occur when the nonce is in the future, which can
@@ -360,7 +364,10 @@ export default class EthereumService {
       }
 
       try {
-        return { type: "receipt" as const, value: await txResponse.wait() };
+        return {
+          type: "complete" as const,
+          value: await response.wait(),
+        };
       } catch (error) {
         return { type: "waitError" as const, value: error };
       }
@@ -376,7 +383,7 @@ export default class EthereumService {
 
       const attemptResult = await attempt();
 
-      if (attemptResult.type === "receipt") {
+      if (attemptResult.type === "complete") {
         return attemptResult.value;
       }
 
@@ -405,17 +412,44 @@ export default class EthereumService {
     throw new Error("Expected return or throw from attempt loop");
   }
 
-  async estimateCompressedGas(bundle: Bundle): Promise<BigNumber> {
+  /**
+   * Estimates the amount of effective gas needed to process the bundle using
+   * compression.
+   *
+   * Here 'effective' gas means the number you need to multiply by gasPrice in
+   * order to get the right fee. There are a few cases here:
+   *
+   * 1. L1 chains (used in testing, eg gethDev)
+   *   - Effective gas is equal to regular gas
+   * 2. Arbitrum
+   *   - The Arbitrum node already responds with effective gas when calling
+   *     estimateGas
+   * 3. Optimism
+   *   - We estimate Optimism's calculation for the amount of L1 gas it will
+   *     charge for, and then convert that into an equivalend amount of L2 gas.
+   */
+  async estimateEffectiveCompressedGas(bundle: Bundle): Promise<BigNumber> {
     const compressedBundle = await this.bundleCompressor.compress(bundle);
 
-    return await this.wallet.estimateGas({
+    let gasEstimate = await this.wallet.estimateGas({
       to: this.expanderEntryPoint.address,
       data: compressedBundle,
     });
+
+    if (env.IS_OPTIMISM) {
+      const extraGasEstimate = await this.estimateOptimismL2GasNeededForL1Gas(
+        compressedBundle,
+        gasEstimate,
+      );
+
+      gasEstimate = gasEstimate.add(extraGasEstimate);
+    }
+
+    return gasEstimate;
   }
 
-  async GasConfig() {
-    const block = await this.provider.getBlock("latest");
+  async GasConfig(block?: ethers.providers.Block) {
+    block ??= await this.provider.getBlock("latest");
     const previousBaseFee = block.baseFeePerGas;
     assert(previousBaseFee !== null && previousBaseFee !== nil);
 
@@ -442,6 +476,66 @@ export default class EthereumService {
     };
   }
 
+  /**
+   * Estimates the L1 gas that Optimism will charge us for and expresses it as
+   * an amount of equivalent L2 gas.
+   *
+   * This is very similar to what Arbitrum does, but in Arbitrum it's built-in,
+   * and you actually sign for that additional L2 gas. On Optimism, you only
+   * sign for the actual L2 gas, and optimism just adds the L1 fee.
+   *
+   * For our purposes, this works as a way to normalize the behavior between
+   * the different chains.
+   */
+  async estimateOptimismL2GasNeededForL1Gas(
+    compressedBundle: string,
+    gasLimit: BigNumber,
+  ): Promise<BigNumber> {
+    const block = await this.provider.getBlock("latest");
+    const gasConfig = await this.GasConfig(block);
+
+    const txBytes = await this.wallet.signTransaction({
+      type: 2,
+      chainId: this.chainId,
+      nonce: this.nextNonce,
+      to: this.expanderEntryPoint.address,
+      data: compressedBundle,
+      ...gasConfig,
+      gasLimit,
+    });
+
+    let l1Gas = 0;
+
+    for (const byte of hexToUint8Array(txBytes)) {
+      if (byte === 0) {
+        l1Gas += 4;
+      } else {
+        l1Gas += 16;
+      }
+    }
+
+    const gasOracle = new OptimismGasPriceOracle(this.provider);
+
+    const { l1BaseFee, overhead, scalar, decimals } = await gasOracle
+      .getAllParams();
+
+    const scalarNum = scalar.toNumber() / (10 ** decimals.toNumber());
+
+    l1Gas += overhead.toNumber();
+
+    assert(block.baseFeePerGas !== null && block.baseFeePerGas !== nil);
+    assert(env.OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE !== nil);
+
+    const adjustedL1BaseFee = l1BaseFee.toNumber() * scalarNum *
+      (1 + env.OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE / 100);
+
+    const feeRatio = adjustedL1BaseFee / block.baseFeePerGas.toNumber();
+
+    return BigNumber.from(
+      Math.ceil(feeRatio * l1Gas),
+    );
+  }
+
   private static Wallet(
     provider: ethers.providers.Provider,
     privateKey: string,

aggregator/src/app/OptimismGasPriceOracle.ts

@@ -0,0 +1,52 @@
+import { BigNumber, ethers } from "../../deps.ts";
+import assert from "../helpers/assert.ts";
+import { OPTIMISM_GAS_PRICE_ORACLE_ADDRESS } from "../env.ts";
+
+export default class OptimismGasPriceOracle {
+  constructor(
+    public provider: ethers.providers.Provider,
+  ) {}
+
+  private async callFn(method: string, blockTag?: ethers.providers.BlockTag) {
+    const outputBytes = await this.provider.call({
+      to: OPTIMISM_GAS_PRICE_ORACLE_ADDRESS,
+      data: ethers.utils.id(method),
+    }, blockTag);
+
+    const result = ethers.utils.defaultAbiCoder.decode(
+      ["uint256"],
+      outputBytes,
+    )[0];
+
+    assert(result instanceof BigNumber);
+
+    return result;
+  }
+
+  async l1BaseFee(blockTag?: ethers.providers.BlockTag) {
+    return await this.callFn("l1BaseFee()", blockTag);
+  }
+
+  async overhead(blockTag?: ethers.providers.BlockTag) {
+    return await this.callFn("overhead()", blockTag);
+  }
+
+  async scalar(blockTag?: ethers.providers.BlockTag) {
+    return await this.callFn("scalar()", blockTag);
+  }
+
+  async decimals(blockTag?: ethers.providers.BlockTag) {
+    return await this.callFn("decimals()", blockTag);
+  }
+
+  async getAllParams(blockTag?: ethers.providers.BlockTag) {
+    const [l1BaseFee, overhead, scalar, decimals] = await Promise.all([
+      this.l1BaseFee(blockTag),
+      this.overhead(blockTag),
+      this.scalar(blockTag),
+      this.decimals(blockTag),
+    ]);
+
+    return { l1BaseFee, overhead, scalar, decimals };
+  }
+}

aggregator/src/app/app.ts

@@ -18,6 +18,8 @@ import HealthService from "./HealthService.ts";
 import HealthRouter from "./HealthRouter.ts";
 
 export default async function app(emit: (evt: AppEvent) => void) {
+  emit({ type: "starting" });
+
   const clock = Clock.create();
 
   const bundleTableMutex = new Mutex();

aggregator/src/env.ts

@@ -1,4 +1,6 @@
+import assert from "./helpers/assert.ts";
 import {
+  optionalEnv,
   optionalNumberEnv,
   requireBigNumberEnv,
   requireBoolEnv,
@@ -95,3 +97,38 @@ export const PREVIOUS_BASE_FEE_PERCENT_INCREASE = requireNumberEnv(
 export const BUNDLE_CHECKING_CONCURRENCY = requireIntEnv(
   "BUNDLE_CHECKING_CONCURRENCY",
 );
+
+/**
+ * Optimism's strategy for charging for L1 fees requires special logic in the
+ * aggregator. In addition to gasEstimate * gasPrice, we need to replicate
+ * Optimism's calculation and pass it on to the user.
+ */
+export const IS_OPTIMISM = requireBoolEnv("IS_OPTIMISM");
+
+/**
+ * Address for the Optimism gas price oracle contract. Required when
+ * IS_OPTIMISM is true.
+ */
+export const OPTIMISM_GAS_PRICE_ORACLE_ADDRESS = optionalEnv(
+  "OPTIMISM_GAS_PRICE_ORACLE_ADDRESS",
+);
+
+/**
+ * Similar to PREVIOUS_BASE_FEE_PERCENT_INCREASE, but for the L1 basefee for
+ * the optimism-specific calculation. This gets passed on to users.
+ * Required when IS_OPTIMISM is true.
+ */
+export const OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE = optionalNumberEnv(
+  "OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE",
+);
+
+if (IS_OPTIMISM) {
+  assert(
+    OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE !== nil,
+    "OPTIMISM_L1_BASE_FEE_PERCENT_INCREASE is required when IS_OPTIMISM is true",
+  );
+  assert(
+    OPTIMISM_GAS_PRICE_ORACLE_ADDRESS !== nil,
+    "OPTIMISM_GAS_PRICE_ORACLE_ADDRESS is required when IS_OPTIMISM is true",
+  );
+}

aggregator/src/helpers/getOptimismL1Fee.ts

@@ -0,0 +1,50 @@
+import { BigNumber, ethers } from "../../deps.ts";
+import OptimismGasPriceOracle from "../app/OptimismGasPriceOracle.ts";
+import assert from "./assert.ts";
+import getRawTransaction from "./getRawTransaction.ts";
+import hexToUint8Array from "./hexToUint8Array.ts";
+import nil from "./nil.ts";
+
+export default async function getOptimismL1Fee(
+  provider: ethers.providers.Provider,
+  txResponseOrHash: string | ethers.providers.TransactionResponse,
+) {
+  const tx = typeof txResponseOrHash === "string"
+    ? await provider.getTransaction(txResponseOrHash)
+    : txResponseOrHash;
+
+  const rawTx = await getRawTransaction(provider, tx);
+
+  let l1Gas = 0;
+
+  for (const byte of hexToUint8Array(rawTx)) {
+    if (byte === 0) {
+      l1Gas += 4;
+    } else {
+      l1Gas += 16;
+    }
+  }
+
+  const gasOracle = new OptimismGasPriceOracle(provider);
+
+  assert(tx.blockNumber !== nil);
+
+  const {
+    l1BaseFee,
+    overhead,
+    scalar,
+    decimals,
+  } = await gasOracle.getAllParams(tx.blockNumber);
+
+  l1Gas = l1Gas += overhead.toNumber();
+
+  const l1Fee = BigNumber
+    .from(l1Gas)
+    .mul(l1BaseFee)
+    .mul(scalar)
+    .div(
+      BigNumber.from(10).pow(decimals),
+    );
+
+  return l1Fee;
+}

aggregator/src/helpers/getRawTransaction.ts

@@ -0,0 +1,49 @@
+import { ethers, pick } from "../../deps.ts";
+import assert from "./assert.ts";
+import nil from "./nil.ts";
+
+export default async function getRawTransaction(
+  provider: ethers.providers.Provider,
+  txResponseOrHash: string | ethers.providers.TransactionResponse,
+) {
+  const tx = typeof txResponseOrHash === "string"
+    ? await provider.getTransaction(txResponseOrHash)
+    : txResponseOrHash;
+
+  const txHash = typeof txResponseOrHash === "string"
+    ? txResponseOrHash
+    : tx.hash;
+
+  assert(typeof txHash === "string");
+
+  const { v, r, s } = tx;
+  assert(r !== nil);
+
+  const txBytes = ethers.utils.serializeTransaction(
+    pick(
+      tx,
+      "to",
+      "nonce",
+      "gasLimit",
+      ...(tx.type === 2 ? [] : ["gasPrice"] as const),
+      "data",
+      "value",
+      "chainId",
+      "type",
+      ...(tx.type !== 2 ? [] : [
+        "accessList",
+        "maxPriorityFeePerGas",
+        "maxFeePerGas",
+      ] as const),
+    ),
+    { v, r, s },
+  );
+
+  const reconstructedHash = ethers.utils.keccak256(txBytes);
+
+  if (reconstructedHash !== txHash) {
+    throw new Error("Reconstructed hash did not match original hash");
+  }
+
+  return txBytes;
+}

aggregator/src/helpers/hexToUint8Array.ts

@@ -0,0 +1,16 @@
+import assert from "./assert.ts";
+
+export default function hexToUint8Array(hex: string) {
+  assert(hex.startsWith("0x"));
+  assert(hex.length % 2 === 0);
+
+  const len = (hex.length - 2) / 2;
+  const result = new Uint8Array(len);
+
+  for (let i = 0; i < len; i++) {
+    const hexPos = 2 * i + 2;
+    result[i] = parseInt(hex.slice(hexPos, hexPos + 2), 16);
+  }
+
+  return result;
+}

aggregator/test/helpers/Fixture.ts

@@ -37,6 +37,7 @@ export const bundleServiceDefaultTestConfig:
     maxAggregationDelayMillis: 5000,
     maxUnconfirmedAggregations: 3,
     maxEligibilityDelay: 300,
+    isOptimism: false,
   };
 
 export const aggregationStrategyDefaultTestConfig: AggregationStrategyConfig = {

contracts/audits/README.md

@@ -0,0 +1,11 @@
+# Audits
+
+## 2021
+
+[Hubble contracts, including core BLS contracts](https://github.com/thehubbleproject/hubble-contracts/blob/master/audits/2021-03-17%20Igor%20Gulamov.md)
+
+## 2022
+
+[BLS Wallet](./Sigma_Prime_-_Ethereum_Foundation_-_BLS_Wallet_Smart_Contract_Security_Assessment_Report_-_v1.0.pdf)
+
+All critical & high issues were addressed, but re-audit was not conducted.

contracts/clients/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bls-wallet-clients",
-  "version": "0.9.0-2a20bfe",
+  "version": "0.9.0",
   "description": "Client libraries for interacting with BLS Wallet components",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

contracts/contracts/AddressRegistry.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/AggregatorUtilities.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/BLSExpanderDelegator.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/BLSPublicKeyRegistry.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/BLSRegistration.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/BLSWallet.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/ERC20Expander.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/ExpanderEntryPoint.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/FallbackExpander.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/VerificationGateway.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4 <0.9.0;
 pragma abicoder v2;
 
@@ -157,21 +157,17 @@ contract VerificationGateway
     @dev overrides previous wallet address registered with the given public key
     @param messageSenderSignature signature of message containing only the calling address
     @param publicKey that signed the caller's address
-    @param signatureExpiryTimestamp that the signature is valid until
      */
     function setBLSKeyForWallet(
         uint256[2] memory messageSenderSignature,
-        uint256[BLS_KEY_LEN] memory publicKey,
-        uint256 signatureExpiryTimestamp
+        uint256[BLS_KEY_LEN] memory publicKey
     ) public {
         require(blsLib.isZeroBLSKey(publicKey) == false, "VG: key is zero");
         IWallet wallet = IWallet(msg.sender);
         bytes32 existingHash = hashFromWallet[wallet];
-        if (existingHash == bytes32(0)) { // wallet does not yet have a bls key registered with this gateway
-            // set it instantly
-            safeSetWallet(messageSenderSignature, publicKey, wallet, signatureExpiryTimestamp);
-        }
-        else { // wallet already has a key registered, set after delay
+
+        // Can't register new wallet contracts, only what this gateway deployed.
+        if (existingHash != bytes32(0)) { // wallet already has a key registered, set after delay
             pendingMessageSenderSignatureFromHash[existingHash] = messageSenderSignature;
             pendingBLSPublicKeyFromHash[existingHash] = publicKey;
             pendingBLSPublicKeyTimeFromHash[existingHash] = block.timestamp + 604800; // 1 week from now
@@ -235,6 +231,11 @@ contract VerificationGateway
             }
         }
 
+        require((selectorId != ProxyAdmin.upgrade.selector)
+            && (selectorId != ProxyAdmin.upgradeAndCall.selector),
+            "VG: wallet not upgradable"
+        );
+
         wallet.setAnyPending();
 
         // ensure wallet has pre-approved encodedFunction

contracts/contracts/interfaces/IExpander.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/interfaces/IWallet.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/lib/PseudoFloat.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/lib/RegIndex.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.15;
 
 import "./VLQ.sol";

contracts/contracts/lib/VLQ.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 pragma abicoder v2;
 

contracts/contracts/mock/MockWalletUpgraded.sol

@@ -1,4 +1,4 @@
-//SPDX-License-Identifier: Unlicense
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4 <0.9.0;
 pragma abicoder v2;
 

contracts/test/recovery-test.ts

@@ -95,7 +95,7 @@ describe("Recovery", async function () {
       wallet1,
       vg,
       "setBLSKeyForWallet",
-      [addressSignature, wallet2.PublicKey(), signatureExpiryTimestamp],
+      [addressSignature, wallet2.PublicKey()],
       1,
       30_000_000,
     );
@@ -372,7 +372,7 @@ describe("Recovery", async function () {
       wallet1,
       vg,
       "setBLSKeyForWallet",
-      [attackSignature, walletAttacker.PublicKey(), signatureExpiryTimestamp],
+      [attackSignature, walletAttacker.PublicKey()],
       recoveredWalletNonce++,
       30_000_000,
     );
@@ -660,7 +660,7 @@ describe("Recovery", async function () {
       wallet1,
       vg,
       "setBLSKeyForWallet",
-      [addressSignature, wallet2.PublicKey(), invalidSignatureExpiryTimestamp],
+      [addressSignature, wallet2.PublicKey()],
       1,
       30_000_000,
     );
@@ -724,7 +724,7 @@ describe("Recovery", async function () {
       wallet1,
       vg,
       "setBLSKeyForWallet",
-      [addressSignature, wallet2.PublicKey(), signatureExpiryTimestamp],
+      [addressSignature, wallet2.PublicKey()],
       1,
       30_000_000,
     );

contracts/test/upgrade-test.ts

@@ -1,21 +1,13 @@
 import { expect } from "chai";
 import { BigNumber, ContractReceipt } from "ethers";
 import { solidityPack } from "ethers/lib/utils";
-import { ethers, network } from "hardhat";
+import { ethers } from "hardhat";
 
 import { expectPubkeysEql } from "./expect";
-import {
-  ActionData,
-  BlsWalletWrapper,
-  getOperationResults,
-} from "../clients/src";
+import { ActionData, getOperationResults } from "../clients/src";
 import Fixture from "../shared/helpers/Fixture";
-import {
-  proxyAdminBundle,
-  proxyAdminCall,
-} from "../shared/helpers/callProxyAdmin";
+import { proxyAdminCall } from "../shared/helpers/callProxyAdmin";
 import getPublicKeyFromHash from "../shared/helpers/getPublicKeyFromHash";
-import deploy from "../shared/deploy";
 
 const expectOperationsToSucceed = (txnReceipt: ContractReceipt) => {
   const opResults = getOperationResults(txnReceipt);
@@ -44,7 +36,7 @@ describe("Upgrade", async function () {
     fx = await Fixture.getSingleton();
   });
 
-  it("should upgrade wallet contract", async () => {
+  it("should NOT upgrade wallet contract", async () => {
     const MockWalletUpgraded = await ethers.getContractFactory(
       "MockWalletUpgraded",
     );
@@ -57,243 +49,19 @@ describe("Upgrade", async function () {
       wallet.address,
       mockWalletUpgraded.address,
     ]);
-    expectOperationsToSucceed(txnReceipt1);
-
-    // Advance time one week
-    const latestTimestamp = (await ethers.provider.getBlock("latest"))
-      .timestamp;
-    await network.provider.send("evm_setNextBlockTimestamp", [
-      BigNumber.from(latestTimestamp)
-        .add(safetyDelaySeconds + 1)
-        .toHexString(),
-    ]);
+    expectOperationFailure(txnReceipt1, "VG: wallet not upgradable");
 
     // make call
-    const txnReceipt2 = await proxyAdminCall(fx, wallet, "upgrade", [
+    const txnReceipt2 = await proxyAdminCall(fx, wallet, "upgradeAndCall", [
       wallet.address,
       mockWalletUpgraded.address,
+      [],
     ]);
-    expectOperationsToSucceed(txnReceipt2);
-
-    const newBLSWallet = MockWalletUpgraded.attach(wallet.address);
-    await (await newBLSWallet.setNewData(wallet.address)).wait();
-    await expect(newBLSWallet.newData()).to.eventually.equal(wallet.address);
+    expectOperationFailure(txnReceipt2, "VG: wallet not upgradable");
   });
 
   it("should register with new verification gateway", async () => {
-    // Deploy new verification gateway
-
-    const [signer] = await ethers.getSigners();
-
-    const deployment2 = await deploy(
-      signer,
-      ethers.utils.solidityPack(["uint256"], [2]),
-    );
-
-    const vg2 = deployment2.verificationGateway;
-
-    // Recreate hubble bls signer
-    const walletOldVg = await fx.createBLSWallet();
-    const walletAddress = walletOldVg.address;
-    const blsSecret = walletOldVg.blsWalletSigner.privateKey;
-
-    // Sign simple address message
-    const walletNewVg = await BlsWalletWrapper.connect(
-      blsSecret,
-      vg2.address,
-      vg2.provider,
-    );
-
-    const signatureExpiryTimestamp =
-      (await fx.provider.getBlock("latest")).timestamp +
-      safetyDelaySeconds +
-      signatureExpiryOffsetSeconds;
-    const addressMessage = solidityPack(
-      ["address", "uint256"],
-      [walletAddress, signatureExpiryTimestamp],
-    );
-    const addressSignature = walletNewVg.signMessage(addressMessage);
-
-    const proxyAdmin2Address = await vg2.walletProxyAdmin();
-    // Get admin action to change proxy
-    const bundle = await proxyAdminBundle(fx, walletOldVg, "changeProxyAdmin", [
-      walletAddress,
-      proxyAdmin2Address,
-    ]);
-    const changeProxyAction = bundle.operations[0].actions[0];
-
-    // prepare call
-    const txnReceipt = await proxyAdminCall(
-      fx,
-      walletOldVg,
-      "changeProxyAdmin",
-      [walletAddress, proxyAdmin2Address],
-    );
-    expectOperationsToSucceed(txnReceipt);
-
-    // Advance time one week
-    await fx.advanceTimeBy(safetyDelaySeconds + 1);
-
-    const hash = walletOldVg.blsWalletSigner.getPublicKeyHash();
-
-    const setExternalWalletAction: ActionData = {
-      ethValue: BigNumber.from(0),
-      contractAddress: vg2.address,
-      encodedFunction: vg2.interface.encodeFunctionData("setBLSKeyForWallet", [
-        addressSignature,
-        walletOldVg.PublicKey(),
-        signatureExpiryTimestamp,
-      ]),
-    };
-
-    const setTrustedBLSGatewayAction: ActionData = {
-      ethValue: BigNumber.from(0),
-      contractAddress: fx.verificationGateway.address,
-      encodedFunction: fx.verificationGateway.interface.encodeFunctionData(
-        "setTrustedBLSGateway",
-        [hash, vg2.address],
-      ),
-    };
-
-    // Upgrading the gateway requires these three steps:
-    //  1. register external wallet in vg2
-    //  2. change proxy admin to that in vg2
-    //  3. lastly, set wallet's new trusted gateway
-    //
-    // If (1) or (2) are skipped, then (3) should fail, and therefore the whole
-    // operation should fail.
-
-    {
-      // Fail if setExternalWalletAction is skipped
-
-      const { successes } =
-        await fx.verificationGateway.callStatic.processBundle(
-          walletOldVg.sign({
-            nonce: BigNumber.from(1),
-            gas: BigNumber.from(30_000_000),
-            actions: [
-              // skip: setExternalWalletAction,
-              changeProxyAction,
-              setTrustedBLSGatewayAction,
-            ],
-          }),
-        );
-
-      expect(successes).to.deep.equal([false]);
-    }
-
-    {
-      // Fail if changeProxyAction is skipped
-
-      const { successes } =
-        await fx.verificationGateway.callStatic.processBundle(
-          walletOldVg.sign({
-            nonce: BigNumber.from(1),
-            gas: BigNumber.from(30_000_000),
-            actions: [
-              setExternalWalletAction,
-              // skip: changeProxyAction,
-              setTrustedBLSGatewayAction,
-            ],
-          }),
-        );
-
-      expect(successes).to.deep.equal([false]);
-    }
-
-    {
-      // Succeed if nothing is skipped
-
-      const { successes } =
-        await fx.verificationGateway.callStatic.processBundle(
-          walletOldVg.sign({
-            nonce: BigNumber.from(1),
-            gas: BigNumber.from(30_000_000),
-            actions: [
-              setExternalWalletAction,
-              changeProxyAction,
-              setTrustedBLSGatewayAction,
-            ],
-          }),
-        );
-
-      expect(successes).to.deep.equal([true]);
-    }
-
-    await expect(vg2.walletFromHash(hash)).to.eventually.not.equal(
-      walletAddress,
-    );
-
-    // Now actually perform the upgrade so we can perform some more detailed
-    // checks.
-    await fx.processBundleWithExtraGas(
-      walletOldVg.sign({
-        nonce: BigNumber.from(1),
-        gas: BigNumber.from(30_000_000),
-        actions: [
-          setExternalWalletAction,
-          changeProxyAction,
-          setTrustedBLSGatewayAction,
-        ],
-      }),
-    );
-
-    // Create required objects for data/contracts for checks
-    const proxyAdmin = await ethers.getContractAt(
-      "ProxyAdmin",
-      await vg2.walletProxyAdmin(),
-    );
-
-    // Direct checks corresponding to each action
-    await expect(vg2.walletFromHash(hash)).to.eventually.equal(walletAddress);
-    await expect(vg2.hashFromWallet(walletAddress)).to.eventually.equal(hash);
-    await expect(proxyAdmin.getProxyAdmin(walletAddress)).to.eventually.equal(
-      proxyAdmin.address,
-    );
-    expectPubkeysEql(
-      await getPublicKeyFromHash(vg2, hash),
-      walletOldVg.PublicKey(),
-    );
-
-    const blsWallet = await ethers.getContractAt("BLSWallet", walletAddress);
-    // New verification gateway pending
-    await expect(blsWallet.trustedBLSGateway()).to.eventually.equal(
-      fx.verificationGateway.address,
-    );
-    // Advance time one week
-    await fx.advanceTimeBy(safetyDelaySeconds + 1);
-    // set pending
-    await (await blsWallet.setAnyPending()).wait();
-    // Check new verification gateway was set
-    await expect(blsWallet.trustedBLSGateway()).to.eventually.equal(
-      vg2.address,
-    );
-
-    await walletNewVg.syncWallet(vg2);
-    // Check new gateway has wallet via static call through new gateway
-    const bundleResult = await vg2.callStatic.processBundle(
-      fx.blsWalletSigner.aggregate([
-        walletNewVg.sign({
-          nonce: BigNumber.from(2),
-          gas: BigNumber.from(30_000_000),
-          actions: [
-            {
-              ethValue: 0,
-              contractAddress: vg2.address,
-              encodedFunction: vg2.interface.encodeFunctionData(
-                "walletFromHash",
-                [hash],
-              ),
-            },
-          ],
-        }),
-      ]),
-    );
-    const walletFromHashAddress = ethers.utils.defaultAbiCoder.decode(
-      ["address"],
-      bundleResult.results[0][0], // first and only operation/action result
-    )[0];
-    expect(walletFromHashAddress).to.equal(walletAddress);
+    // Still possible to point wallets to a new gateway if desired, just not with v1 deployment
   });
 
   it("should change mapping of an address to hash", async () => {
@@ -347,7 +115,6 @@ describe("Upgrade", async function () {
       encodedFunction: vg1.interface.encodeFunctionData("setBLSKeyForWallet", [
         addressSignature,
         wallet2.PublicKey(),
-        signatureExpiryTimestamp,
       ]),
     };
 

extension/package.json

@@ -37,7 +37,7 @@
     "assert-browserify": "^2.0.0",
     "async-mutex": "^0.3.2",
     "axios": "^0.27.2",
-    "bls-wallet-clients": "0.9.0-2a20bfe",
+    "bls-wallet-clients": "0.9.0-405e23a",
     "browser-passworder": "^2.0.3",
     "bs58check": "^2.1.2",
     "crypto-browserify": "^3.12.0",

extension/yarn.lock

@@ -1791,16 +1791,6 @@
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b"
   integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==
-  dependencies:
-    "@ethersproject/address" "^5.7.0"
-    "@ethersproject/bignumber" "^5.7.0"
-    "@ethersproject/bytes" "^5.7.0"
-    "@ethersproject/constants" "^5.7.0"
-    "@ethersproject/keccak256" "^5.7.0"
-    "@ethersproject/logger" "^5.7.0"
-    "@ethersproject/properties" "^5.7.0"
-    "@ethersproject/rlp" "^5.7.0"
-    "@ethersproject/signing-key" "^5.7.0"
 
 "@ethersproject/transactions@^5.5.0", "@ethersproject/transactions@^5.6.2":
   version "5.6.2"
@@ -2898,10 +2888,10 @@ blakejs@^1.1.0:
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814"
   integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==
 
-bls-wallet-clients@0.9.0-2a20bfe:
-  version "0.9.0-2a20bfe"
-  resolved "https://registry.yarnpkg.com/bls-wallet-clients/-/bls-wallet-clients-0.9.0-2a20bfe.tgz#2e39757a18df3ba78d816ae15f6b88000443a2a6"
-  integrity sha512-w4efcArPBEowrAkIdVYc2mOLlkN8E5O9eIqEhoo6IrRVrN21p/JVNdoot4N3o5MAKFbeaYfid/u9lL6p2DNdiw==
+bls-wallet-clients@0.9.0-405e23a:
+  version "0.9.0-405e23a"
+  resolved "https://registry.npmjs.org/bls-wallet-clients/-/bls-wallet-clients-0.9.0-405e23a.tgz#b66121f9ec0cb4e821965606ada203e6601b773d"
+  integrity sha512-cMm6pq35VU30veCAHt6ArSavlqzXu+olQg+dzUH28fvqSeQsfWz2qiuBekGxSWOCfn8gX1j/8jHEhrGxXS509Q==
   dependencies:
     "@thehubbleproject/bls" "^0.5.1"
     ethers "^5.7.2"