difftreelog
Merge pull request #198 from UniqueNetwork/parachain-compose
in: master
Parachain compose
28 files changed
..env.swpdiffbeforeafterbothbinary blob — no preview
.envdiffbeforeafterboth--- /dev/null
+++ b/.env
@@ -0,0 +1,6 @@
+RUST_TOOLCHAIN=nightly-2021-06-28
+RUST_C=1.55.0-nightly
+POLKA_VERSION=v0.9.10
+NFT_BRANCH=develop
+USER=***
+PASS=***
Dockerfile-parachaindiffbeforeafterboth--- /dev/null
+++ b/Dockerfile-parachain
@@ -0,0 +1,108 @@
+# ===== BUILD ======
+FROM phusion/baseimage:focal-1.0.0 as builder
+LABEL maintainer="Unique.Network"
+
+
+
+ARG RUST_TOOLCHAIN=nightly-2021-06-28
+#ARG RUST_C=1.55.0-nightly
+ARG POLKA_VERSION=v0.9.10
+ARG NFT_BRANCH=develop
+
+#ARG USER=***
+#ARG PASS=***
+
+
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
+#ENV RUST_C $RUST_C
+ENV POLKA_VERSION $POLKA_VERSION
+ENV NFT_BRANCH $NFT_BRANCH
+
+
+#RUN echo $RUST_TOOLCHAIN
+#RUN echo $RUST_C
+#RUN echo $POLKA_VERSION
+#RUN echo $NFT_BRANCH
+
+
+
+ARG PROFILE=release
+
+RUN apt-get update && \
+ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
+ apt-get install -y cmake pkg-config libssl-dev git clang
+
+# Get project and run it
+
+#RUN git clone -b $NFT_BRANCH https://$USER:$PASS@github.com/UniqueNetwork/unique-chain.git /nft_parachain
+
+
+RUN mkdir nft_parachain
+WORKDIR /nft_parachain
+COPY . .
+
+
+RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y
+RUN export PATH="/cargo-home/bin:$PATH" && \
+ export CARGO_HOME="/cargo-home" && \
+ cargo fetch
+
+RUN export PATH="/cargo-home/bin:$PATH" && \
+ export CARGO_HOME="/cargo-home" && \
+ rustup toolchain uninstall $(rustup toolchain list) && \
+ rustup toolchain install $RUST_TOOLCHAIN && \
+# rustup toolchain install $RUST_C && \
+ rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN && \
+ rustup default $RUST_TOOLCHAIN && \
+ rustup target list --installed && \
+ rustup show
+
+RUN export PATH="/cargo-home/bin:$PATH" && \
+ export CARGO_HOME="/cargo-home" && \
+ cargo build "--$PROFILE"
+ # && \
+ # cargo test
+
+
+
+RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
+ cd polkadot && \
+ git tag -n && \
+ export PATH="/cargo-home/bin:$PATH" && \
+ export CARGO_HOME="/cargo-home" && \
+ cargo build --release
+
+# ===== RUN ======
+
+FROM phusion/baseimage:focal-1.0.0
+
+ARG PROFILE=release
+
+COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/
+COPY --from=builder /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
+
+RUN apt-get update && \
+ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
+ apt-get install -y cmake pkg-config libssl-dev git clang
+
+RUN git clone https://github.com/paritytech/polkadot-launch.git
+
+RUN apt-get -y update && \
+ apt-get -y upgrade && \
+ apt-get -y install curl && \
+ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
+ export NVM_DIR="$HOME/.nvm" && \
+ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+ nvm install v15.5.0 && \
+ nvm use v15.5.0
+# npm install --save @polkadot/api && \
+# npm install --save-dev mochawesome
+
+
+CMD export NVM_DIR="$HOME/.nvm" && \
+ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+ cd /polkadot-launch && \
+ npm install --global yarn && \
+ yarn install && \
+ yarn build && \
+ yarn start launch-config.json
\ No newline at end of file
Dockerfile-testnetdiffbeforeafterboth--- a/Dockerfile-testnet
+++ /dev/null
@@ -1,56 +0,0 @@
-# ===== BUILD ======
-
-FROM phusion/baseimage:0.10.2 as builder
-LABEL maintainer="gz@usetech.com"
-
-ENV WASM_TOOLCHAIN=nightly-2020-06-01
-
-ARG PROFILE=release
-
-RUN apt-get update && \
- apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
- apt-get install -y cmake pkg-config libssl-dev git clang
-
-# Get project and run it
-#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain
-RUN mkdir nft_parachain
-WORKDIR /nft_parachain
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
- export PATH="$PATH:$HOME/.cargo/bin" && \
- rustup toolchain uninstall $(rustup toolchain list) && \
- rustup default 1.44.1 && \
- rustup toolchain install $WASM_TOOLCHAIN && \
- rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
- rustup target list --installed && \
- rustup show
-
-COPY . .
-
-RUN export PATH="$PATH:$HOME/.cargo/bin" && \
- cargo build "--$PROFILE"
- # && \
- # cargo test
-
-RUN cd target/release && ls -la
-
-# ===== RUN ======
-
-FROM phusion/baseimage:0.10.2
-ARG PROFILE=release
-
-COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin
-
-EXPOSE 9944
-EXPOSE 9946
-EXPOSE 9935
-EXPOSE 9936
-EXPOSE 30334
-VOLUME ["/chain-data"]
-
-# Copy and run start script
-COPY ["./run-testnet.sh", "./run.sh"]
-COPY ["./nftTestnetSpecRaw.json", "./nftTestnetSpecRaw.json"]
-COPY ["./einstein_key_file", "./einstein_key_file"]
-RUN chmod +x ./run.sh
-CMD ["bash", "-c", "./run.sh"]
Dockerfile-testsdiffbeforeafterboth--- a/Dockerfile-tests
+++ b/Dockerfile-tests
@@ -1,10 +1,10 @@
# ===== Integration Tests ======
-FROM ubuntu:18.04
+FROM ubuntu:20.04
LABEL maintainer="UniqueNetwork.io"
-RUN apt-get -y update; apt-get -y upgrade; apt-get -y install curl
+RUN apt -y update; apt -y upgrade; apt -y install curl
RUN mkdir nft_parachain
@@ -18,16 +18,18 @@
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.0.1 && \
- nvm use v15.0.1 && \
+ nvm install v15.5.0 && \
+ nvm use v15.5.0 && \
npm install --save @polkadot/api && \
npm install --save-dev mochawesome
+CMD sleep 60
+
CMD export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
cd tests && \
npm install --global yarn && \
yarn add mochawesome && \
yarn install && \
- yarn test --reporter mochawesome
- # yarn test
+ sleep 120 && \
+ NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
ci_node.shdiffbeforeafterboth--- a/ci_node.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-#docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
-
-docker-compose -f docker-compose-tests.yml up -d --build
-
-# validate if testing container finished
-while [ "$(docker ps | grep unit_test | wc -l)" -ge 1 ]; do echo "Unit tests in process" && sleep 600; done && docker logs unit_test &> /home/polkadot/report-log/unit_test.log & \
-while [ "$(docker ps | grep integration_test | wc -l)" -ge 1 ]; do echo "Integration tests in process" && sleep 600; done && docker logs integration_test &> /home/polkadot/report-log/integration_test.log
-docker-compose -f docker-compose-tests.yml down -v
-echo "Workflow finished"
-docker system prune --force
deploy-testnet.shdiffbeforeafterboth--- a/deploy-testnet.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#######################################################
-#
-# Deployng process:
-#
-# 1. Git pull the nft_parachain on the server
-# 2. SCP secret files in the root folder of nft_parachain
-# - einstein_store_key.json
-# - newton_store_key.json
-# - einstein_key_file
-# 3. Run this script
-#
-
-### Build and run Einstein node (bootnode) and Newton node
-docker-compose -f docker-compose-testnet.yml up -d --build
-
-sleep 30
-
-### Deploy aura store keys
-# Einstein
-curl http://localhost:9935 -H "Content-Type:application/json;charset=utf-8" -d "@./einstein_store_key.json"
-
-# Newton
-curl http://localhost:9936 -H "Content-Type:application/json;charset=utf-8" -d "@./newton_store_key.json"
-
-### Deploy standpa store keys
-# Einstein
-curl http://localhost:9935 -H "Content-Type:application/json;charset=utf-8" -d "@./einstein_store_key_grandpa.json"
-
-# Newton
-curl http://localhost:9936 -H "Content-Type:application/json;charset=utf-8" -d "@./newton_store_key_grandpa.json"
-
-sleep 30
-
-### Stop and restart nodes so that they start finalizing
-docker stop nft_parachain_node_einstein_1
-docker stop nft_parachain_node_newton_1
-docker stop nft_parachain_node_bohr_1
-docker start nft_parachain_node_einstein_1
-docker start nft_parachain_node_newton_1
-docker start nft_parachain_node_bohr_1
-
-### Cleanup
-
-# Delete key file used to set bootnode peer ID
-rm einstein_key_file
-
-# Delete store key files
-rm ./einstein_store_key.json
-rm ./newton_store_key.json
-rm ./einstein_store_key_grandpa.json
-rm ./newton_store_key_grandpa.json
deploy/docker-compose-tests.ymldiffbeforeafterboth--- /dev/null
+++ b/deploy/docker-compose-tests.yml
@@ -0,0 +1,48 @@
+version: "3.5"
+
+services:
+ node_validator1:
+ image: nft_node_test
+ container_name: validator1_test
+ ports:
+ - 9944:9944
+ build:
+ context: ./
+ dockerfile: Dockerfile
+# volumes:
+# - ./chain-data:/chain-data
+ networks:
+ - node_test_network
+ command: bash -c "/usr/local/bin/nft --dev --tmp --ws-external --rpc-external"
+
+ integration_tests:
+ container_name: integration_test
+ image: int_test
+ build:
+ context: ./
+ dockerfile: Dockerfile-tests
+ volumes:
+ - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts
+ - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report
+ # command: bash -c 'while true; do sleep 20; df -h; done'
+ networks:
+ - node_test_network
+ depends_on:
+ - node_validator1
+
+ unit_tests:
+ container_name: unit_test
+ image: nft_unit_test
+ build:
+ context: ./
+ dockerfile: Dockerfile-unit
+ container_name: unit_test
+ networks:
+ - node_test_network
+ # command: bash -c 'while true; do sleep 20; df -h; done'
+ command: bash -c 'cargo test'
+
+networks:
+ node_test_network:
+ name: node_test_network
+ driver: bridge
deploy/node_build_test.ymldiffbeforeafterboth--- /dev/null
+++ b/deploy/node_build_test.yml
@@ -0,0 +1,44 @@
+name: Build & test
+
+# Controls when the action will run.
+on:
+ # Triggers the workflow on push or pull request events but only for the master branch
+ push:
+ branches: [ develop ]
+ # pull_request:
+ # branches: [ develop ]
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+ build:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-20.04
+
+ # if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v2
+
+ #runs ssh connection
+ - name: Go to server
+ uses: appleboy/ssh-action@master
+ with:
+ host: ${{ secrets.SERVER_IP }}
+ username: ${{ secrets.SERVER_USERNAME }}
+ key: ${{ secrets.KEY }}
+ port: ${{ secrets.SERVER_PORT }}
+ # command_timeout: 200m
+ script: |
+ eval $(ssh-agent -s)
+ ssh-add /home/devops/.ssh/git_hub
+ git clone git@github.com:usetech-llc/nft_private.git
+ cd nft_private
+ git checkout develop
+ # git pull --all
+ chmod +x ci_node.sh
+ ./ci_node.sh
+ rm -rf /home/polkadot/nft_private
\ No newline at end of file
deploy/old/Dockerfile-testnetdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/Dockerfile-testnet
@@ -0,0 +1,56 @@
+# ===== BUILD ======
+
+FROM phusion/baseimage:0.10.2 as builder
+LABEL maintainer="gz@usetech.com"
+
+ENV WASM_TOOLCHAIN=nightly-2020-06-01
+
+ARG PROFILE=release
+
+RUN apt-get update && \
+ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
+ apt-get install -y cmake pkg-config libssl-dev git clang
+
+# Get project and run it
+#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain
+RUN mkdir nft_parachain
+WORKDIR /nft_parachain
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+ export PATH="$PATH:$HOME/.cargo/bin" && \
+ rustup toolchain uninstall $(rustup toolchain list) && \
+ rustup default 1.44.1 && \
+ rustup toolchain install $WASM_TOOLCHAIN && \
+ rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
+ rustup target list --installed && \
+ rustup show
+
+COPY . .
+
+RUN export PATH="$PATH:$HOME/.cargo/bin" && \
+ cargo build "--$PROFILE"
+ # && \
+ # cargo test
+
+RUN cd target/release && ls -la
+
+# ===== RUN ======
+
+FROM phusion/baseimage:0.10.2
+ARG PROFILE=release
+
+COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin
+
+EXPOSE 9944
+EXPOSE 9946
+EXPOSE 9935
+EXPOSE 9936
+EXPOSE 30334
+VOLUME ["/chain-data"]
+
+# Copy and run start script
+COPY ["./run-testnet.sh", "./run.sh"]
+COPY ["./nftTestnetSpecRaw.json", "./nftTestnetSpecRaw.json"]
+COPY ["./einstein_key_file", "./einstein_key_file"]
+RUN chmod +x ./run.sh
+CMD ["bash", "-c", "./run.sh"]
deploy/old/ci_node.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/ci_node.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
+
+docker-compose -f docker-compose-tests.yml up -d --build
+
+# validate if testing container finished
+while [ "$(docker ps | grep unit_test | wc -l)" -ge 1 ]; do echo "Unit tests in process" && sleep 600; done && docker logs unit_test &> /home/polkadot/report-log/unit_test.log & \
+while [ "$(docker ps | grep integration_test | wc -l)" -ge 1 ]; do echo "Integration tests in process" && sleep 600; done && docker logs integration_test &> /home/polkadot/report-log/integration_test.log
+docker-compose -f docker-compose-tests.yml down -v
+echo "Workflow finished"
+docker system prune --force
deploy/old/deploy-testnet.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/deploy-testnet.sh
@@ -0,0 +1,51 @@
+#######################################################
+#
+# Deployng process:
+#
+# 1. Git pull the nft_parachain on the server
+# 2. SCP secret files in the root folder of nft_parachain
+# - einstein_store_key.json
+# - newton_store_key.json
+# - einstein_key_file
+# 3. Run this script
+#
+
+### Build and run Einstein node (bootnode) and Newton node
+docker-compose -f docker-compose-testnet.yml up -d --build
+
+sleep 30
+
+### Deploy aura store keys
+# Einstein
+curl http://localhost:9935 -H "Content-Type:application/json;charset=utf-8" -d "@./einstein_store_key.json"
+
+# Newton
+curl http://localhost:9936 -H "Content-Type:application/json;charset=utf-8" -d "@./newton_store_key.json"
+
+### Deploy standpa store keys
+# Einstein
+curl http://localhost:9935 -H "Content-Type:application/json;charset=utf-8" -d "@./einstein_store_key_grandpa.json"
+
+# Newton
+curl http://localhost:9936 -H "Content-Type:application/json;charset=utf-8" -d "@./newton_store_key_grandpa.json"
+
+sleep 30
+
+### Stop and restart nodes so that they start finalizing
+docker stop nft_parachain_node_einstein_1
+docker stop nft_parachain_node_newton_1
+docker stop nft_parachain_node_bohr_1
+docker start nft_parachain_node_einstein_1
+docker start nft_parachain_node_newton_1
+docker start nft_parachain_node_bohr_1
+
+### Cleanup
+
+# Delete key file used to set bootnode peer ID
+rm einstein_key_file
+
+# Delete store key files
+rm ./einstein_store_key.json
+rm ./newton_store_key.json
+rm ./einstein_store_key_grandpa.json
+rm ./newton_store_key_grandpa.json
deploy/old/docker-compose-testnet.ymldiffbeforeafterboth--- /dev/null
+++ b/deploy/old/docker-compose-testnet.yml
@@ -0,0 +1,72 @@
+version: "3.5"
+
+services:
+ node_einstein:
+ image: nft-parachain
+ ports:
+ - 9935:9935
+ build:
+ context: ./
+ dockerfile: Dockerfile-testnet
+ volumes:
+ - ./chain-data-einstein:/chain-data
+ networks:
+ - substrate_network
+ restart: always
+ environment:
+ - NODE=einstein
+ - P2PPORT=30335
+ - WSPORT=9945
+ - RPCPORT=9935
+ - BOOTNODE=True
+ - VALIDATOR=True
+
+ node_newton:
+ image: nft-parachain
+ ports:
+ - 9936:9936
+ build:
+ context: ./
+ dockerfile: Dockerfile-testnet
+ volumes:
+ - ./chain-data-newton:/chain-data
+ networks:
+ - substrate_network
+ restart: always
+ environment:
+ - NODE=newton
+ - P2PPORT=30336
+ - WSPORT=9946
+ - RPCPORT=9936
+ - BOOTNODE=False
+ - BOOTPORT=30335
+ - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
+ - VALIDATOR=True
+
+ node_bohr:
+ image: nft-parachain
+ ports:
+ - 9944:9944
+ - 30334:30334
+ build:
+ context: ./
+ dockerfile: Dockerfile-testnet
+ volumes:
+ - ./chain-data-bohr:/chain-data
+ networks:
+ - substrate_network
+ restart: always
+ environment:
+ - NODE=bohr
+ - P2PPORT=30334
+ - WSPORT=9944
+ - RPCPORT=9934
+ - BOOTNODE=False
+ - BOOTPORT=30335
+ - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
+ - VALIDATOR=False
+
+networks:
+ substrate_network:
+ driver: bridge
+ name: substrate_network
deploy/old/purge-running-node.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/purge-running-node.sh
@@ -0,0 +1,3 @@
+docker-compose exec node nft purge-chain --dev --base-path=/chain-data -y
+docker-compose down
+docker-compose up -d
deploy/old/run-testnet-local-node.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/run-testnet-local-node.sh
@@ -0,0 +1,7 @@
+BOOTNODES="--bootnodes /ip4/212.248.19.53/tcp/30334/p2p/12D3KooWHQDopuFB5krJGPQYn8Pg8i6toMeZFHGMs6sUPPmv4RhP";
+
+./target/debug/nft \
+ --base-path ./chain-data \
+ --chain ./nftTestnetSpecRaw.json \
+ -lruntime \
+ $BOOTNODES;
deploy/old/run-testnet.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/run-testnet.sh
@@ -0,0 +1,56 @@
+# ls -la /nft_parachain/target/release
+
+# /usr/local/bin/nft --dev --ws-external --rpc-external --base-path=/chain-data -lwarn,runtime
+
+echo Running node $NODE
+echo P2P Port : $P2PPORT
+echo WebSocket Port : $WSPORT
+echo RPC Port : $RPCPORT
+
+echo Boot = $BOOTNODE
+echo Validator = $VALIDATOR
+
+if [ "$BOOTNODE" = True ];
+then
+echo This is a Bootnode;
+BOOTNODES="";
+NODEKEY="--node-key-file einstein_key_file";
+else
+echo Bootnode Port : $BOOTPORT;
+echo Bootnode PeerID : $BOOTID;
+BOOTNODES="--bootnodes /dns4/node_einstein/tcp/$BOOTPORT/p2p/$BOOTID";
+NODEKEY="";
+fi
+
+if [ "$VALIDATOR" = True ];
+then
+echo This is a Validator node;
+/usr/local/bin/nft \
+ --base-path /chain-data \
+ --chain ./nftTestnetSpecRaw.json \
+ --port $P2PPORT \
+ --ws-port $WSPORT \
+ --rpc-port $RPCPORT \
+ --validator \
+ --rpc-methods=Unsafe \
+ --name $NODE \
+ --ws-external \
+ --rpc-external \
+ -lruntime \
+ $BOOTNODES \
+ $NODEKEY;
+else
+echo This is a Gateway node;
+/usr/local/bin/nft \
+ --base-path /chain-data \
+ --chain ./nftTestnetSpecRaw.json \
+ --port $P2PPORT \
+ --ws-port $WSPORT \
+ --rpc-port $RPCPORT \
+ --name $NODE \
+ --ws-external \
+ --ws-max-connections 10000 \
+ --rpc-cors all \
+ -lruntime \
+ $BOOTNODES;
+fi
deploy/old/upload_secrets.shdiffbeforeafterboth--- /dev/null
+++ b/deploy/old/upload_secrets.sh
@@ -0,0 +1,7 @@
+scp -P 8022 ./einstein_key_file developer@212.248.19.53:~/nft_parachain/einstein_key_file
+
+scp -P 8022 ./einstein_store_key.json developer@212.248.19.53:~/nft_parachain/einstein_store_key.json
+scp -P 8022 ./newton_store_key.json developer@212.248.19.53:~/nft_parachain/newton_store_key.json
+
+scp -P 8022 ./einstein_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/einstein_store_key_grandpa.json
+scp -P 8022 ./newton_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/newton_store_key_grandpa.json
docker-compose-testnet.ymldiffbeforeafterboth--- a/docker-compose-testnet.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-version: "3.5"
-
-services:
- node_einstein:
- image: nft-parachain
- ports:
- - 9935:9935
- build:
- context: ./
- dockerfile: Dockerfile-testnet
- volumes:
- - ./chain-data-einstein:/chain-data
- networks:
- - substrate_network
- restart: always
- environment:
- - NODE=einstein
- - P2PPORT=30335
- - WSPORT=9945
- - RPCPORT=9935
- - BOOTNODE=True
- - VALIDATOR=True
-
- node_newton:
- image: nft-parachain
- ports:
- - 9936:9936
- build:
- context: ./
- dockerfile: Dockerfile-testnet
- volumes:
- - ./chain-data-newton:/chain-data
- networks:
- - substrate_network
- restart: always
- environment:
- - NODE=newton
- - P2PPORT=30336
- - WSPORT=9946
- - RPCPORT=9936
- - BOOTNODE=False
- - BOOTPORT=30335
- - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
- - VALIDATOR=True
-
- node_bohr:
- image: nft-parachain
- ports:
- - 9944:9944
- - 30334:30334
- build:
- context: ./
- dockerfile: Dockerfile-testnet
- volumes:
- - ./chain-data-bohr:/chain-data
- networks:
- - substrate_network
- restart: always
- environment:
- - NODE=bohr
- - P2PPORT=30334
- - WSPORT=9944
- - RPCPORT=9934
- - BOOTNODE=False
- - BOOTPORT=30335
- - BOOTID=12D3KooWRLrjXxByPkSCzcsRyf6652brnJT9s4AQHR3uujJ35mxz
- - VALIDATOR=False
-
-networks:
- substrate_network:
- driver: bridge
- name: substrate_network
docker-compose-tests-parachain.ymldiffbeforeafterboth--- /dev/null
+++ b/docker-compose-tests-parachain.yml
@@ -0,0 +1,60 @@
+version: "3.5"
+
+services:
+ blockchain_nodes:
+ image: blockchain_nodes
+ container_name: blockchain_nodes
+ ports:
+ - 9944:9944
+ - 9844:9844
+ - 9933:9933
+ build:
+ context: ./
+ dockerfile: Dockerfile-parachain
+ args:
+ - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
+ - RUST_C=${RUST_C:?err}
+ - POLKA_VERSION=${POLKA_VERSION:?err}
+ - NFT_BRANCH=${NFT_BRANCH:?err}
+ volumes:
+# - ./chain-data:/chain-data
+ - ./launch-config.json:/polkadot-launch/launch-config.json
+ - ./runtime_types.json:/polkadot-launch/runtime_types.json
+ env_file:
+ - ./.env
+ networks:
+ - node_test_network
+ #command: bash -c "yarn --cwd polkadot-launch start"
+ #command: bash -c 'while true; do sleep 60; df -h; done'
+
+ integration_tests:
+ container_name: integration_tests
+ image: integration_tests
+ build:
+ context: ./
+ dockerfile: Dockerfile-tests
+ volumes:
+ - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts
+ - /home/ubuntu/mochawesome-report:/nft_parachain/tests/mochawesome-report
+# command: bash -c 'while true; do sleep 20; df -h; done'
+ networks:
+ - node_test_network
+ depends_on:
+ - blockchain_nodes
+
+# unit_tests:
+# container_name: unit_test
+# image: nft_unit_test
+# build:
+# context: ./
+# dockerfile: Dockerfile-unit
+# container_name: unit_test
+# networks:
+# - node_test_network
+ # command: bash -c 'while true; do sleep 20; df -h; done'
+# command: bash -c 'cargo test'
+
+networks:
+ node_test_network:
+ name: node_test_network
+ driver: bridge
docker-compose-tests.ymldiffbeforeafterboth--- a/docker-compose-tests.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-version: "3.5"
-
-services:
- node_validator1:
- image: nft_node_test
- container_name: validator1_test
- ports:
- - 9944:9944
- build:
- context: ./
- dockerfile: Dockerfile
-# volumes:
-# - ./chain-data:/chain-data
- networks:
- - node_test_network
- command: bash -c "/usr/local/bin/nft --dev --tmp --ws-external --rpc-external"
-
- integration_tests:
- container_name: integration_test
- image: int_test
- build:
- context: ./
- dockerfile: Dockerfile-tests
- volumes:
- - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts
- - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report
- # command: bash -c 'while true; do sleep 20; df -h; done'
- networks:
- - node_test_network
- depends_on:
- - node_validator1
-
- unit_tests:
- container_name: unit_test
- image: nft_unit_test
- build:
- context: ./
- dockerfile: Dockerfile-unit
- container_name: unit_test
- networks:
- - node_test_network
- # command: bash -c 'while true; do sleep 20; df -h; done'
- command: bash -c 'cargo test'
-
-networks:
- node_test_network:
- name: node_test_network
- driver: bridge
launch-config.jsondiffbeforeafterboth--- a/launch-config.json
+++ b/launch-config.json
@@ -66,7 +66,7 @@
"name": "alice",
"flags": [
"--rpc-cors=all",
- "--rpc-port=9933"
+ "--rpc-port=9933", "--unsafe-ws-external"
]
},
{
@@ -86,4 +86,4 @@
"hrmpChannels": [],
"types": "./runtime_types.json",
"finalization": false
-}
\ No newline at end of file
+}
node_build_test.ymldiffbeforeafterboth--- a/node_build_test.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build & test
-
-# Controls when the action will run.
-on:
- # Triggers the workflow on push or pull request events but only for the master branch
- push:
- branches: [ develop ]
- # pull_request:
- # branches: [ develop ]
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
- build:
- # The type of runner that the job will run on
- runs-on: ubuntu-20.04
-
- # if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
-
- # Steps represent a sequence of tasks that will be executed as part of the job
- steps:
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- - uses: actions/checkout@v2
-
- #runs ssh connection
- - name: Go to server
- uses: appleboy/ssh-action@master
- with:
- host: ${{ secrets.SERVER_IP }}
- username: ${{ secrets.SERVER_USERNAME }}
- key: ${{ secrets.KEY }}
- port: ${{ secrets.SERVER_PORT }}
- # command_timeout: 200m
- script: |
- eval $(ssh-agent -s)
- ssh-add /home/devops/.ssh/git_hub
- git clone git@github.com:usetech-llc/nft_private.git
- cd nft_private
- git checkout develop
- # git pull --all
- chmod +x ci_node.sh
- ./ci_node.sh
- rm -rf /home/polkadot/nft_private
\ No newline at end of file
purge-running-node.shdiffbeforeafterboth--- a/purge-running-node.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-docker-compose exec node nft purge-chain --dev --base-path=/chain-data -y
-docker-compose down
-docker-compose up -d
run-testnet-local-node.shdiffbeforeafterboth--- a/run-testnet-local-node.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-BOOTNODES="--bootnodes /ip4/212.248.19.53/tcp/30334/p2p/12D3KooWHQDopuFB5krJGPQYn8Pg8i6toMeZFHGMs6sUPPmv4RhP";
-
-./target/debug/nft \
- --base-path ./chain-data \
- --chain ./nftTestnetSpecRaw.json \
- -lruntime \
- $BOOTNODES;
run-testnet.shdiffbeforeafterboth--- a/run-testnet.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-# ls -la /nft_parachain/target/release
-
-# /usr/local/bin/nft --dev --ws-external --rpc-external --base-path=/chain-data -lwarn,runtime
-
-echo Running node $NODE
-echo P2P Port : $P2PPORT
-echo WebSocket Port : $WSPORT
-echo RPC Port : $RPCPORT
-
-echo Boot = $BOOTNODE
-echo Validator = $VALIDATOR
-
-if [ "$BOOTNODE" = True ];
-then
-echo This is a Bootnode;
-BOOTNODES="";
-NODEKEY="--node-key-file einstein_key_file";
-else
-echo Bootnode Port : $BOOTPORT;
-echo Bootnode PeerID : $BOOTID;
-BOOTNODES="--bootnodes /dns4/node_einstein/tcp/$BOOTPORT/p2p/$BOOTID";
-NODEKEY="";
-fi
-
-if [ "$VALIDATOR" = True ];
-then
-echo This is a Validator node;
-/usr/local/bin/nft \
- --base-path /chain-data \
- --chain ./nftTestnetSpecRaw.json \
- --port $P2PPORT \
- --ws-port $WSPORT \
- --rpc-port $RPCPORT \
- --validator \
- --rpc-methods=Unsafe \
- --name $NODE \
- --ws-external \
- --rpc-external \
- -lruntime \
- $BOOTNODES \
- $NODEKEY;
-else
-echo This is a Gateway node;
-/usr/local/bin/nft \
- --base-path /chain-data \
- --chain ./nftTestnetSpecRaw.json \
- --port $P2PPORT \
- --ws-port $WSPORT \
- --rpc-port $RPCPORT \
- --name $NODE \
- --ws-external \
- --ws-max-connections 10000 \
- --rpc-cors all \
- -lruntime \
- $BOOTNODES;
-fi
tests/package-lock.jsondiffbeforeafterbothno changes
tests/src/config_docker.tsdiffbeforeafterboth--- a/tests/src/config_docker.ts
+++ b/tests/src/config_docker.ts
@@ -7,6 +7,7 @@
const config = {
substrateUrl: process.env.substrateUrl || 'ws://172.17.0.1:9944',
+ frontierUrl: process.env.frontierUrl || 'http://172.17.0.1:9933',
};
-export default config;
\ No newline at end of file
+export default config;
upload_secrets.shdiffbeforeafterboth--- a/upload_secrets.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-scp -P 8022 ./einstein_key_file developer@212.248.19.53:~/nft_parachain/einstein_key_file
-
-scp -P 8022 ./einstein_store_key.json developer@212.248.19.53:~/nft_parachain/einstein_store_key.json
-scp -P 8022 ./newton_store_key.json developer@212.248.19.53:~/nft_parachain/newton_store_key.json
-
-scp -P 8022 ./einstein_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/einstein_store_key_grandpa.json
-scp -P 8022 ./newton_store_key_grandpa.json developer@212.248.19.53:~/nft_parachain/newton_store_key_grandpa.json