Merge branch 'staging/v7' into feature/lit-3918-no-globalthis-variables-anymore

Signed-off-by: Anson <[email protected]>

Author: Ansonhkg

local-tests/tests/testDelegatingCapacityCreditsNFTToAnotherPkpToExecuteJs.ts

@@ -39,7 +39,7 @@ export const testDelegatingCapacityCreditsNFTToAnotherPkpToExecuteJs = async (
 
   // As a dApp owner, create a capacity delegation authSig for Bob's PKP wallet
   const capacityDelegationAuthSig = await alice.createCapacityDelegationAuthSig(
-    [bob.pkp.ethAddress]
+    [bob.authMethodOwnedPkp.ethAddress]
   );
 
   // As a dApp owner, delegate the capacity credits NFT to Bob

local-tests/tests/wrapped-keys/testGenerateSolanaWrappedKey.ts

@@ -2,9 +2,9 @@ import { log } from '@lit-protocol/misc';
 import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
 import { api } from '@lit-protocol/wrapped-keys';
 import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
-import nacl from 'tweetnacl';
-import bs58 from 'bs58';
 import { Keypair } from '@solana/web3.js';
+import { ethers } from 'ethers';
+import nacl from 'tweetnacl';
 
 const { generatePrivateKey, signMessageWithEncryptedKey, exportPrivateKey } =
   api;
@@ -68,8 +68,8 @@ export const testGenerateSolanaWrappedKey = async (
 
     const signatureIsValidForPublicKey = nacl.sign.detached.verify(
       Buffer.from(messageToSign),
-      bs58.decode(signature),
-      bs58.decode(generatedPublicKey)
+      ethers.utils.base58.decode(signature),
+      ethers.utils.base58.decode(generatedPublicKey)
     );
 
     if (!signatureIsValidForPublicKey)

local-tests/tests/wrapped-keys/testSignMessageWithSolanaEncryptedKey.ts

@@ -2,7 +2,7 @@ import { log } from '@lit-protocol/misc';
 import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
 import { api } from '@lit-protocol/wrapped-keys';
 import { Keypair } from '@solana/web3.js';
-import bs58 from 'bs58';
+import { ethers } from 'ethers';
 import nacl from 'tweetnacl';
 import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
 
@@ -68,7 +68,7 @@ export const testSignMessageWithSolanaEncryptedKey = async (
 
     const signatureIsValidForPublicKey = nacl.sign.detached.verify(
       Buffer.from(messageToSign),
-      bs58.decode(signature),
+      ethers.utils.base58.decode(signature),
       solanaKeypair.publicKey.toBuffer()
     );
 

package.json

@@ -42,8 +42,8 @@
     "@dotenvx/dotenvx": "^1.6.4",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@lit-protocol/contracts": "^0.0.63",
     "@lit-protocol/accs-schemas": "^0.0.12",
+    "@lit-protocol/contracts": "^0.0.63",
     "@metamask/eth-sig-util": "5.0.2",
     "@mysten/sui.js": "^0.37.1",
     "@openagenda/verror": "^3.1.4",
@@ -57,7 +57,6 @@
     "ajv": "^8.12.0",
     "base64url": "^3.0.1",
     "bech32": "^2.0.0",
-    "bs58": "^5.0.0",
     "cbor-web": "^9.0.2",
     "cross-fetch": "3.1.8",
     "date-and-time": "^2.4.1",
@@ -98,11 +97,11 @@
     "buffer": "^6.0.3",
     "chalk": "^5.3.0",
     "cypress": "11.0.1",
-    "esbuild-node-externals": "^1.14.0",
     "cypress-metamask": "^1.0.5-development",
     "cypress-metamask-v2": "^1.7.2",
     "esbuild": "^0.17.3",
     "esbuild-node-builtins": "^0.1.0",
+    "esbuild-node-externals": "^1.14.0",
     "esbuild-plugin-tsc": "^0.4.0",
     "eslint": "8.48.0",
     "eslint-config-next": "12.2.3",

packages/contracts-sdk/package.json

@@ -18,7 +18,6 @@
     "directory": "../../dist/packages/contracts-sdk"
   },
   "peerDependencies": {
-    "bs58": "^5.0.0",
     "date-and-time": "^2.4.1",
     "multiformats": "^9.7.1"
   },

packages/contracts-sdk/src/lib/contracts-sdk.ts

@@ -14,7 +14,6 @@ import {
   MintWithAuthParams,
   MintWithAuthResponse,
 } from '@lit-protocol/types';
-import bs58 from 'bs58';
 import { BigNumberish, BytesLike, ContractReceipt, ethers } from 'ethers';
 import { decToHex, hexToDec, intToIP } from './hex2dec';
 
@@ -1708,7 +1707,7 @@ https://developer.litprotocol.com/v3/sdk/wallets/auth-methods/#auth-method-scope
      * @returns {string}
      */
     getBytesFromMultihash: (multihash: string) => {
-      const decoded = bs58.decode(multihash);
+      const decoded = ethers.utils.base58.decode(multihash);
 
       return `0x${Buffer.from(decoded).toString('hex')}`;
     },
@@ -1726,7 +1725,9 @@ https://developer.litprotocol.com/v3/sdk/wallets/auth-methods/#auth-method-scope
       const digestSize = parseInt(text.slice(2, 4), 16);
       const digest = text.slice(4, 4 + digestSize * 2);
 
-      const multihash = bs58.encode(Buffer.from(`1220${digest}`, 'hex'));
+      const multihash = ethers.utils.base58.encode(
+        Buffer.from(`1220${digest}`, 'hex')
+      );
 
       return multihash;
     },

packages/core/src/lib/lit-core.ts

@@ -21,6 +21,7 @@ import {
   LIT_CURVE,
   LIT_CURVE_VALUES,
   LIT_ENDPOINT,
+  LIT_ERROR,
   LIT_ERROR_CODE,
   LIT_NETWORK,
   LIT_NETWORKS,
@@ -75,6 +76,7 @@ import {
 } from '@lit-protocol/types';
 
 import { composeLitUrl } from './endpoint-version';
+import { LogLevel } from '@lit-protocol/logger';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type Listener = (...args: any[]) => void;
@@ -198,9 +200,12 @@ export class LitCore {
     // -- set bootstrapUrls to match the network litNetwork unless it's set to custom
     this.setCustomBootstrapUrls();
 
-    // -- set misc global variables
-    setMiscLitConfig(this.config);
-    bootstrapLogManager('core');
+    // -- set global variables
+    globalThis.litConfig = this.config;
+    bootstrapLogManager(
+      'core',
+      this.config.debug ? LogLevel.DEBUG : LogLevel.OFF
+    );
 
     // -- configure local storage if not present
     // LitNodeClientNodejs is a base for LitNodeClient
@@ -672,7 +677,12 @@ export class LitCore {
             this.config.bootstrapUrls.length
           } nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`;
 
-          reject(new InitError({}, msg));
+          try {
+            throw new InitError({}, msg);
+          } catch (e) {
+            logErrorWithRequestId(requestId, e);
+            reject(e);
+          }
         }, this.config.connectTimeout);
       }),
       Promise.all(

packages/logger/src/lib/logger.spec.ts

@@ -111,6 +111,18 @@ describe('logger', () => {
     }
 
     expect(lm.getLogsForId('foo7').length).toEqual(count);
-    expect(lm.LoggerIds.size).toEqual(1);
+    expect(lm.LoggerIds.length).toEqual(10);
+  });
+
+  it('should order logs based on logger creation timestamp', async () => {
+    const loggerA = lm.get('a', '1');
+    await new Promise((res) => setTimeout(res, 100));
+    const loggerB = lm.get('b', '2');
+
+    const requestIds = lm.LoggerIds;
+
+    expect(requestIds.length).toBe(2);
+    expect(loggerA.timestamp).toEqual(requestIds[0]);
+    expect(loggerB.timestamp).toEqual(requestIds[1]);
   });
 });

packages/logger/src/lib/logger.ts

@@ -1,7 +1,16 @@
 import { version, LOG_LEVEL, LOG_LEVEL_VALUES } from '@lit-protocol/constants';
 import { hashMessage } from 'ethers/lib/utils';
 
-export { LOG_LEVEL };
+export enum LogLevel {
+  OFF = -1,
+  ERROR = 0,
+  INFO = 1,
+  DEBUG = 2,
+  WARN = 3,
+  FATAL = 4,
+  TIMING_START = 5,
+  TIMING_END = 6,
+}
 
 const colours = {
   reset: '\x1b[0m',
@@ -197,6 +206,7 @@ export class Logger {
   private _config: Record<string, any> | undefined;
   private _isParent: boolean;
   private _children: Map<string, Logger>;
+  private _timestamp: number;
 
   public static createLogger(
     category: string,
@@ -222,6 +232,7 @@ export class Logger {
     this._config = config;
     this._children = new Map();
     this._isParent = isParent;
+    this._timestamp = Date.now();
   }
 
   get id(): string {
@@ -232,6 +243,10 @@ export class Logger {
     return this._category;
   }
 
+  get timestamp(): number {
+    return this._timestamp;
+  }
+
   get Logs(): Log[] {
     return this._logs;
   }
@@ -305,14 +320,17 @@ export class Logger {
 
     const arrayLog = log.toArray();
     if (this._config?.['condenseLogs'] && !this._checkHash(log)) {
-      (this._level >= level || level === LOG_LEVEL.ERROR) &&
+      (this._level >= level || level === LogLevel.ERROR) &&
+        this._consoleHandler &&
         this._consoleHandler(...arrayLog);
       (this._level >= level || level === LOG_LEVEL.ERROR) &&
         this._handler &&
         this._handler(log);
-      (this._level >= level || level === LOG_LEVEL.ERROR) && this._addLog(log);
+
+      (this._level >= level || level === LogLevel.ERROR) && this._addLog(log);
     } else if (!this._config?.['condenseLogs']) {
-      (this._level >= level || level === LOG_LEVEL.ERROR) &&
+      (this._level >= level || level === LogLevel.ERROR) &&
+        this._consoleHandler &&
         this._consoleHandler(...arrayLog);
       (this._level >= level || level === LOG_LEVEL.ERROR) &&
         this._handler &&
@@ -336,7 +354,6 @@ export class Logger {
 
   private _addLog(log: Log) {
     this._logs.push(log);
-
     // TODO: currently we are not deleting old request id's which over time will fill local storage as the maximum storage size is 10mb
     // we should be deleting keys from the front of the collection of `Object.keys(category)` such that the first keys entered are deleted when we reach a pre defined key threshold
     // this implementation assumes that serialization / deserialization from `localStorage` keeps the same key ordering in each `category` object as we will asssume the array produced from `Object.keys` will always be the same ordering.
@@ -421,14 +438,20 @@ export class LogManager {
   }
 
   get LoggerIds(): string[] {
-    const keys: string[] = [];
+    const keys: [string, number][] = [];
     for (const category of this._loggers.entries()) {
       for (const child of category[1].Children) {
-        keys.push(child[0]);
+        keys.push([child[0], child[1].timestamp]);
       }
     }
 
-    return keys;
+    return keys
+      .sort((a: [string, number], b: [string, number]) => {
+        return a[1] - b[1];
+      })
+      .map((value: [string, number]) => {
+        return value[0];
+      });
   }
 
   // if a logger is given an id it will persist logs under its logger instance

packages/misc/src/lib/addresses.ts

@@ -5,7 +5,6 @@ import {
 } from '@lit-protocol/constants';
 import { TokenInfo } from '@lit-protocol/types';
 import { bech32 } from 'bech32';
-import bs58 from 'bs58';
 import { createHash } from 'crypto';
 import { Contract, ethers } from 'ethers';
 import { computeAddress } from 'ethers/lib/utils';
@@ -112,7 +111,7 @@ function deriveBitcoinAddress(ethPubKey: string): string {
   const binaryBitcoinAddress = Buffer.concat([versionedPayload, checksum]);
 
   // Encode the result with Base58 to get the final Bitcoin address and return it
-  return bs58.encode(binaryBitcoinAddress);
+  return ethers.utils.base58.encode(binaryBitcoinAddress);
 }
 
 /**