Merge remote-tracking branch 'upstream/mainnet' into playlists

Author: zeeshanakram3

.dockerignore

@@ -4,7 +4,6 @@ target/
 .vscode/
 query-node/**/dist
 query-node/lib
-cli/
 tests/
 !tests/network-tests/proposal-parameters.json
 devops/

.env

@@ -24,6 +24,8 @@ BLOCK_HEIGHT=0
 # Query node GraphQL server port
 # Remember to change it in COLOSSUS_QUERY_NODE_URL and DISTRIBUTOR_QUERY_NODE_URL as well
 GRAPHQL_SERVER_PORT=8081
+PROCESSOR_STATE_APP_PORT=8082
+PROCESSOR_HOST=processor
 
 # Query node playground endpoint
 # Leave it blank if you want endpoint to be copied from browser's URL
@@ -55,31 +57,38 @@ DISTRIBUTOR_QUERY_NODE_URL=http://graphql-server:8081/graphql
 # Indexer gateway used by processor. If you don't use the local indexer set this to a remote gateway
 PROCESSOR_INDEXER_GATEWAY=http://hydra-indexer-gateway:4000/graphql
 
+# State update endpoint used by prcessor (to send state updates)
+STATE_UPDATE_ENDPOINT=http://graphql-server:8082/update-processor-state
+
 # Colossus services identities
-COLOSSUS_1_WORKER_ID=0
-COLOSSUS_1_WORKER_URI=//testing//worker//Storage//${COLOSSUS_1_WORKER_ID}
+# Assuming hired lead has worker id 0
+COLOSSUS_1_WORKER_ID=1
+COLOSSUS_1_WORKER_URI=//testing//worker//Storage//1
 COLOSSUS_1_TRANSACTOR_URI=//Colossus1
 
-COLOSSUS_2_WORKER_ID=1
-COLOSSUS_2_WORKER_URI=//testing//worker//Storage//${COLOSSUS_2_WORKER_ID}
+COLOSSUS_2_WORKER_ID=2
+COLOSSUS_2_WORKER_URI=//testing//worker//Storage//2
 COLOSSUS_2_TRANSACTOR_URI=//Colossus2
 
 # Distributor node services identities
-DISTRIBUTOR_1_WORKER_ID=0
-DISTRIBUTOR_1_ACCOUNT_URI=//testing//worker//Distribution//0
+# Assuming hired lead has worker id 0
+DISTRIBUTOR_1_WORKER_ID=1
+DISTRIBUTOR_1_ACCOUNT_URI=//testing//worker//Distribution//1
 
-DISTRIBUTOR_2_WORKER_ID=1
-DISTRIBUTOR_2_ACCOUNT_URI=//testing//worker//Distribution//1
+DISTRIBUTOR_2_WORKER_ID=2
+DISTRIBUTOR_2_ACCOUNT_URI=//testing//worker//Distribution//2
 
 # Membership Faucet
-SCREENING_AUTHORITY_SEED=//Alice
-INVITING_MEMBER_ID=0
+INVITER_KEY=
 # SendGrid API key
 SENDGRID_API_KEY=
 # Destination email address for failure alerts
 ALERT_TO_EMAIL=
 ALERT_FROM_EMAIL=
-BALANCE_TOP_UP_AMOUNT=10
+# HCaptcha secret API key
+HCAPTCHA_SECRET=
+BALANCE_CREDIT=300000000000
+BALANCE_LOCKED=300000000000
 
 # joystream/node docker image tag
 # We do not provide a default value - scripts that startup a joystream-node service

.github/workflows/create-ami.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - id: compute_shasum
         name: Compute runtime code shasum
@@ -39,52 +39,18 @@ jobs:
           tar czvf joystream-node-macos.tar.gz -C ./target/release joystream-node
 
       - name: Temporarily save node binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: joystream-node-macos-${{ steps.compute_shasum.outputs.shasum }}
           path: joystream-node-macos.tar.gz
           retention-days: 1
 
-  build-rpi-binary:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - id: compute_shasum
-        name: Compute runtime code shasum
-        run: |
-          export RUNTIME_CODE_SHASUM=`scripts/runtime-code-shasum.sh`
-          echo "::set-output name=shasum::${RUNTIME_CODE_SHASUM}"
-
-      - name: Run Setup
-        run: |
-          ./setup.sh
-
-      - name: Build binaries
-        run: |
-          export WORKSPACE_ROOT=`cargo metadata --offline --no-deps --format-version 1 | jq .workspace_root -r`
-          sudo chmod a+w $WORKSPACE_ROOT
-          sudo chmod -R a+w $HOME/.cargo/registry
-          ./scripts/raspberry-cross-build.sh
-
-      - name: Tar the binary
-        run: |
-          tar czvf joystream-node-rpi.tar.gz -C ./target/arm-unknown-linux-gnueabihf/release joystream-node
-
-      - name: Temporarily save node binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: joystream-node-rpi-${{ steps.compute_shasum.outputs.shasum }}
-          path: joystream-node-rpi.tar.gz
-          retention-days: 1
-
   create-release:
     runs-on: ubuntu-latest
-    needs: [build-mac-binary, build-rpi-binary]
+    needs: build-mac-binary
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - id: compute_shasum
         name: Compute runtime code shasum
@@ -113,23 +79,14 @@ jobs:
           docker cp $(docker create --rm $IMAGE-arm64):/joystream/node ./joystream-node
           tar -czvf joystream-node-$VERSION_AND_COMMIT-arm64-linux-gnu.tar.gz joystream-node
 
-          docker cp $(docker create --rm $IMAGE-arm):/joystream/node ./joystream-node
-          tar -czvf joystream-node-$VERSION_AND_COMMIT-armv7-linux-gnu.tar.gz joystream-node
-
       - name: Retrieve saved MacOS binary
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: joystream-node-macos-${{ steps.compute_shasum.outputs.shasum }}
 
-      - name: Retrieve saved RPi binary
-        uses: actions/download-artifact@v2
-        with:
-          name: joystream-node-rpi-${{ steps.compute_shasum.outputs.shasum }}
-
-      - name: Rename MacOS and RPi tar
+      - name: Rename MacOS binary and tar
         run: |
           mv joystream-node-macos.tar.gz joystream-node-${{ steps.extract_binaries.outputs.version_and_commit }}-x86_64-macos.tar.gz
-          mv joystream-node-rpi.tar.gz joystream-node-${{ steps.extract_binaries.outputs.version_and_commit }}-rpi.tar.gz
 
       - name: Release
         uses: softprops/action-gh-release@v1