diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 6105417f1c..9797ef05e7 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -20,9 +20,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7fff604a15..2718c95e1e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 2 diff --git a/.github/workflows/devnet-sync.yml b/.github/workflows/devnet-sync.yml index 31391da996..95e118ec5d 100644 --- a/.github/workflows/devnet-sync.yml +++ b/.github/workflows/devnet-sync.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: develop - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bfae745198..a918dfe451 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -20,9 +20,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-e2e-${{ hashFiles('**/yarn.lock') }} @@ -34,21 +34,21 @@ jobs: - name: Install and build packages run: yarn setup - name: Docker compose up - run: cd __tests__/e2e/lib/config && docker-compose up -d + run: cd __tests__/e2e/lib/config && docker compose up -d - name: Let the network run during 5min run: sleep 300 - name: Show logs - node0 if: always() - run: docker logs config_core0_1 + run: docker logs config-core0-1 - name: Show logs - node1 if: always() - run: docker logs config_core1_1 + run: docker logs config-core1-1 - name: Show logs - node2 if: always() - run: docker logs config_core2_1 + run: docker logs config-core2-1 - name: Show logs - node3 if: always() - run: docker logs config_core3_1 + run: docker logs config-core3-1 - name: Show logs - node4 if: always() - run: docker logs config_core4_1 + run: docker logs config-core4-1 diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index c504b22461..e31c6257fe 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -38,9 +38,9 @@ jobs: POSTGRES_DB: ark_unitnet steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -66,7 +66,7 @@ jobs: run: yarn test __tests__/functional/core-database/ --coverage --coverageDirectory .coverage/functional/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -90,9 +90,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -121,7 +121,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -145,9 +145,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -176,7 +176,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -200,9 +200,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -231,7 +231,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -255,9 +255,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -286,7 +286,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -310,9 +310,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -341,7 +341,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -365,9 +365,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -396,7 +396,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -420,9 +420,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -451,7 +451,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -475,9 +475,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -506,7 +506,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -530,9 +530,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -561,7 +561,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -585,9 +585,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -616,7 +616,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -640,9 +640,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -671,7 +671,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -695,9 +695,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -726,7 +726,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -750,9 +750,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -781,7 +781,7 @@ jobs: CORE_DB_USERNAME: ark - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/functional/${{ github.job }}/lcov.info @@ -805,9 +805,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -854,9 +854,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -903,9 +903,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -952,9 +952,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -1001,9 +1001,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -1050,9 +1050,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -1099,9 +1099,9 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 5090775efb..3cfde55b08 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -38,10 +38,10 @@ jobs: POSTGRES_DB: ark_unitnet steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bfa0a818a3..3824b69c82 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,10 +20,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/publish-develop.yml b/.github/workflows/publish-develop.yml index 752037903a..d9c1629b0c 100644 --- a/.github/workflows/publish-develop.yml +++ b/.github/workflows/publish-develop.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v1 with: diff --git a/.github/workflows/publish-master.yml b/.github/workflows/publish-master.yml index 4cace975b3..c9710861ed 100644 --- a/.github/workflows/publish-master.yml +++ b/.github/workflows/publish-master.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v1 with: node-version: 16 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 746c94000f..f637637ce5 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,10 +20,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -41,7 +41,7 @@ jobs: run: yarn test __tests__/unit/core/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -54,10 +54,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -75,7 +75,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-api/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -88,10 +88,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -109,7 +109,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-blockchain/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -122,10 +122,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -143,7 +143,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-cli/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -156,10 +156,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -177,7 +177,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-database/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -190,10 +190,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -211,7 +211,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-forger/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -224,10 +224,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -245,7 +245,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-kernel/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -258,10 +258,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -279,7 +279,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-logger-pino/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -292,10 +292,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -313,7 +313,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-magistrate-api/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -326,10 +326,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -347,7 +347,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-magistrate-crypto/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -360,10 +360,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -381,7 +381,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-magistrate-transactions/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -394,10 +394,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -415,7 +415,7 @@ jobs: run: yarn test __tests__/unit/core-p2p/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -428,10 +428,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -449,7 +449,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-snapshots/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -462,10 +462,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -483,7 +483,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-state/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -496,10 +496,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -517,7 +517,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-test-framework/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -530,10 +530,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -551,7 +551,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-transaction-pool/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -564,10 +564,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -585,7 +585,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-transactions/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -598,10 +598,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -619,7 +619,7 @@ jobs: run: yarn test:parallel __tests__/unit/core-webhooks/ --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info @@ -632,10 +632,10 @@ jobs: node-version: [16.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} @@ -652,7 +652,7 @@ jobs: - name: Test run: yarn test:parallel __tests__/unit/crypto/ --coverage --coverage --coverageDirectory .coverage/unit/${{ github.job }} - name: Archive code coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ github.job }}-coverage path: .coverage/unit/${{ github.job }}/lcov.info diff --git a/__tests__/e2e/README.md b/__tests__/e2e/README.md index 79e429fe64..e80f783773 100644 --- a/__tests__/e2e/README.md +++ b/__tests__/e2e/README.md @@ -16,8 +16,8 @@ You can launch and stop a network like this : ```bash cd lib/config -docker-compose up -d # launches the network -docker-compose down -v # shuts down the network +docker compose up -d # launches the network +docker compose down -v # shuts down the network ``` This will launch a network of 5 nodes on testnet. diff --git a/__tests__/unit/core-transactions/handlers/handler-registry.test.ts b/__tests__/unit/core-transactions/handlers/handler-registry.test.ts index ae652cf4ab..8b66e9fc2e 100644 --- a/__tests__/unit/core-transactions/handlers/handler-registry.test.ts +++ b/__tests__/unit/core-transactions/handlers/handler-registry.test.ts @@ -170,6 +170,7 @@ beforeEach(() => { .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("plugin", "@arkecosystem/core-transactions")); Managers.configManager.getMilestone().aip11 = false; + Managers.configManager.getMilestone().multiSignatureRegistrationEnabled = true; }); afterEach(() => { diff --git a/docker/production/README.md b/docker/production/README.md index 31a616d1c8..b0cebe64ef 100644 --- a/docker/production/README.md +++ b/docker/production/README.md @@ -23,7 +23,7 @@ Run Relay only node using [Docker Compose](https://docs.docker.com/compose/) **_DevNet_** -> Create file `docker-compose.yml` with the following content: +> Create file `docker compose.yml` with the following content: ```bash version: '2' @@ -97,7 +97,7 @@ CORE_WEBHOOKS_PORT=4004 **_MainNet_** -> Create file `docker-compose.yml` with the following content: +> Create file `docker compose.yml` with the following content: ```bash version: '2' @@ -174,7 +174,7 @@ _If you prefer to use custom DB Name, DB User and DB Password simply adjust vari > _Time to start the relay node_: ```bash -docker-compose up -d +docker compose up -d ``` ### _ARK Core docker image allows you to run a `forger`. However it requires some additional steps that can be found by visiting our [Documentation page](https://guides.ark.dev/devops-guides/how-to-setup-a-node-with-docker#production-setup)._ diff --git a/packages/core-test-framework/src/app/generators/crypto.ts b/packages/core-test-framework/src/app/generators/crypto.ts index 10a9f39d59..0875479ba2 100644 --- a/packages/core-test-framework/src/app/generators/crypto.ts +++ b/packages/core-test-framework/src/app/generators/crypto.ts @@ -125,6 +125,9 @@ export class CryptoGenerator extends Generator { aip11: true, aip37: true, htlcEnabled: true, + blockBurnAddress: true, + blsPublicKeyRegistrationEnabled: true, + multiSignatureRegistrationEnabled: true, }, { height: rewardHeight, diff --git a/packages/core-transactions/src/handlers/one/multi-signature-registration.ts b/packages/core-transactions/src/handlers/one/multi-signature-registration.ts index 55b55da1d3..15a4dbc8f6 100644 --- a/packages/core-transactions/src/handlers/one/multi-signature-registration.ts +++ b/packages/core-transactions/src/handlers/one/multi-signature-registration.ts @@ -49,7 +49,8 @@ export class MultiSignatureRegistrationTransactionHandler extends TransactionHan } public async isActivated(): Promise { - return !Managers.configManager.getMilestone().aip11; + const milestone = Managers.configManager.getMilestone(); + return !milestone.aip11 && milestone.multiSignatureRegistrationEnabled; } public async throwIfCannotBeApplied( diff --git a/packages/core-transactions/src/handlers/two/multi-signature-registration.ts b/packages/core-transactions/src/handlers/two/multi-signature-registration.ts index 81812da4d2..ad76fce7ee 100644 --- a/packages/core-transactions/src/handlers/two/multi-signature-registration.ts +++ b/packages/core-transactions/src/handlers/two/multi-signature-registration.ts @@ -59,7 +59,8 @@ export class MultiSignatureRegistrationTransactionHandler extends TransactionHan } public async isActivated(): Promise { - return Managers.configManager.getMilestone().aip11 === true; + const milestone = Managers.configManager.getMilestone(); + return milestone.aip11 === true && milestone.multiSignatureRegistrationEnabled; } public async throwIfCannotBeApplied( diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 1ec9e9998e..ea1cd42103 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@arkecosystem/crypto-identities": "1.2.0", - "@arkecosystem/crypto-networks": "1.2.2", + "@arkecosystem/crypto-networks": "1.7.1", "@arkecosystem/utils": "1.3.1", "ajv": "6.12.6", "ajv-keywords": "3.4.1", diff --git a/scripts/docker/templates/devnet/restore.sh b/scripts/docker/templates/devnet/restore.sh index efd5ae4c03..018206ebd5 100755 --- a/scripts/docker/templates/devnet/restore.sh +++ b/scripts/docker/templates/devnet/restore.sh @@ -1,8 +1,8 @@ -DOCKER_DB_NAME="$(docker-compose ps -q postgres)" +DOCKER_DB_NAME="$(docker compose ps -q postgres)" DB_HOSTNAME=postgres DB_USER={token} LOCAL_DUMP_PATH="snapshot.dump" -docker-compose up -d postgres +docker compose up -d postgres docker exec -i "${DOCKER_DB_NAME}" pg_restore -C --clean --no-acl --no-owner -U "${DB_USER}" -d "${DB_HOSTNAME}" < "${LOCAL_DUMP_PATH}" -docker-compose stop postgres +docker compose stop postgres diff --git a/scripts/docker/templates/testnet/restore.sh b/scripts/docker/templates/testnet/restore.sh index efd5ae4c03..018206ebd5 100755 --- a/scripts/docker/templates/testnet/restore.sh +++ b/scripts/docker/templates/testnet/restore.sh @@ -1,8 +1,8 @@ -DOCKER_DB_NAME="$(docker-compose ps -q postgres)" +DOCKER_DB_NAME="$(docker compose ps -q postgres)" DB_HOSTNAME=postgres DB_USER={token} LOCAL_DUMP_PATH="snapshot.dump" -docker-compose up -d postgres +docker compose up -d postgres docker exec -i "${DOCKER_DB_NAME}" pg_restore -C --clean --no-acl --no-owner -U "${DB_USER}" -d "${DB_HOSTNAME}" < "${LOCAL_DUMP_PATH}" -docker-compose stop postgres +docker compose stop postgres diff --git a/yarn.lock b/yarn.lock index 9de7bdf060..9d978d64ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,10 +25,10 @@ fast-memoize "^2.5.1" wif "^2.0.6" -"@arkecosystem/crypto-networks@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@arkecosystem/crypto-networks/-/crypto-networks-1.2.2.tgz#5efb52c161af5a05ee805e2327d58673024b4b5a" - integrity sha512-2iVeiYNnqtV9oZxWt/q9LFb/7zEMN2u/3pwTwIvBonrqtJwazorCBP+zbBwxeXivwnM4SxrCQweoTlujjvA+8w== +"@arkecosystem/crypto-networks@1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@arkecosystem/crypto-networks/-/crypto-networks-1.7.1.tgz#c07cedd9624782c7a4bc2787255fc1a9db1159ed" + integrity sha512-6Woqje8l5Xlviw4am2kKhHU7vHBEDPQULEqMjI9lY9J0kol54mp78Jygkfi/s0DpMNfdYVWSwHtjOueHFQnTLw== "@arkecosystem/utils@1.3.1": version "1.3.1" @@ -12754,7 +12754,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -12772,6 +12772,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -12821,7 +12830,7 @@ stringify-object@^3.2.1: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -12849,6 +12858,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -13890,7 +13906,7 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -13925,6 +13941,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"