bls-wallet-clients - npm Package Compare versions

Comparing version 0.8.2-d39c16b to 0.8.2-f1af837

package.json

 {
   "name": "bls-wallet-clients",
-  "version": "0.8.2-d39c16b",
+  "version": "0.8.2-f1af837",
   "description": "Client libraries for interacting with BLS Wallet components",
@@ -5,0 +5,0 @@ "main": "dist/src/index.js",

src/Aggregator.ts

 import nodeFetch from "node-fetch";
-import { ContractReceipt } from "ethers";
 import { Bundle, bundleToDto } from "./signer";
@@ -42,15 +41,11 @@
 
-/**
- * The BLS Wallet specific values in a {@link BundleReceipt}.
- */
-export type BlsBundleReceipt = {
+export type BundleReceipt = {
+  transactionIndex: number;
+  transactionHash: string;
   bundleHash: string;
+  blockHash: string;
+  blockNumber: number;
 };
 
 /**
- * The bundle receipt returned from a BLS Wallet Aggregator instance. It is a combination of an ethers {@link ContractReceipt} and a {@link BlsBundleReceipt} type.
- */
-export type BundleReceipt = ContractReceipt & BlsBundleReceipt;
-
-/**
  * Client used to interact with a BLS Wallet Aggregator instance
@@ -57,0 +52,0 @@ */

src/BlsProvider.ts

@@ -147,22 +147,21 @@ import { ethers, BigNumber } from "ethers";
 
+    // TODO: bls-wallet #412 Update values returned in bundle receipt to more closely match ethers transaction response
     return {
-      to: bundleReceipt.to,
-      from: bundleReceipt.from,
-      contractAddress: bundleReceipt.contractAddress,
-      transactionIndex: bundleReceipt.transactionIndex,
-      root: bundleReceipt.root,
-      gasUsed: bundleReceipt.gasUsed,
-      logsBloom: bundleReceipt.logsBloom,
+      to: "0x",
+      from: "0x",
+      contractAddress: "0x",
+      transactionIndex: parseInt(bundleReceipt.transactionIndex),
+      gasUsed: parseEther("0"),
+      logsBloom: "",
       blockHash: bundleReceipt.blockHash,
       transactionHash: bundleReceipt.transactionHash,
-      logs: bundleReceipt.logs,
-      blockNumber: bundleReceipt.blockNumber,
-      confirmations: bundleReceipt.confirmations ?? confirmations,
-      cumulativeGasUsed: bundleReceipt.effectiveGasPrice,
-      effectiveGasPrice: bundleReceipt.effectiveGasPrice,
-      byzantium: bundleReceipt.byzantium,
-      type: bundleReceipt.type,
-      status: bundleReceipt.status,
+      logs: [],
+      blockNumber: parseInt(bundleReceipt.blockNumber),
+      confirmations,
+      cumulativeGasUsed: parseEther("0"),
+      effectiveGasPrice: parseEther("0"),
+      byzantium: false,
+      type: 2,
     };
   }
 }

src/BlsSigner.ts

@@ -125,2 +125,3 @@ import { ethers, BigNumber, Signer, Bytes } from "ethers";
 
+    // TODO: bls-wallet #412 Update values returned in bundle receipt to more closely match ethers transaction response
     return {
@@ -127,0 +128,0 @@ hash,

src/BlsWalletWrapper.ts

@@ -256,2 +256,68 @@ /* eslint-disable camelcase */
 
+  async getBundleSetRecovery(
+    salt: string,
+    recoverWalletAddress: string,
+  ): Promise<Bundle> {
+    const saltBytes32String = BlsWalletWrapper.saltToBytes32String(salt);
+    const walletHash = this.blsWalletSigner.getPublicKeyHash(this.privateKey);
+    const recoveryHash = ethers.utils.solidityKeccak256(
+      ["address", "bytes32", "bytes32"],
+      [recoverWalletAddress, walletHash, saltBytes32String],
+    );
+
+    return this.sign({
+      nonce: await this.Nonce(),
+      actions: [
+        {
+          ethValue: 0,
+          contractAddress: this.walletContract.address,
+          encodedFunction: this.walletContract.interface.encodeFunctionData(
+            "setRecoveryHash",
+            [recoveryHash],
+          ),
+        },
+      ],
+    });
+  }
+
+  async getBundleRecoverWallet(
+    recoveryAddress: string,
+    newPrivateKey: string,
+    recoverySalt: string,
+    verificationGateway: VerificationGateway,
+  ): Promise<Bundle> {
+    const updatedWallet = await BlsWalletWrapper.connect(
+      newPrivateKey,
+      verificationGateway.address,
+      verificationGateway.provider,
+    );
+    const addressMessage = solidityPack(["address"], [recoveryAddress]);
+    const addressSignature = updatedWallet.signMessage(addressMessage);
+
+    const recoveryWalletHash = await verificationGateway.hashFromWallet(
+      recoveryAddress,
+    );
+    const saltBytes32String =
+      BlsWalletWrapper.saltToBytes32String(recoverySalt);
+
+    return this.sign({
+      nonce: await this.Nonce(),
+      actions: [
+        {
+          ethValue: 0,
+          contractAddress: verificationGateway.address,
+          encodedFunction: verificationGateway.interface.encodeFunctionData(
+            "recoverWallet",
+            [
+              addressSignature,
+              recoveryWalletHash,
+              saltBytes32String,
+              updatedWallet.PublicKey(),
+            ],
+          ),
+        },
+      ],
+    });
+  }
+
   static async #BlsWalletSigner(
@@ -320,2 +386,10 @@ signerOrProvider: SignerOrProvider,
   }
+
+  private static saltToBytes32String(salt: string): string {
+    try {
+      return ethers.utils.formatBytes32String(salt);
+    } catch (e) {
+      throw new Error("Error convirting salt string to bytes 32 string.");
+    }
+  }
 }

src/signer/index.ts

@@ -12,2 +12,3 @@ import { signer } from "@thehubbleproject/bls";
 import verify from "./verify";
+import getRandomPrivateKey from "./getRandomPrivateKey";
 
@@ -42,3 +43,4 @@ export * from "./types";
     verify: verify(domain, chainId),
+    getRandomPrivateKey,
   };
 }

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Number of low supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

58455

decreased by-95.84%

Number of package files

30

decreased by-95.01%

Lines of code

1538

decreased by-91.02%

No dependency changes