ci: change runner for e2e tests

.env.ci

@@ -1,3 +1,19 @@
-NETWORK=cayenne
+#Tinny ENV Vars
+MAX_ATTEMTPS=3
+NETWORK=localchain
 DEBUG=true
-MAX_ATTEMPTS=3
+WAIT_FOR_KEY_INTERVAL=3000
+TIME_TO_RELEASE_KEY=10000
+RUN_IN_BAND=true
+RUN_IN_BAND_INTERVAL=5000
+NO_SETUP=false
+USE_SHIVA=true
+NETWORK_CONFIG=./networkContext.json
+TEST_TIMEOUT=45000
+
+#Shiva Client ENV Vars
+STOP_TESTNET=false
+TESTNET_MANAGER_URL=http://0.0.0.0:8000
+USE_LIT_BINARIES=true
+LIT_NODE_BINARY_PATH=/usr/bin/lit_node
+LIT_ACTION_BINARY_PATH=/usr/bin/lit_actions

.github/workflows/ci.yml

@@ -3,52 +3,64 @@ on:
   push:
     branches:
       - master
+      - feature/**
   pull_request:
     branches:
       - master
       - staging/**
       - feat/**
       - feature/**
 jobs:
-  master:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'yarn'
-      - name: Install project dependencies
-        run: yarn --frozen-lockfile
-      - uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: 'master'
-      - name: Build
-        run: yarn build:dev
-      - name: Run Unit tests
-        run: yarn tools --test --unit
   e2e-connection:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
-      NETWORK: datil-dev
+      NETWORK: localchain
       DEBUG: true
       MAX_ATTEMPTS: 3
-      CHUNK_SIZE: 9
+      USE_SHIVA: true
+      STOP_TESTNET: true
+      TESTNET_MANAGER_URL: http://0.0.0.0:8000
+      USE_LIT_BINARIES: true
+      LIT_NODE_BINARY_PATH: /usr/bin/lit_node
+      LIT_ACTION_BINARY_PATH: /usr/bin/lit_actions
+      LIT_RPC_URL: http://127.0.0.1:8545
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - name: Checkout Lit Actions
+        uses: actions/checkout@v4
+        id: checkout
+        with: 
+          fetch-depth: 0
+          repository: LIT-Protocol/lit-assets
+          ref: datil-cherrypick-shiva-changes
+          token: ${{secrets.GH_PAT}}
+          path: ${{ github.workspace }}/lit-assets/
+          submodules: false
+          sparse-checkout: |
+           blockchain
+           rust/lit-node
+      - name: Check LA dir
+        run: ls -la ${{github.workspace}}/lit-assets
+      - name: Install LA Blockchain Dependencies
+        run: npm i
+        working-directory: ${{github.workspace}}/lit-assets/blockchain/contracts
+      - name: Docker login
+        id: login
+        run: docker login ghcr.io/ -u ${{secrets.GH_USER}} --password ${{secrets.GH_PAT}}
+      - name: Pull Shiva Container
+        id: shiva-pull
+        run: docker pull ghcr.io/lit-protocol/shiva:latest 
+      - name: Run Shiva Container
+        id: shiva-runner
+        run: docker run -d -m 12g -p 8000:8000 -p 8545:8545 -p 7470:7470 -p 7471:7471 -p 7472:7472 -p 7473:7473 -p 7474:7474 -p 7475:7475 -v ${{github.workspace}}/lit-assets:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH="b5cfe7489275dbed5e9098818d0bd441c8918903" -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:latest
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '18'
       - name: Install project dependencies
         run: yarn install
       - name: Build packages
@@ -58,4 +70,7 @@ jobs:
         run: cp .env.ci .env
       - name: Run End to End Tests
         if: steps.build.outputs.exit_code == 0
-        run: yarn test:local --filter=testUseEoaSessionSigsToExecuteJsSigning,testUseEoaSessionSigsToPkpSign,testUsePkpSessionSigsToExecuteJsSigning,testUsePkpSessionSigsToPkpSign,testUseValidLitActionCodeGeneratedSessionSigsToPkpSign,testUseValidLitActionCodeGeneratedSessionSigsToExecuteJsSigning,testDelegatingCapacityCreditsNFTToAnotherWalletToExecuteJs,testEthAuthSigToEncryptDecryptString,testExecuteJsSignAndCombineEcdsa,testExecutJsDecryptAndCombine,testExecuteJsBroadcastAndCollect --exclude=Parallel
+        run: docker ps -a && yarn test:local --filter=testUseEoaSessionSigsToExecuteJsSigning
+      - name: Get Container Logs
+        if: always()
+        run: docker logs shiva

local-tests/setup/shiva-client.ts

@@ -1,4 +1,7 @@
-import { LitContractResolverContext } from '@lit-protocol/types';
+import {
+  LitContractContext,
+  LitContractResolverContext,
+} from '@lit-protocol/types';
 import { ethers } from 'ethers';
 import {
   TestNetCreateRequest,
@@ -89,6 +92,7 @@ export class TestnetClient {
     const contractResolverAbi: string = testNetConfig.contractResolverAbi;
     const contractResolverAddress =
       testNetConfig.contractAddresses[`contractResolver`];
+
     const networkContext = {
       abi: JSON.parse(contractResolverAbi),
       resolverAddress: contractResolverAddress,
@@ -97,6 +101,7 @@ export class TestnetClient {
       ),
       environment: 0, // test deployment uses env value 0 in test common
     };
+
     return networkContext;
   }
 
@@ -135,7 +140,10 @@ export class TestnetClient {
         this._id
     );
 
-    return _processTestnetResponse<boolean>(res);
+    let testnetInfoRes = await _processTestnetResponse<TestNetInfo>(res);
+    this._info = testnetInfoRes.body;
+
+    return testnetInfoRes;
   }
 
   /**
@@ -209,9 +217,20 @@ export class ShivaClient {
   async startTestnetManager(
     createReq?: TestNetCreateRequest
   ): Promise<TestnetClient> {
-    const existingTestnetResp = await fetch(
-      this.processEnvs.TESTNET_MANAGER_URL + '/test/get/testnets'
-    );
+    let existingTestnetResp = undefined;
+    let retryCount = 0;
+    while (!existingTestnetResp && retryCount < 200) {
+      try {
+        existingTestnetResp = await fetch(
+          this.processEnvs.TESTNET_MANAGER_URL + '/test/get/testnets',
+        );
+      } catch (e) {
+        console.error('error while fetching testnets: ', e);
+        retryCount += 1;
+        await new Promise((res) => setTimeout(res, 1000));
+      }
+    }
+
     const existingTestnets: string[] = await existingTestnetResp.json();
     if (existingTestnets.length > 0) {
       this._clients.set(

local-tests/setup/tinny-environment.ts

@@ -9,6 +9,7 @@ import { LitContracts } from '@lit-protocol/contracts-sdk';
 import {
   AuthSig,
   CosmosAuthSig,
+  LIT_NETWORKS_KEYS,
   LitContractContext,
   LitContractResolverContext,
   SolanaAuthSig,
@@ -458,7 +459,9 @@ export class TinnyEnvironment {
     if (this.network === LIT_TESTNET.LOCALCHAIN) {
       const networkContext =
         this?.testnet?.ContractContext ?? this._contractContext;
+
       this.contractsClient = new LitContracts({
+        network: this.network as LIT_NETWORKS_KEYS,
         signer: wallet,
         debug: this.processEnvs.DEBUG,
         rpc: this.rpc,

local-tests/setup/tinny-person.ts

@@ -7,6 +7,7 @@ import { LitContracts } from '@lit-protocol/contracts-sdk';
 import {
   AuthMethod,
   BaseSiweMessage,
+  LIT_NETWORKS_KEYS,
   LitContractContext,
 } from '@lit-protocol/types';
 import { ethers } from 'ethers';
@@ -124,6 +125,7 @@ export class TinnyPerson {
     if (this.envConfig.network === LIT_TESTNET.LOCALCHAIN) {
       const networkContext = this.envConfig.contractContext;
       this.contractsClient = new LitContracts({
+        network: this.envConfig.network as LIT_NETWORKS_KEYS,
         signer: this.wallet,
         debug: this.envConfig.processEnvs.DEBUG,
         rpc: this.envConfig.processEnvs.LIT_RPC_URL, // anvil rpc

package.json

@@ -125,7 +125,7 @@
     "jest": "27.5.1",
     "lerna": "^5.4.3",
     "live-server": "^1.2.2",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2.6.13",
     "node-localstorage": "^3.0.5",
     "nx": "17.3.0",
     "path": "^0.12.7",

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

@@ -421,19 +421,6 @@ export class LitContracts {
     // ----- autogen:init:start  -----
     // Generated at 2023-11-07T01:50:52.460Z
 
-    this.allowlistContract = {
-      read: new ethers.Contract(
-        addresses.Allowlist.address,
-        addresses.Allowlist.abi as any,
-        this.provider
-      ) as unknown as allowlistContract.Allowlist & allowlistContract.Allowlist,
-      write: new ethers.Contract(
-        addresses.Allowlist.address,
-        addresses.Allowlist.abi as any,
-        this.signer
-      ) as unknown as allowlistContract.Allowlist & allowlistContract.Allowlist,
-    };
-
     this.litTokenContract = {
       read: new ethers.Contract(
         addresses.LITToken.address,
@@ -447,21 +434,6 @@ export class LitContracts {
       ) as unknown as litTokenContract.LITToken & litTokenContract.LITToken,
     };
 
-    this.multisenderContract = {
-      read: new ethers.Contract(
-        addresses.Multisender.address,
-        addresses.Multisender.abi as any,
-        this.provider
-      ) as unknown as multisenderContract.Multisender &
-        multisenderContract.Multisender,
-      write: new ethers.Contract(
-        addresses.Multisender.address,
-        addresses.Multisender.abi as any,
-        this.signer
-      ) as unknown as multisenderContract.Multisender &
-        multisenderContract.Multisender,
-    };
-
     this.pkpHelperContract = {
       read: new ethers.Contract(
         addresses.PKPHelper.address,
@@ -488,21 +460,6 @@ export class LitContracts {
       ) as unknown as pkpNftContract.PKPNFT & pkpNftContract.PKPNFT,
     };
 
-    this.pkpNftMetadataContract = {
-      read: new ethers.Contract(
-        addresses.PKPNFTMetadata.address,
-        addresses.PKPNFTMetadata.abi as any,
-        this.provider
-      ) as unknown as pkpNftMetadataContract.PKPNFTMetadata &
-        pkpNftMetadataContract.PKPNFTMetadata,
-      write: new ethers.Contract(
-        addresses.PKPNFTMetadata.address,
-        addresses.PKPNFTMetadata.abi as any,
-        this.signer
-      ) as unknown as pkpNftMetadataContract.PKPNFTMetadata &
-        pkpNftMetadataContract.PKPNFTMetadata,
-    };
-
     this.pkpPermissionsContract = {
       read: new ethers.Contract(
         addresses.PKPPermissions.address,
@@ -767,6 +724,11 @@ export class LitContracts {
       })
     );
 
+    LitContracts.logger.debug(
+      'built contract context',
+      contractContext['PKPNFT']
+    );
+
     return contractContext;
   }
 
@@ -899,6 +861,7 @@ export class LitContracts {
       rpcUrl
     );
 
+    LitContracts.logger.debug('rpc url', rpcUrl);
     // Fetch contract data
     const [activeValidators, currentValidatorsCount, kickedValidators] =
       await Promise.all([
@@ -1613,7 +1576,7 @@ https://developer.litprotocol.com/v3/sdk/wallets/auth-methods/#auth-method-scope
         try {
           mintCost = await this.pkpNftContract.read.mintCost();
         } catch (e) {
-          throw new Error('Could not get mint cost');
+          throw e;
         }
 
         let sentTx;

tsconfig.base.json

@@ -10,15 +10,24 @@
     "importHelpers": true,
     "target": "ES2020",
     "module": "ES2020",
-    "lib": ["ES2020", "dom", "ES2021.String"],
+    "lib": [
+      "ES2020",
+      "dom",
+      "ES2021.String"
+    ],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "paths": {
-      "@lit-protocol/*": ["packages/*/src"]
+      "@lit-protocol/*": [
+        "packages/*/src"
+      ]
     }
   },
-  "exclude": ["node_modules", "tmp"]
+  "exclude": [
+    "node_modules",
+    "tmp"
+  ]
 }