feat: import ethers to lit actions BUT making it external in esBuild config

Author: Ansonhkg

packages/wrapped-keys-lit-actions/esbuild.config.js

@@ -67,6 +67,7 @@ module.exports = {
         treeShaking: true,
         outdir: './src/generated/',
         inject: ['./buffer.shim.js'],
+        external: ['ethers'], 
         plugins: [wrapIIFEInStringPlugin],
         platform: 'browser',
       })

packages/wrapped-keys-lit-actions/global.d.ts

@@ -1,8 +1,5 @@
-import { ethers as EthersType } from 'ethers';
-
 // @ts-nocheck - got this directly from the lit-assets repo
 declare global {
-  export const ethers: typeof EthersType;
 
   export declare namespace Lit {
     export namespace Actions {
@@ -387,4 +384,4 @@ declare global {
   }
 }
 
-export {};
+export { };

packages/wrapped-keys-lit-actions/package.json

@@ -29,4 +29,4 @@
   "version": "6.10.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
-}
+}

packages/wrapped-keys-lit-actions/src/lib/internal/common/getDecryptedKeyToSingleNode.ts

@@ -4,7 +4,7 @@ import { AbortError } from '../../abortError';
 import { removeSaltFromDecryptedKey } from '../../utils';
 
 interface TryDecryptToSingleNodeParams {
-  accessControlConditions: any;
+  accessControlConditions: string
   ciphertext: string;
   dataToEncryptHash: string;
 }

packages/wrapped-keys-lit-actions/src/lib/internal/ethereum/generatePrivateKey.ts

@@ -1,4 +1,7 @@
-/* global ethers */
+/**
+ * The global ethers library (5.7.0) is available on Lit Action (Unbundled)
+ */
+import { ethers } from 'ethers';
 
 export function generateEthereumPrivateKey() {
   const wallet = ethers.Wallet.createRandom();

packages/wrapped-keys-lit-actions/src/lib/internal/ethereum/signMessage.ts

@@ -1,4 +1,7 @@
-/* global ethers */
+/**
+ * The global ethers library (5.7.0) is available on Lit Action (Unbundled)
+ */
+import { ethers } from 'ethers';
 
 interface SignMessageParams {
   privateKey: string;
@@ -20,7 +23,11 @@ async function signMessage({
 
     return { signature, walletAddress: wallet.address };
   } catch (err: unknown) {
-    throw new Error(`When signing message - ${(err as Error).message}`);
+    if (err instanceof Error) {
+      throw new Error(`When signing message - ${err.message}`);
+    } else {
+      throw new Error(`An unexpected error occurred: ${err}`);
+    }
   }
 }
 
@@ -32,8 +39,7 @@ function verifyMessageSignature({
     return ethers.utils.verifyMessage(messageToSign, signature);
   } catch (err: unknown) {
     throw new Error(
-      `When validating signed Ethereum message is valid: ${
-        (err as Error).message
+      `When validating signed Ethereum message is valid: ${(err as Error).message
       }`
     );
   }

packages/wrapped-keys-lit-actions/src/lib/internal/ethereum/signTransaction.ts

@@ -1,13 +1,20 @@
 /* global ethers, Lit */
 
-interface UnsignedTransaction {
+/**
+ * The global ethers library (5.7.0) is available on Lit Action (Unbundled)
+ */
+import { ethers } from 'ethers';
+
+// This is weird - ethers.UnsignedTransaction is not the same as the one being used here..
+export interface UnsignedTransaction {
   toAddress: string;
   chain: string;
   value: string;
   chainId: number;
   dataHex?: string;
   gasPrice?: string;
   gasLimit?: number;
+  serializedTransaction?: any;
 }
 
 export function getValidatedUnsignedTx(
@@ -81,7 +88,7 @@ async function getGasPrice({
   provider,
 }: {
   userProvidedGasPrice?: string;
-  provider: any;
+  provider: ethers.providers.JsonRpcProvider;
 }) {
   try {
     if (userProvidedGasPrice) {
@@ -99,7 +106,7 @@ async function getGasLimit({
   userProvidedGasLimit,
   validatedTx,
 }: {
-  provider: any;
+  provider: ethers.providers.JsonRpcProvider;
   userProvidedGasLimit?: number;
   validatedTx: any;
 }) {
@@ -132,7 +139,7 @@ async function broadcastTransaction({
   provider,
   signedTx,
 }: {
-  provider: any;
+  provider: ethers.providers.JsonRpcProvider;
   signedTx: string;
 }) {
   try {

packages/wrapped-keys-lit-actions/src/lib/internal/solana/signMessage.ts

@@ -2,7 +2,10 @@ import { Keypair } from '@solana/web3.js';
 import nacl from 'tweetnacl';
 import { Buffer } from 'buffer';
 
-/* global ethers */
+/**
+ * The global ethers library (5.7.0) is available on Lit Action (Unbundled)
+ */
+import { ethers } from 'ethers';
 
 interface SignMessageParams {
   messageToSign: string;
@@ -26,7 +29,11 @@ function signMessage({ messageToSign, solanaKeyPair }: SignMessageParams): {
 
     return { signature };
   } catch (err: unknown) {
-    throw new Error(`When signing message - ${(err as Error).message}`);
+    if (err instanceof Error) {
+      throw new Error(`When signing message - ${err.message}`);
+    } else {
+      throw new Error(`An unexpected error occurred: ${err}`);
+    }
   }
 }
 
@@ -45,8 +52,7 @@ function verifyMessageSignature({
     return isValid;
   } catch (err: unknown) {
     throw new Error(
-      `When validating signed Solana message is valid: ${
-        (err as Error).message
+      `When validating signed Solana message is valid: ${(err as Error).message
       }`
     );
   }

packages/wrapped-keys-lit-actions/src/lib/internal/solana/signTransaction.ts

@@ -6,12 +6,11 @@ import {
   Transaction,
 } from '@solana/web3.js';
 
-/* global ethers */
-
-interface UnsignedTransaction {
-  chain: string;
-  serializedTransaction: string;
-}
+/**
+ * The global ethers library (5.7.0) is available on Lit Action (Unbundled)
+ */
+import { ethers } from 'ethers';
+import { UnsignedTransaction } from '../ethereum/signTransaction';
 
 export function validateUnsignedTransaction(
   unsignedTransaction: UnsignedTransaction

packages/wrapped-keys-lit-actions/src/lib/raw-action-functions/common/batchGenerateEncryptedKeys.ts

@@ -19,7 +19,7 @@ async function processEthereumAction({
   accessControlConditions,
 }: {
   action: Action;
-  accessControlConditions: any;
+  accessControlConditions: string
 }) {
   const { network, generateKeyParams } = action;
   const messageToSign = action.signMessageParams?.messageToSign;
@@ -57,7 +57,7 @@ async function processSolanaAction({
   accessControlConditions,
 }: {
   action: Action;
-  accessControlConditions: any;
+  accessControlConditions: string
 }) {
   const { network, generateKeyParams } = action;
 
@@ -96,7 +96,7 @@ async function processActions({
   accessControlConditions,
 }: {
   actions: Action[];
-  accessControlConditions: any;
+  accessControlConditions: string
 }) {
   return Promise.all(
     actions.map(async (action, ndx) => {
@@ -161,7 +161,7 @@ export async function batchGenerateEncryptedKeys({
   accessControlConditions,
 }: {
   actions: Action[];
-  accessControlConditions: any;
+  accessControlConditions: string
 }) {
   validateParams(actions);