From 603d44e31816ae782289b86095d1ce3d1c0b5323 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Tue, 15 Oct 2024 14:14:41 -0400 Subject: [PATCH 1/7] ci: testing snapshot container --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87b29d4f74..6860b96e72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 env: - DATIL_COMMIT_HASH: ae3c20e07eb933b61073689b95f56867c03de252 + DATIL_COMMIT_HASH: 8f290d6c346523c1681260a01bb30903b3205374 steps: - name: Checkout repo uses: actions/checkout@v2 @@ -68,7 +68,7 @@ jobs: run: docker pull ghcr.io/lit-protocol/shiva:latest - name: Run Shiva Container id: shiva-runner - run: docker run -d -m 32g -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=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:latest + run: docker run -d -m 32g -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=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test - name: Set up Node.js uses: actions/setup-node@v3 with: From ab10dd129b37d63eb92b7c09e9eb6e5dabaad236 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 08:35:45 -0400 Subject: [PATCH 2/7] ci: remove lit asset clone and volume mount --- .github/workflows/ci.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6860b96e72..314b56cac8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,24 +42,6 @@ jobs: 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: ${{env.DATIL_COMMIT_HASH}} - 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}} @@ -68,7 +50,7 @@ jobs: run: docker pull ghcr.io/lit-protocol/shiva:latest - name: Run Shiva Container id: shiva-runner - run: docker run -d -m 32g -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=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test + run: docker run -d -m 32g -p 8000:8000 -p 8545:8545 -p 7470:7470 -p 7471:7471 -p 7472:7472 -p 7473:7473 -p 7474:7474 -p 7475:7475 -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test - name: Set up Node.js uses: actions/setup-node@v3 with: From 0b5dfa4226438fdb8e5de331515470fa873b701f Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 08:55:45 -0400 Subject: [PATCH 3/7] ci: add empty dir for vol mount --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 314b56cac8..d61c8f90a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,9 @@ jobs: run: docker pull ghcr.io/lit-protocol/shiva:latest - name: Run Shiva Container id: shiva-runner - run: docker run -d -m 32g -p 8000:8000 -p 8545:8545 -p 7470:7470 -p 7471:7471 -p 7472:7472 -p 7473:7473 -p 7474:7474 -p 7475:7475 -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test + run: | + mkdir ${{github.workspace}}/data + docker run -d -m 32g -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}}/data:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test - name: Set up Node.js uses: actions/setup-node@v3 with: From 2fce702cbc4824e740c712b8eeca67193a93b879 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 09:21:18 -0400 Subject: [PATCH 4/7] ci: test with la in volume --- .github/workflows/ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d61c8f90a5..54d093b5bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,19 @@ jobs: 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: ${{env.DATIL_COMMIT_HASH}} + token: ${{secrets.GH_PAT}} + path: ${{ github.workspace }}/lit-assets/ + submodules: false + sparse-checkout: | + blockchain + rust/lit-node - name: Docker login id: login run: docker login ghcr.io/ -u ${{secrets.GH_USER}} --password ${{secrets.GH_PAT}} @@ -50,9 +63,7 @@ jobs: run: docker pull ghcr.io/lit-protocol/shiva:latest - name: Run Shiva Container id: shiva-runner - run: | - mkdir ${{github.workspace}}/data - docker run -d -m 32g -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}}/data:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test + run: docker run -d -m 32g -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}}/data:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test - name: Set up Node.js uses: actions/setup-node@v3 with: From a7a28e2098877850b250ecd0d860f66728beeba9 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 09:47:36 -0400 Subject: [PATCH 5/7] dev: test public ip over localhost ip --- packages/contracts-sdk/src/lib/contracts-sdk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index a0165d96d6..2f27cb6c27 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -1081,7 +1081,7 @@ export class LitContracts { const activeValidatorStructs: ValidatorStruct[] = activeUnkickedValidatorStructs.map((item: any) => { return { - ip: item[0], + ip: `0.0.0.0`, ipv6: item[1], port: item[2], nodeAddress: item[3], From f9b23937e425b048a39c028ab54e0d52b90f79cf Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 10:04:32 -0400 Subject: [PATCH 6/7] Revert "dev: test public ip over localhost ip" This reverts commit a7a28e2098877850b250ecd0d860f66728beeba9. --- packages/contracts-sdk/src/lib/contracts-sdk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 2f27cb6c27..a0165d96d6 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -1081,7 +1081,7 @@ export class LitContracts { const activeValidatorStructs: ValidatorStruct[] = activeUnkickedValidatorStructs.map((item: any) => { return { - ip: `0.0.0.0`, + ip: item[0], ipv6: item[1], port: item[2], nodeAddress: item[3], From 4cb96d7c5dc7207442c7b9eee885490397663a8e Mon Sep 17 00:00:00 2001 From: Josh Long Date: Wed, 16 Oct 2024 10:04:42 -0400 Subject: [PATCH 7/7] ci: mount la for test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54d093b5bf..00e56102f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: run: docker pull ghcr.io/lit-protocol/shiva:latest - name: Run Shiva Container id: shiva-runner - run: docker run -d -m 32g -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}}/data:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test + run: docker run -d -m 32g -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=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:snap-shot-test - name: Set up Node.js uses: actions/setup-node@v3 with: