diff --git a/e2e-nodejs/group-lit-actions/test-lit-action-2-sigs.mjs b/e2e-nodejs/group-lit-actions/test-lit-action-2-sigs.mjs index b7e5388073..0a11d40014 100644 --- a/e2e-nodejs/group-lit-actions/test-lit-action-2-sigs.mjs +++ b/e2e-nodejs/group-lit-actions/test-lit-action-2-sigs.mjs @@ -13,8 +13,6 @@ export async function main() { const res = await client.executeJs({ authSig: globalThis.LitCI.CONTROLLER_AUTHSIG, code: `(async () => { - console.log('hello world') - async function signMultipleSigs(numSigs, toSign, publicKey) { const sigShares = []; for(let i = 0; i < numSigs; i++) { diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 069bbe4f98..5a89e832df 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -7,7 +7,7 @@ import { AuthMethod } from '@lit-protocol/types'; let CID: any; try { CID = require('multiformats/cid'); -} catch (e) {} +} catch (e) { } // ----- autogen:import-data:start ----- // Generated at 2023-11-07T01:50:52.460Z @@ -659,7 +659,7 @@ export class LitContracts { // Fetch contract data const [activeValidators, currentValidatorsCount, kickedValidators] = await Promise.all([ - contract['getValidatorsStructsInCurrentEpoch'](), + contract['getValidatorsInCurrentEpoch'](), contract['currentValidatorCountForConsensus'](), contract['getKickedValidators'](), ]); @@ -684,10 +684,12 @@ export class LitContracts { // remove kicked validators in active validators const cleanedActiveValidators = activeValidators.filter( (av: any) => - !kickedValidators.some((kv: any) => kv.nodeAddress === av.nodeAddress) + !kickedValidators.some((kv: any) => kv === av) ); - const networks = cleanedActiveValidators.map((item: any) => { + const activeValidatorStructs = await contract['getValidatorsStructs'](cleanedActiveValidators); + + const networks = activeValidatorStructs.map((item: any) => { let proto = 'https://'; if (item.port !== 443) { proto = 'http://'; diff --git a/packages/core/src/lib/lit-core.ts b/packages/core/src/lib/lit-core.ts index 182fa96df9..1b10c090ab 100644 --- a/packages/core/src/lib/lit-core.ts +++ b/packages/core/src/lib/lit-core.ts @@ -357,7 +357,7 @@ export class LitCore { const promise = new Promise((resolve: any, reject: any) => { const startTime = Date.now(); const interval = setInterval(() => { - if (Object.keys(this.serverKeys).length >= this.config.minNodeCount) { + if (Object.keys(this.serverKeys).length == this.config.bootstrapUrls.length) { clearInterval(interval); // pick the most common public keys for the subnet and network from the bunch, in case some evil node returned a bad key @@ -413,13 +413,10 @@ export class LitCore { const now = Date.now(); if (now - startTime > this.config.connectTimeout) { clearInterval(interval); - const msg = `Error: Could not connect to enough nodes after timeout of ${ - this.config.connectTimeout - }ms. Could only connect to ${ - Object.keys(this.serverKeys).length - } of ${ - this.config.minNodeCount - } required nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`; + const msg = `Error: Could not connect to enough nodes after timeout of ${this.config.connectTimeout + }ms. Could only connect to ${Object.keys(this.serverKeys).length + } of ${this.config.minNodeCount + } required nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`; logErrorWithRequestId(requestId, msg); reject(msg); } @@ -538,10 +535,9 @@ export class LitCore { .catch((error: NodeErrorV3) => { logErrorWithRequestId( requestId, - `Something went wrong, internal id for request: lit_${requestId}. Please provide this identifier with any support requests. ${ - error?.message || error?.details - ? `Error is ${error.message} - ${error.details}` - : '' + `Something went wrong, internal id for request: lit_${requestId}. Please provide this identifier with any support requests. ${error?.message || error?.details + ? `Error is ${error.message} - ${error.details}` + : '' }` ); return Promise.reject(error);