Merge branch 'stable' of github.com:paritytech/parity into stable
This commit is contained in:
5chdn
commit
e3d32a4abb
691
.gitlab-ci.yml
691
.gitlab-ci.yml
@ -4,485 +4,163 @@ stages:
|
|||||||
- push-release
|
- push-release
|
||||||
- build
|
- build
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: "3"
|
|
||||||
SIMPLECOV: "true"
|
|
||||||
RUST_BACKTRACE: "1"
|
RUST_BACKTRACE: "1"
|
||||||
RUSTFLAGS: ""
|
RUSTFLAGS: ""
|
||||||
CARGOFLAGS: ""
|
CARGOFLAGS: ""
|
||||||
CI_SERVER_NAME: "GitLab CI"
|
CI_SERVER_NAME: "GitLab CI"
|
||||||
|
LIBSSL: "libssl1.0.0 (>=1.0.0)"
|
||||||
|
CARGO_HOME: "$CI_PROJECT_DIR"
|
||||||
cache:
|
cache:
|
||||||
key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
|
key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
|
||||||
|
paths:
|
||||||
|
- target
|
||||||
untracked: true
|
untracked: true
|
||||||
linux-stable:
|
linux-stable:
|
||||||
stage: build
|
stage: build
|
||||||
image: parity/rust:gitlab-ci
|
image: parity/rust:gitlab-ci
|
||||||
only:
|
only:
|
||||||
|
- stable
|
||||||
- beta
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- stable
|
|
||||||
- triggers
|
- triggers
|
||||||
script:
|
script:
|
||||||
- rustup default stable
|
- rustup default stable
|
||||||
- cargo build -j $(nproc) --release --features final $CARGOFLAGS
|
# ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags
|
||||||
- cargo build -j $(nproc) --release -p evmbin
|
- scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++
|
||||||
- cargo build -j $(nproc) --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --release -p ethkey-cli
|
|
||||||
- strip target/release/parity
|
|
||||||
- strip target/release/parity-evm
|
|
||||||
- strip target/release/ethstore
|
|
||||||
- strip target/release/ethkey
|
|
||||||
- export SHA3=$(target/release/parity tools hash target/release/parity)
|
|
||||||
- md5sum target/release/parity > parity.md5
|
|
||||||
- sh scripts/deb-build.sh amd64
|
|
||||||
- cp target/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_amd64.deb"
|
|
||||||
- md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
|
|
||||||
tags:
|
tags:
|
||||||
- rust
|
|
||||||
- rust-stable
|
- rust-stable
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- target/release/parity
|
- parity.zip
|
||||||
- target/release/parity-evm
|
|
||||||
- target/release/ethstore
|
|
||||||
- target/release/ethkey
|
|
||||||
name: "stable-x86_64-unknown-linux-gnu_parity"
|
name: "stable-x86_64-unknown-linux-gnu_parity"
|
||||||
|
linux-stable-debian:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-debian:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- export LIBSSL="libssl1.1 (>=1.1.0)"
|
||||||
|
- scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++
|
||||||
|
tags:
|
||||||
|
- rust-debian
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "stable-x86_64-unknown-debian-gnu_parity"
|
||||||
|
linux-centos:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-centos:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++
|
||||||
|
tags:
|
||||||
|
- rust-centos
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "x86_64-unknown-centos-gnu_parity"
|
||||||
|
linux-i686:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-i686:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++
|
||||||
|
tags:
|
||||||
|
- rust-i686
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "i686-unknown-linux-gnu"
|
||||||
|
linux-armv7:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-armv7:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
|
||||||
|
tags:
|
||||||
|
- rust-arm
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "armv7_unknown_linux_gnueabihf_parity"
|
||||||
|
linux-arm:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-arm:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
|
||||||
|
tags:
|
||||||
|
- rust-arm
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "arm-unknown-linux-gnueabihf_parity"
|
||||||
|
linux-aarch64:
|
||||||
|
stage: build
|
||||||
|
image: parity/rust-arm64:gitlab-ci
|
||||||
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
|
- tags
|
||||||
|
- triggers
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++
|
||||||
|
tags:
|
||||||
|
- rust-arm
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- parity.zip
|
||||||
|
name: "aarch64-unknown-linux-gnu_parity"
|
||||||
linux-snap:
|
linux-snap:
|
||||||
stage: build
|
stage: build
|
||||||
image: parity/snapcraft:gitlab-ci
|
image: parity/snapcraft:gitlab-ci
|
||||||
only:
|
only:
|
||||||
- snap
|
- stable
|
||||||
- beta
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- triggers
|
- triggers
|
||||||
script:
|
script:
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
- scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++
|
||||||
- cd snap
|
|
||||||
- rm -rf *snap
|
|
||||||
- sed -i 's/master/'"$VER"'/g' snapcraft.yaml
|
|
||||||
- echo "Version:"$VER
|
|
||||||
- snapcraft
|
|
||||||
- ls
|
|
||||||
- cp "parity_"$CI_BUILD"_REF_NAME_amd64.snap" "parity_"$VER"_amd64.snap"
|
|
||||||
- md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap" --body "parity_"$VER"_amd64.snap"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap.md5" --body "parity_"$VER"_amd64.snap.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
|
|
||||||
tags:
|
tags:
|
||||||
- rust
|
|
||||||
- rust-stable
|
- rust-stable
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- scripts/parity_*_amd64.snap
|
- scripts/parity_*_amd64.snap
|
||||||
name: "stable-x86_64-unknown-snap-gnu_parity"
|
name: "stable-x86_64-unknown-snap-gnu_parity"
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
linux-stable-debian:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-debian:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- cargo build -j $(nproc) --release --features final $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --release -p ethkey-cli
|
|
||||||
- strip target/release/parity
|
|
||||||
- strip target/release/parity-evm
|
|
||||||
- strip target/release/ethstore
|
|
||||||
- strip target/release/ethkey
|
|
||||||
- export SHA3=$(target/release/parity tools hash target/release/parity)
|
|
||||||
- md5sum target/release/parity > parity.md5
|
|
||||||
- sh scripts/deb-build.sh amd64
|
|
||||||
- cp target/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_amd64.deb"
|
|
||||||
- md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-debian
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/release/parity
|
|
||||||
name: "stable-x86_64-unknown-debian-gnu_parity"
|
|
||||||
linux-beta:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- rustup default beta
|
|
||||||
- cargo build -j $(nproc) --release $CARGOFLAGS
|
|
||||||
- strip target/release/parity
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-beta
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/release/parity
|
|
||||||
name: "beta-x86_64-unknown-linux-gnu_parity"
|
|
||||||
allow_failure: true
|
|
||||||
linux-nightly:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- rustup default nightly
|
|
||||||
- cargo build -j $(nproc) --release $CARGOFLAGS
|
|
||||||
- strip target/release/parity
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-nightly
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/release/parity
|
|
||||||
name: "nigthly-x86_64-unknown-linux-gnu_parity"
|
|
||||||
allow_failure: true
|
|
||||||
linux-centos:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-centos:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- export CXX="g++"
|
|
||||||
- export CC="gcc"
|
|
||||||
- export PLATFORM=x86_64-unknown-centos-gnu
|
|
||||||
- cargo build -j $(nproc) --release --features final $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --release -p ethkey-cli
|
|
||||||
- strip target/release/parity
|
|
||||||
- strip target/release/parity-evm
|
|
||||||
- strip target/release/ethstore
|
|
||||||
- strip target/release/ethkey
|
|
||||||
- md5sum target/release/parity > parity.md5
|
|
||||||
- md5sum target/release/parity-evm > parity-evm.md5
|
|
||||||
- md5sum target/release/ethstore > ethstore.md5
|
|
||||||
- md5sum target/release/ethkey > ethkey.md5
|
|
||||||
- export SHA3=$(target/release/parity tools hash target/release/parity)
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm --body target/release/parity-evm
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm.md5 --body parity-evm.md5
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore --body target/release/ethstore
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore.md5 --body ethstore.md5
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey --body target/release/ethkey
|
|
||||||
- aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey.md5 --body ethkey.md5
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-centos
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/release/parity
|
|
||||||
name: "x86_64-unknown-centos-gnu_parity"
|
|
||||||
linux-i686:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-i686:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- export HOST_CC=gcc
|
|
||||||
- export HOST_CXX=g++
|
|
||||||
- export COMMIT=$(git rev-parse HEAD)
|
|
||||||
- export PLATFORM=i686-unknown-linux-gnu
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
|
|
||||||
- strip target/$PLATFORM/release/parity
|
|
||||||
- strip target/$PLATFORM/release/parity-evm
|
|
||||||
- strip target/$PLATFORM/release/ethstore
|
|
||||||
- strip target/$PLATFORM/release/ethkey
|
|
||||||
- strip target/$PLATFORM/release/parity
|
|
||||||
- md5sum target/$PLATFORM/release/parity > parity.md5
|
|
||||||
- export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
|
|
||||||
- sh scripts/deb-build.sh i386
|
|
||||||
- cp target/$PLATFORM/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_i386.deb"
|
|
||||||
- md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-i686
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/i686-unknown-linux-gnu/release/parity
|
|
||||||
name: "i686-unknown-linux-gnu"
|
|
||||||
allow_failure: true
|
|
||||||
linux-armv7:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-armv7:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- export CC=arm-linux-gnueabihf-gcc
|
|
||||||
- export CXX=arm-linux-gnueabihf-g++
|
|
||||||
- export HOST_CC=gcc
|
|
||||||
- export HOST_CXX=g++
|
|
||||||
- export PLATFORM=armv7-unknown-linux-gnueabihf
|
|
||||||
- rm -rf .cargo
|
|
||||||
- mkdir -p .cargo
|
|
||||||
- echo "[target.$PLATFORM]" >> .cargo/config
|
|
||||||
- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
|
|
||||||
- cat .cargo/config
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
|
|
||||||
- md5sum target/$PLATFORM/release/parity > parity.md5
|
|
||||||
- export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
|
|
||||||
- sh scripts/deb-build.sh i386
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
|
|
||||||
- export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
|
|
||||||
- md5sum target/$PLATFORM/release/parity > parity.md5
|
|
||||||
- sh scripts/deb-build.sh armhf
|
|
||||||
- cp target/$PLATFORM/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_armhf.deb"
|
|
||||||
- md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-arm
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/armv7-unknown-linux-gnueabihf/release/parity
|
|
||||||
name: "armv7_unknown_linux_gnueabihf_parity"
|
|
||||||
allow_failure: true
|
|
||||||
linux-arm:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-arm:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- export CC=arm-linux-gnueabihf-gcc
|
|
||||||
- export CXX=arm-linux-gnueabihf-g++
|
|
||||||
- export HOST_CC=gcc
|
|
||||||
- export HOST_CXX=g++
|
|
||||||
- export PLATFORM=arm-unknown-linux-gnueabihf
|
|
||||||
- rm -rf .cargo
|
|
||||||
- mkdir -p .cargo
|
|
||||||
- echo "[target.$PLATFORM]" >> .cargo/config
|
|
||||||
- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
|
|
||||||
- cat .cargo/config
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
|
|
||||||
- arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
|
|
||||||
- export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
|
|
||||||
- md5sum target/$PLATFORM/release/parity > parity.md5
|
|
||||||
- sh scripts/deb-build.sh armhf
|
|
||||||
- cp target/$PLATFORM/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_armhf.deb"
|
|
||||||
- md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-arm
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/arm-unknown-linux-gnueabihf/release/parity
|
|
||||||
name: "arm-unknown-linux-gnueabihf_parity"
|
|
||||||
allow_failure: true
|
|
||||||
linux-aarch64:
|
|
||||||
stage: build
|
|
||||||
image: parity/rust-arm64:gitlab-ci
|
|
||||||
only:
|
|
||||||
- beta
|
|
||||||
- tags
|
|
||||||
- stable
|
|
||||||
- triggers
|
|
||||||
script:
|
|
||||||
- export CC=aarch64-linux-gnu-gcc
|
|
||||||
- export CXX=aarch64-linux-gnu-g++
|
|
||||||
- export HOST_CC=gcc
|
|
||||||
- export HOST_CXX=g++
|
|
||||||
- export PLATFORM=aarch64-unknown-linux-gnu
|
|
||||||
- rm -rf .cargo
|
|
||||||
- mkdir -p .cargo
|
|
||||||
- echo "[target.$PLATFORM]" >> .cargo/config
|
|
||||||
- echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
|
|
||||||
- cat .cargo/config
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
|
|
||||||
- cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
|
|
||||||
- aarch64-linux-gnu-strip target/$PLATFORM/release/parity
|
|
||||||
- aarch64-linux-gnu-strip target/$PLATFORM/release/parity-evm
|
|
||||||
- aarch64-linux-gnu-strip target/$PLATFORM/release/ethstore
|
|
||||||
- aarch64-linux-gnu-strip target/$PLATFORM/release/ethkey
|
|
||||||
- export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
|
|
||||||
- md5sum target/$PLATFORM/release/parity > parity.md5
|
|
||||||
- sh scripts/deb-build.sh arm64
|
|
||||||
- cp target/$PLATFORM/release/parity deb/usr/bin/parity
|
|
||||||
- cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
|
|
||||||
- cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
|
|
||||||
- cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
|
|
||||||
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
- dpkg-deb -b deb "parity_"$VER"_arm64.deb"
|
|
||||||
- md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
|
|
||||||
- aws configure set aws_access_key_id $s3_key
|
|
||||||
- aws configure set aws_secret_access_key $s3_secret
|
|
||||||
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
|
|
||||||
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-arm
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- target/aarch64-unknown-linux-gnu/release/parity
|
|
||||||
name: "aarch64-unknown-linux-gnu_parity"
|
|
||||||
allow_failure: true
|
|
||||||
darwin:
|
darwin:
|
||||||
stage: build
|
stage: build
|
||||||
only:
|
only:
|
||||||
|
- stable
|
||||||
- beta
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- stable
|
|
||||||
- triggers
|
- triggers
|
||||||
script: |
|
script:
|
||||||
export COMMIT=$(git rev-parse HEAD)
|
- scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++
|
||||||
export PLATFORM=x86_64-apple-darwin
|
|
||||||
rustup default stable
|
|
||||||
cargo clean
|
|
||||||
cargo build -j 8 --features final --release #$CARGOFLAGS
|
|
||||||
cargo build -j 8 --release -p ethstore-cli #$CARGOFLAGS
|
|
||||||
cargo build -j 8 --release -p ethkey-cli #$CARGOFLAGS
|
|
||||||
cargo build -j 8 --release -p evmbin #$CARGOFLAGS
|
|
||||||
rm -rf parity.md5
|
|
||||||
md5sum target/release/parity > parity.md5
|
|
||||||
export SHA3=$(target/release/parity tools hash target/release/parity)
|
|
||||||
cd mac
|
|
||||||
xcodebuild -configuration Release
|
|
||||||
cd ..
|
|
||||||
packagesbuild -v mac/Parity.pkgproj
|
|
||||||
productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
|
|
||||||
export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
|
|
||||||
mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-macos-installer.pkg"
|
|
||||||
md5sum "parity-"$VER"-macos-installer.pkg" >> "parity-"$VER"-macos-installer.pkg.md5"
|
|
||||||
aws configure set aws_access_key_id $s3_key
|
|
||||||
aws configure set aws_secret_access_key $s3_secret
|
|
||||||
if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
|
|
||||||
aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
|
|
||||||
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
|
|
||||||
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg" --body "parity-"$VER"-macos-installer.pkg"
|
|
||||||
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg.md5" --body "parity-"$VER"-macos-installer.pkg.md5"
|
|
||||||
curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
|
||||||
tags:
|
tags:
|
||||||
- osx
|
- osx
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- target/release/parity
|
- parity.zip
|
||||||
name: "x86_64-apple-darwin_parity"
|
name: "x86_64-apple-darwin_parity"
|
||||||
windows:
|
windows:
|
||||||
cache:
|
cache:
|
||||||
@ -490,80 +168,32 @@ windows:
|
|||||||
untracked: true
|
untracked: true
|
||||||
stage: build
|
stage: build
|
||||||
only:
|
only:
|
||||||
|
- stable
|
||||||
- beta
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- stable
|
|
||||||
- triggers
|
- triggers
|
||||||
script:
|
script:
|
||||||
- set PLATFORM=x86_64-pc-windows-msvc
|
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" ""
|
||||||
- set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
|
|
||||||
- set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
|
|
||||||
- set RUST_BACKTRACE=1
|
|
||||||
- set RUSTFLAGS=%RUSTFLAGS%
|
|
||||||
- rustup default stable-x86_64-pc-windows-msvc
|
|
||||||
- cargo clean
|
|
||||||
- cargo build --features final --release #%CARGOFLAGS%
|
|
||||||
- cargo build --release -p ethstore-cli #%CARGOFLAGS%
|
|
||||||
- cargo build --release -p ethkey-cli #%CARGOFLAGS%
|
|
||||||
- cargo build --release -p evmbin #%CARGOFLAGS%
|
|
||||||
- signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
|
|
||||||
- target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
|
|
||||||
- set /P SHA3=<parity.sha3
|
|
||||||
- curl -sL --url "https://github.com/paritytech/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
|
|
||||||
- curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
|
|
||||||
- msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
|
|
||||||
- signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
|
|
||||||
- cd nsis
|
|
||||||
- makensis.exe installer.nsi
|
|
||||||
- copy installer.exe InstallParity.exe
|
|
||||||
- signtool sign /f %keyfile% /p %certpass% InstallParity.exe
|
|
||||||
- md5sums InstallParity.exe > InstallParity.exe.md5
|
|
||||||
- zip win-installer.zip InstallParity.exe InstallParity.exe.md5
|
|
||||||
- md5sums win-installer.zip > win-installer.zip.md5
|
|
||||||
- cd ..\target\release\
|
|
||||||
- md5sums parity.exe > parity.exe.md5
|
|
||||||
- zip parity.zip parity.exe parity.md5
|
|
||||||
- md5sums parity.zip > parity.zip.md5
|
|
||||||
- cd ..\..
|
|
||||||
- aws configure set aws_access_key_id %s3_key%
|
|
||||||
- aws configure set aws_secret_access_key %s3_secret%
|
|
||||||
- echo %CI_BUILD_REF_NAME%
|
|
||||||
- echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
|
|
||||||
- echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
|
|
||||||
- echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
|
|
||||||
- echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
|
|
||||||
- echo %S3_BUCKET%
|
|
||||||
- aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
|
|
||||||
- aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
|
|
||||||
- curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1337/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
|
|
||||||
- curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1338/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
|
|
||||||
tags:
|
tags:
|
||||||
- rust-windows
|
- rust-windows
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- target/release/parity.exe
|
- parity.zip
|
||||||
- target/release/parity.pdb
|
|
||||||
- nsis/InstallParity.exe
|
|
||||||
name: "x86_64-pc-windows-msvc_parity"
|
name: "x86_64-pc-windows-msvc_parity"
|
||||||
docker-build:
|
docker-build:
|
||||||
stage: build
|
stage: build
|
||||||
only:
|
only:
|
||||||
|
- stable
|
||||||
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- triggers
|
- triggers
|
||||||
before_script:
|
before_script:
|
||||||
- docker info
|
- docker info
|
||||||
script:
|
script:
|
||||||
- if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
|
- DOCKER_TAG=$CI_BUILD_REF_NAME
|
||||||
- echo "Tag:" $DOCKER_TAG
|
- echo "Tag:" $DOCKER_TAG
|
||||||
- docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
|
- docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
|
||||||
- sh scripts/docker-build.sh $DOCKER_TAG
|
- scripts/docker-build.sh $DOCKER_TAG
|
||||||
- docker logout
|
- docker logout
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
@ -572,65 +202,16 @@ test-coverage:
|
|||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
script:
|
script:
|
||||||
- git submodule update --init --recursive
|
- scripts/gitlab-test.sh test-coverage
|
||||||
- rm -rf target/*
|
|
||||||
- rm -rf js/.coverage
|
|
||||||
- scripts/cov.sh
|
|
||||||
# - COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/cov/index.json | grep "[0-9]*\.[0-9]" -o)
|
|
||||||
# - echo "Coverage:" $COVERAGE
|
|
||||||
tags:
|
tags:
|
||||||
- kcov
|
- kcov
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
test-darwin:
|
|
||||||
stage: test
|
|
||||||
only:
|
|
||||||
- triggers
|
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e "^js/" -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
|
|
||||||
script:
|
|
||||||
- export RUST_BACKTRACE=1
|
|
||||||
- if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
|
|
||||||
tags:
|
|
||||||
- osx
|
|
||||||
allow_failure: true
|
|
||||||
test-windows:
|
|
||||||
stage: test
|
|
||||||
only:
|
|
||||||
- triggers
|
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
script:
|
|
||||||
- set RUST_BACKTRACE=1
|
|
||||||
- echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p parity-dapps -p parity-rpc -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity-rpc-client -p parity %CARGOFLAGS% --verbose --release
|
|
||||||
tags:
|
|
||||||
- rust-windows
|
|
||||||
allow_failure: true
|
|
||||||
test-rust-stable:
|
test-rust-stable:
|
||||||
stage: test
|
stage: test
|
||||||
image: parity/rust:gitlab-ci
|
image: parity/rust:gitlab-ci
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
|
|
||||||
script:
|
script:
|
||||||
- rustup show
|
- scripts/gitlab-test.sh stable
|
||||||
- export RUST_BACKTRACE=1
|
|
||||||
- if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
|
|
||||||
- if [ "$CI_BUILD_REF_NAME" == "nightly" ]; then sh scripts/aura-test.sh; fi
|
|
||||||
tags:
|
tags:
|
||||||
- rust
|
|
||||||
- rust-stable
|
|
||||||
js-test:
|
|
||||||
stage: test
|
|
||||||
image: parity/rust:gitlab-ci
|
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
|
|
||||||
- if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
|
|
||||||
script:
|
|
||||||
- if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi
|
|
||||||
tags:
|
|
||||||
- rust
|
|
||||||
- rust-stable
|
- rust-stable
|
||||||
test-rust-beta:
|
test-rust-beta:
|
||||||
stage: test
|
stage: test
|
||||||
@ -638,15 +219,9 @@ test-rust-beta:
|
|||||||
- triggers
|
- triggers
|
||||||
- master
|
- master
|
||||||
image: parity/rust:gitlab-ci
|
image: parity/rust:gitlab-ci
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
|
|
||||||
script:
|
script:
|
||||||
- rustup default beta
|
- scripts/gitlab-test.sh beta
|
||||||
- export RUST_BACKTRACE=1
|
|
||||||
- if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
|
|
||||||
tags:
|
tags:
|
||||||
- rust
|
|
||||||
- rust-beta
|
- rust-beta
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
test-rust-nightly:
|
test-rust-nightly:
|
||||||
@ -655,34 +230,30 @@ test-rust-nightly:
|
|||||||
- triggers
|
- triggers
|
||||||
- master
|
- master
|
||||||
image: parity/rust:gitlab-ci
|
image: parity/rust:gitlab-ci
|
||||||
before_script:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
|
|
||||||
script:
|
script:
|
||||||
- rustup default nightly
|
- scripts/gitlab-test.sh nightly
|
||||||
- export RUST_BACKTRACE=1
|
|
||||||
- if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
|
|
||||||
tags:
|
tags:
|
||||||
- rust
|
- rust
|
||||||
- rust-nightly
|
- rust-nightly
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
js-test:
|
||||||
|
stage: test
|
||||||
|
image: parity/rust:gitlab-ci
|
||||||
|
script:
|
||||||
|
- scripts/gitlab-test.sh js-test
|
||||||
|
tags:
|
||||||
|
- rust-stable
|
||||||
js-release:
|
js-release:
|
||||||
stage: js-build
|
stage: js-build
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- beta
|
|
||||||
- stable
|
- stable
|
||||||
|
- beta
|
||||||
- tags
|
- tags
|
||||||
- triggers
|
- triggers
|
||||||
image: parity/rust:gitlab-ci
|
image: parity/rust:gitlab-ci
|
||||||
before_script:
|
|
||||||
- export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
|
|
||||||
- echo $JS_FILES_MODIFIED
|
|
||||||
- if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
|
|
||||||
script:
|
script:
|
||||||
- rustup default stable
|
- scripts/gitlab-test.sh js-release
|
||||||
- echo $JS_FILES_MODIFIED
|
|
||||||
- if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
|
|
||||||
tags:
|
tags:
|
||||||
- javascript
|
- javascript
|
||||||
push-release:
|
push-release:
|
||||||
|
|||||||
63
Cargo.lock
generated
63
Cargo.lock
generated
@ -363,7 +363,7 @@ dependencies = [
|
|||||||
"bloomable 0.1.0",
|
"bloomable 0.1.0",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -577,7 +577,7 @@ dependencies = [
|
|||||||
"ethcore-ipc-nano 1.8.0",
|
"ethcore-ipc-nano 1.8.0",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-stratum 1.8.0",
|
"ethcore-stratum 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"ethstore 0.1.0",
|
"ethstore 0.1.0",
|
||||||
@ -673,7 +673,7 @@ version = "1.8.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-devtools 1.8.0",
|
"ethcore-devtools 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
|
"nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
|
||||||
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
@ -723,7 +723,7 @@ dependencies = [
|
|||||||
"ethcore-ipc 1.8.0",
|
"ethcore-ipc 1.8.0",
|
||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-ipc-nano 1.8.0",
|
"ethcore-ipc-nano 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
|
"nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
|
||||||
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -742,7 +742,7 @@ dependencies = [
|
|||||||
"ethcore-ipc 1.8.0",
|
"ethcore-ipc 1.8.0",
|
||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-network 1.8.0",
|
"ethcore-network 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"evm 0.1.0",
|
"evm 0.1.0",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
@ -794,7 +794,7 @@ dependencies = [
|
|||||||
"ethcore-devtools 1.8.0",
|
"ethcore-devtools 1.8.0",
|
||||||
"ethcore-io 1.8.0",
|
"ethcore-io 1.8.0",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethcrypto 0.1.0",
|
"ethcrypto 0.1.0",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
@ -829,7 +829,7 @@ dependencies = [
|
|||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-ipc-nano 1.8.0",
|
"ethcore-ipc-nano 1.8.0",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethcrypto 0.1.0",
|
"ethcrypto 0.1.0",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -865,7 +865,7 @@ dependencies = [
|
|||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-ipc-nano 1.8.0",
|
"ethcore-ipc-nano 1.8.0",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
||||||
"jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
"jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
||||||
@ -878,7 +878,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ethcore-util"
|
name = "ethcore-util"
|
||||||
version = "1.8.6"
|
version = "1.8.7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
|
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -1013,7 +1013,7 @@ dependencies = [
|
|||||||
"ethcore-ipc-nano 1.8.0",
|
"ethcore-ipc-nano 1.8.0",
|
||||||
"ethcore-light 1.8.0",
|
"ethcore-light 1.8.0",
|
||||||
"ethcore-network 1.8.0",
|
"ethcore-network 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -1040,7 +1040,7 @@ dependencies = [
|
|||||||
"common-types 0.1.0",
|
"common-types 0.1.0",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"evmjit 1.8.0",
|
"evmjit 1.8.0",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
@ -1062,7 +1062,7 @@ dependencies = [
|
|||||||
"ethcore 1.8.0",
|
"ethcore 1.8.0",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"evm 0.1.0",
|
"evm 0.1.0",
|
||||||
"panic_hook 0.1.0",
|
"panic_hook 0.1.0",
|
||||||
@ -1360,7 +1360,7 @@ dependencies = [
|
|||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-ipc 1.8.0",
|
"ethcore-ipc 1.8.0",
|
||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -1871,7 +1871,7 @@ dependencies = [
|
|||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-io 1.8.0",
|
"ethcore-io 1.8.0",
|
||||||
"ethcore-network 1.8.0",
|
"ethcore-network 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"kvdb-memorydb 0.1.0",
|
"kvdb-memorydb 0.1.0",
|
||||||
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2070,7 +2070,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parity"
|
name = "parity"
|
||||||
version = "1.8.6"
|
version = "1.8.7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2094,7 +2094,7 @@ dependencies = [
|
|||||||
"ethcore-network 1.8.0",
|
"ethcore-network 1.8.0",
|
||||||
"ethcore-secretstore 1.0.0",
|
"ethcore-secretstore 1.0.0",
|
||||||
"ethcore-stratum 1.8.0",
|
"ethcore-stratum 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"ethsync 1.8.0",
|
"ethsync 1.8.0",
|
||||||
"fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2150,7 +2150,7 @@ dependencies = [
|
|||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-devtools 1.8.0",
|
"ethcore-devtools 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"fetch 0.1.0",
|
"fetch 0.1.0",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2212,7 +2212,7 @@ dependencies = [
|
|||||||
"ethabi 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"ethabi 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"fetch 0.1.0",
|
"fetch 0.1.0",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
@ -2234,7 +2234,7 @@ dependencies = [
|
|||||||
"ethcore 1.8.0",
|
"ethcore 1.8.0",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
||||||
"jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
"jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
|
||||||
"multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2248,7 +2248,7 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"ethcore 1.8.0",
|
"ethcore 1.8.0",
|
||||||
"ethcore-io 1.8.0",
|
"ethcore-io 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"kvdb 0.1.0",
|
"kvdb 0.1.0",
|
||||||
"kvdb-memorydb 0.1.0",
|
"kvdb-memorydb 0.1.0",
|
||||||
@ -2264,7 +2264,7 @@ name = "parity-machine"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2292,7 +2292,7 @@ dependencies = [
|
|||||||
"ethcore-light 1.8.0",
|
"ethcore-light 1.8.0",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-network 1.8.0",
|
"ethcore-network 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethcrypto 0.1.0",
|
"ethcrypto 0.1.0",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
@ -2374,7 +2374,7 @@ name = "parity-ui"
|
|||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"parity-ui-dev 1.8.0",
|
"parity-ui-dev 1.8.0",
|
||||||
"parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git?branch=beta)",
|
"parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git?branch=stable)",
|
||||||
"rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -2388,7 +2388,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "parity-ui-precompiled"
|
name = "parity-ui-precompiled"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
source = "git+https://github.com/paritytech/js-precompiled.git?branch=beta#26c6b48bfc83bb26445f6d72646773b6d5838fe4"
|
source = "git+https://github.com/paritytech/js-precompiled.git?branch=stable#bbc5b6c3e3a43ab21b94d37922cdbed766c7b5c8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
@ -2403,7 +2403,7 @@ dependencies = [
|
|||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-ipc 1.8.0",
|
"ethcore-ipc 1.8.0",
|
||||||
"ethcore-ipc-codegen 1.8.0",
|
"ethcore-ipc-codegen 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethsync 1.8.0",
|
"ethsync 1.8.0",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ipc-common-types 1.8.0",
|
"ipc-common-types 1.8.0",
|
||||||
@ -2810,7 +2810,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rocksdb"
|
name = "rocksdb"
|
||||||
version = "0.4.5"
|
version = "0.4.5"
|
||||||
source = "git+https://github.com/paritytech/rust-rocksdb#7adec2311d31387a832b0ef051472cdef906b480"
|
source = "git+https://github.com/paritytech/rust-rocksdb#ecf06adf3148ab10f6f7686b724498382ff4f36e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -2820,10 +2820,11 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rocksdb-sys"
|
name = "rocksdb-sys"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
source = "git+https://github.com/paritytech/rust-rocksdb#7adec2311d31387a832b0ef051472cdef906b480"
|
source = "git+https://github.com/paritytech/rust-rocksdb#ecf06adf3148ab10f6f7686b724498382ff4f36e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"snappy-sys 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
|
"snappy-sys 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -2866,7 +2867,7 @@ name = "rpc-cli"
|
|||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"parity-rpc 1.8.0",
|
"parity-rpc 1.8.0",
|
||||||
"parity-rpc-client 1.4.0",
|
"parity-rpc-client 1.4.0",
|
||||||
@ -3591,7 +3592,7 @@ dependencies = [
|
|||||||
"common-types 0.1.0",
|
"common-types 0.1.0",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-bytes 0.1.0",
|
"ethcore-bytes 0.1.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"evmjit 1.8.0",
|
"evmjit 1.8.0",
|
||||||
"hash 0.1.0",
|
"hash 0.1.0",
|
||||||
@ -3613,7 +3614,7 @@ dependencies = [
|
|||||||
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ethcore-bigint 0.1.3",
|
"ethcore-bigint 0.1.3",
|
||||||
"ethcore-logger 1.8.0",
|
"ethcore-logger 1.8.0",
|
||||||
"ethcore-util 1.8.6",
|
"ethcore-util 1.8.7",
|
||||||
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
"parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"vm 0.1.0",
|
"vm 0.1.0",
|
||||||
@ -3854,7 +3855,7 @@ dependencies = [
|
|||||||
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
|
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
|
||||||
"checksum parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddaeb8543c6823e93dae65a25eb8083ebfeee8f0000031119d7a0055b2e8fc63"
|
"checksum parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddaeb8543c6823e93dae65a25eb8083ebfeee8f0000031119d7a0055b2e8fc63"
|
||||||
"checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
|
"checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
|
||||||
"checksum parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git?branch=beta)" = "<none>"
|
"checksum parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git?branch=stable)" = "<none>"
|
||||||
"checksum parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8431a184ad88cfbcd71a792aaca319cc7203a94300c26b8dce2d0df0681ea87d"
|
"checksum parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8431a184ad88cfbcd71a792aaca319cc7203a94300c26b8dce2d0df0681ea87d"
|
||||||
"checksum parity-wordlist 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81451bfab101d186f8fc4a0aa13cb5539b31b02c4ed96425a0842e2a413daba6"
|
"checksum parity-wordlist 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81451bfab101d186f8fc4a0aa13cb5539b31b02c4ed96425a0842e2a413daba6"
|
||||||
"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
|
"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
description = "Parity Ethereum client"
|
description = "Parity Ethereum client"
|
||||||
name = "parity"
|
name = "parity"
|
||||||
version = "1.8.6"
|
version = "1.8.7"
|
||||||
license = "GPL-3.0"
|
license = "GPL-3.0"
|
||||||
authors = ["Parity Technologies <admin@parity.io>"]
|
authors = ["Parity Technologies <admin@parity.io>"]
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|||||||
@ -44,8 +44,7 @@ use bigint::hash::{H256, H520};
|
|||||||
use semantic_version::SemanticVersion;
|
use semantic_version::SemanticVersion;
|
||||||
use parking_lot::{Mutex, RwLock};
|
use parking_lot::{Mutex, RwLock};
|
||||||
use unexpected::{Mismatch, OutOfBounds};
|
use unexpected::{Mismatch, OutOfBounds};
|
||||||
use util::*;
|
use util::Address;
|
||||||
use bytes::Bytes;
|
|
||||||
|
|
||||||
mod finality;
|
mod finality;
|
||||||
|
|
||||||
@ -291,9 +290,11 @@ struct EpochVerifier {
|
|||||||
|
|
||||||
impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
|
impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
|
||||||
fn verify_light(&self, header: &Header) -> Result<(), Error> {
|
fn verify_light(&self, header: &Header) -> Result<(), Error> {
|
||||||
|
// Validate the timestamp
|
||||||
|
verify_timestamp(&*self.step, header_step(header)?)?;
|
||||||
// always check the seal since it's fast.
|
// always check the seal since it's fast.
|
||||||
// nothing heavier to do.
|
// nothing heavier to do.
|
||||||
verify_external(header, &self.subchain_validators, &*self.step, |_| {})
|
verify_external(header, &self.subchain_validators)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_finality_proof(&self, proof: &[u8]) -> Option<Vec<H256>> {
|
fn check_finality_proof(&self, proof: &[u8]) -> Option<Vec<H256>> {
|
||||||
@ -317,7 +318,7 @@ impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
|
|||||||
//
|
//
|
||||||
// `verify_external` checks that signature is correct and author == signer.
|
// `verify_external` checks that signature is correct and author == signer.
|
||||||
if header.seal().len() != 2 { return None }
|
if header.seal().len() != 2 { return None }
|
||||||
otry!(verify_external(header, &self.subchain_validators, &*self.step, |_| {}).ok());
|
otry!(verify_external(header, &self.subchain_validators).ok());
|
||||||
|
|
||||||
let newly_finalized = otry!(finality_checker.push_hash(header.hash(), header.author().clone()).ok());
|
let newly_finalized = otry!(finality_checker.push_hash(header.hash(), header.author().clone()).ok());
|
||||||
finalized.extend(newly_finalized);
|
finalized.extend(newly_finalized);
|
||||||
@ -327,16 +328,6 @@ impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Report misbehavior
|
|
||||||
#[derive(Debug)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
enum Report {
|
|
||||||
// Malicious behavior
|
|
||||||
Malicious(Address, BlockNumber, Bytes),
|
|
||||||
// benign misbehavior
|
|
||||||
Benign(Address, BlockNumber),
|
|
||||||
}
|
|
||||||
|
|
||||||
fn header_step(header: &Header) -> Result<usize, ::rlp::DecoderError> {
|
fn header_step(header: &Header) -> Result<usize, ::rlp::DecoderError> {
|
||||||
UntrustedRlp::new(&header.seal().get(0).expect("was either checked with verify_block_basic or is genesis; has 2 fields; qed (Make sure the spec file has a correct genesis seal)")).as_val()
|
UntrustedRlp::new(&header.seal().get(0).expect("was either checked with verify_block_basic or is genesis; has 2 fields; qed (Make sure the spec file has a correct genesis seal)")).as_val()
|
||||||
}
|
}
|
||||||
@ -355,22 +346,25 @@ fn is_step_proposer(validators: &ValidatorSet, bh: &H256, step: usize, address:
|
|||||||
step_proposer(validators, bh, step) == *address
|
step_proposer(validators, bh, step) == *address
|
||||||
}
|
}
|
||||||
|
|
||||||
fn verify_external<F: Fn(Report)>(header: &Header, validators: &ValidatorSet, step: &Step, report: F)
|
fn verify_timestamp(step: &Step, header_step: usize) -> Result<(), BlockError> {
|
||||||
-> Result<(), Error>
|
|
||||||
{
|
|
||||||
let header_step = header_step(header)?;
|
|
||||||
|
|
||||||
match step.check_future(header_step) {
|
match step.check_future(header_step) {
|
||||||
Err(None) => {
|
Err(None) => {
|
||||||
trace!(target: "engine", "verify_block_external: block from the future");
|
trace!(target: "engine", "verify_timestamp: block from the future");
|
||||||
report(Report::Benign(*header.author(), header.number()));
|
Err(BlockError::InvalidSeal.into())
|
||||||
return Err(BlockError::InvalidSeal.into())
|
|
||||||
},
|
},
|
||||||
Err(Some(oob)) => {
|
Err(Some(oob)) => {
|
||||||
trace!(target: "engine", "verify_block_external: block too early");
|
// NOTE This error might be returned only in early stage of verification (Stage 1).
|
||||||
return Err(BlockError::TemporarilyInvalid(oob).into())
|
// Returning it further won't recover the sync process.
|
||||||
|
trace!(target: "engine", "verify_timestamp: block too early");
|
||||||
|
Err(BlockError::TemporarilyInvalid(oob).into())
|
||||||
},
|
},
|
||||||
Ok(_) => {
|
Ok(_) => Ok(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_external(header: &Header, validators: &ValidatorSet) -> Result<(), Error> {
|
||||||
|
let header_step = header_step(header)?;
|
||||||
|
|
||||||
let proposer_signature = header_signature(header)?;
|
let proposer_signature = header_signature(header)?;
|
||||||
let correct_proposer = validators.get(header.parent_hash(), header_step);
|
let correct_proposer = validators.get(header.parent_hash(), header_step);
|
||||||
let is_invalid_proposer = *header.author() != correct_proposer ||
|
let is_invalid_proposer = *header.author() != correct_proposer ||
|
||||||
@ -382,8 +376,6 @@ fn verify_external<F: Fn(Report)>(header: &Header, validators: &ValidatorSet, st
|
|||||||
} else {
|
} else {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn combine_proofs(signal_number: BlockNumber, set_proof: &[u8], finality_proof: &[u8]) -> Vec<u8> {
|
fn combine_proofs(signal_number: BlockNumber, set_proof: &[u8], finality_proof: &[u8]) -> Vec<u8> {
|
||||||
@ -655,26 +647,38 @@ impl Engine<EthereumMachine> for AuthorityRound {
|
|||||||
/// Check the number of seal fields.
|
/// Check the number of seal fields.
|
||||||
fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
|
fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
|
||||||
if header.number() >= self.validate_score_transition && *header.difficulty() >= U256::from(U128::max_value()) {
|
if header.number() >= self.validate_score_transition && *header.difficulty() >= U256::from(U128::max_value()) {
|
||||||
Err(From::from(BlockError::DifficultyOutOfBounds(
|
return Err(From::from(BlockError::DifficultyOutOfBounds(
|
||||||
OutOfBounds { min: None, max: Some(U256::from(U128::max_value())), found: *header.difficulty() }
|
OutOfBounds { min: None, max: Some(U256::from(U128::max_value())), found: *header.difficulty() }
|
||||||
)))
|
)));
|
||||||
} else {
|
}
|
||||||
Ok(())
|
|
||||||
|
// TODO [ToDr] Should this go from epoch manager?
|
||||||
|
// If yes then probably benign reporting needs to be moved further in the verification.
|
||||||
|
let set_number = header.number();
|
||||||
|
|
||||||
|
match verify_timestamp(&*self.step, header_step(header)?) {
|
||||||
|
Err(BlockError::InvalidSeal) => {
|
||||||
|
self.validators.report_benign(header.author(), set_number, header.number());
|
||||||
|
Err(BlockError::InvalidSeal.into())
|
||||||
|
}
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
Ok(()) => Ok(()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Do the step and gas limit validation.
|
/// Do the step and gas limit validation.
|
||||||
fn verify_block_family(&self, header: &Header, parent: &Header) -> Result<(), Error> {
|
fn verify_block_family(&self, header: &Header, parent: &Header) -> Result<(), Error> {
|
||||||
let step = header_step(header)?;
|
let step = header_step(header)?;
|
||||||
|
|
||||||
let parent_step = header_step(parent)?;
|
let parent_step = header_step(parent)?;
|
||||||
|
// TODO [ToDr] Should this go from epoch manager?
|
||||||
|
let set_number = header.number();
|
||||||
|
|
||||||
// Ensure header is from the step after parent.
|
// Ensure header is from the step after parent.
|
||||||
if step == parent_step
|
if step == parent_step
|
||||||
|| (header.number() >= self.validate_step_transition && step <= parent_step) {
|
|| (header.number() >= self.validate_step_transition && step <= parent_step) {
|
||||||
trace!(target: "engine", "Multiple blocks proposed for step {}.", parent_step);
|
trace!(target: "engine", "Multiple blocks proposed for step {}.", parent_step);
|
||||||
|
|
||||||
self.validators.report_malicious(header.author(), header.number(), header.number(), Default::default());
|
self.validators.report_malicious(header.author(), set_number, header.number(), Default::default());
|
||||||
Err(EngineError::DoubleVote(header.author().clone()))?;
|
Err(EngineError::DoubleVote(header.author().clone()))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -687,7 +691,7 @@ impl Engine<EthereumMachine> for AuthorityRound {
|
|||||||
let skipped_primary = step_proposer(&*self.validators, &parent.hash(), s);
|
let skipped_primary = step_proposer(&*self.validators, &parent.hash(), s);
|
||||||
// Do not report this signer.
|
// Do not report this signer.
|
||||||
if skipped_primary != me {
|
if skipped_primary != me {
|
||||||
self.validators.report_benign(&skipped_primary, header.number(), header.number());
|
self.validators.report_benign(&skipped_primary, set_number, header.number());
|
||||||
}
|
}
|
||||||
// Stop reporting once validators start repeating.
|
// Stop reporting once validators start repeating.
|
||||||
if !reported.insert(skipped_primary) { break; }
|
if !reported.insert(skipped_primary) { break; }
|
||||||
@ -702,9 +706,8 @@ impl Engine<EthereumMachine> for AuthorityRound {
|
|||||||
// fetch correct validator set for current epoch, taking into account
|
// fetch correct validator set for current epoch, taking into account
|
||||||
// finality of previous transitions.
|
// finality of previous transitions.
|
||||||
let active_set;
|
let active_set;
|
||||||
|
let validators = if self.immediate_transitions {
|
||||||
let (validators, set_number) = if self.immediate_transitions {
|
&*self.validators
|
||||||
(&*self.validators, header.number())
|
|
||||||
} else {
|
} else {
|
||||||
// get correct validator set for epoch.
|
// get correct validator set for epoch.
|
||||||
let client = match self.client.read().as_ref().and_then(|weak| weak.upgrade()) {
|
let client = match self.client.read().as_ref().and_then(|weak| weak.upgrade()) {
|
||||||
@ -722,21 +725,12 @@ impl Engine<EthereumMachine> for AuthorityRound {
|
|||||||
}
|
}
|
||||||
|
|
||||||
active_set = epoch_manager.validators().clone();
|
active_set = epoch_manager.validators().clone();
|
||||||
(&active_set as &_, epoch_manager.epoch_transition_number)
|
&active_set as &_
|
||||||
};
|
|
||||||
|
|
||||||
// always report with "self.validators" so that the report actually gets
|
|
||||||
// to the contract.
|
|
||||||
let report = |report| match report {
|
|
||||||
Report::Benign(address, block_number) =>
|
|
||||||
self.validators.report_benign(&address, set_number, block_number),
|
|
||||||
Report::Malicious(address, block_number, proof) =>
|
|
||||||
self.validators.report_malicious(&address, set_number, block_number, proof),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// verify signature against fixed list, but reports should go to the
|
// verify signature against fixed list, but reports should go to the
|
||||||
// contract itself.
|
// contract itself.
|
||||||
verify_external(header, validators, &*self.step, report)
|
verify_external(header, validators)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn genesis_epoch_data(&self, header: &Header, call: &Call) -> Result<Vec<u8>, String> {
|
fn genesis_epoch_data(&self, header: &Header, call: &Call) -> Result<Vec<u8>, String> {
|
||||||
@ -1059,8 +1053,7 @@ mod tests {
|
|||||||
assert!(engine.verify_block_family(&header, &parent_header).is_ok());
|
assert!(engine.verify_block_family(&header, &parent_header).is_ok());
|
||||||
assert!(engine.verify_block_external(&header).is_ok());
|
assert!(engine.verify_block_external(&header).is_ok());
|
||||||
header.set_seal(vec![encode(&5usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
|
header.set_seal(vec![encode(&5usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
|
||||||
assert!(engine.verify_block_family(&header, &parent_header).is_ok());
|
assert!(engine.verify_block_basic(&header).is_err());
|
||||||
assert!(engine.verify_block_external(&header).is_err());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -1200,3 +1193,4 @@ mod tests {
|
|||||||
AuthorityRound::new(params, machine).unwrap();
|
AuthorityRound::new(params, machine).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -192,7 +192,7 @@ mod tests {
|
|||||||
header.set_number(2);
|
header.set_number(2);
|
||||||
header.set_parent_hash(client.chain_info().best_block_hash);
|
header.set_parent_hash(client.chain_info().best_block_hash);
|
||||||
// `reportBenign` when the designated proposer releases block from the future (bad clock).
|
// `reportBenign` when the designated proposer releases block from the future (bad clock).
|
||||||
assert!(client.engine().verify_block_external(&header).is_err());
|
assert!(client.engine().verify_block_basic(&header).is_err());
|
||||||
// Seal a block.
|
// Seal a block.
|
||||||
client.engine().step();
|
client.engine().step();
|
||||||
assert_eq!(client.chain_info().best_block_number, 1);
|
assert_eq!(client.chain_info().best_block_number, 1);
|
||||||
|
|||||||
@ -1409,7 +1409,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn should_not_trace_delegatecall() {
|
fn should_trace_delegatecall_properly() {
|
||||||
init_log();
|
init_log();
|
||||||
|
|
||||||
let mut state = get_temp_state();
|
let mut state = get_temp_state();
|
||||||
@ -1429,7 +1429,7 @@ mod tests {
|
|||||||
}.sign(&secret(), None);
|
}.sign(&secret(), None);
|
||||||
|
|
||||||
state.init_code(&0xa.into(), FromHex::from_hex("6000600060006000600b618000f4").unwrap()).unwrap();
|
state.init_code(&0xa.into(), FromHex::from_hex("6000600060006000600b618000f4").unwrap()).unwrap();
|
||||||
state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap()).unwrap();
|
state.init_code(&0xb.into(), FromHex::from_hex("60056000526001601ff3").unwrap()).unwrap();
|
||||||
let result = state.apply(&info, &machine, &t, true).unwrap();
|
let result = state.apply(&info, &machine, &t, true).unwrap();
|
||||||
|
|
||||||
let expected_trace = vec![FlatTrace {
|
let expected_trace = vec![FlatTrace {
|
||||||
@ -1444,23 +1444,23 @@ mod tests {
|
|||||||
call_type: CallType::Call,
|
call_type: CallType::Call,
|
||||||
}),
|
}),
|
||||||
result: trace::Res::Call(trace::CallResult {
|
result: trace::Res::Call(trace::CallResult {
|
||||||
gas_used: U256::from(721), // in post-eip150
|
gas_used: U256::from(736), // in post-eip150
|
||||||
output: vec![]
|
output: vec![]
|
||||||
}),
|
}),
|
||||||
}, FlatTrace {
|
}, FlatTrace {
|
||||||
trace_address: vec![0].into_iter().collect(),
|
trace_address: vec![0].into_iter().collect(),
|
||||||
subtraces: 0,
|
subtraces: 0,
|
||||||
action: trace::Action::Call(trace::Call {
|
action: trace::Action::Call(trace::Call {
|
||||||
from: "9cce34f7ab185c7aba1b7c8140d620b4bda941d6".into(),
|
from: 0xa.into(),
|
||||||
to: 0xa.into(),
|
to: 0xb.into(),
|
||||||
value: 0.into(),
|
value: 0.into(),
|
||||||
gas: 32768.into(),
|
gas: 32768.into(),
|
||||||
input: vec![],
|
input: vec![],
|
||||||
call_type: CallType::DelegateCall,
|
call_type: CallType::DelegateCall,
|
||||||
}),
|
}),
|
||||||
result: trace::Res::Call(trace::CallResult {
|
result: trace::Res::Call(trace::CallResult {
|
||||||
gas_used: 3.into(),
|
gas_used: 18.into(),
|
||||||
output: vec![],
|
output: vec![5],
|
||||||
}),
|
}),
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
|||||||
@ -77,13 +77,23 @@ pub struct Call {
|
|||||||
|
|
||||||
impl From<ActionParams> for Call {
|
impl From<ActionParams> for Call {
|
||||||
fn from(p: ActionParams) -> Self {
|
fn from(p: ActionParams) -> Self {
|
||||||
Call {
|
match p.call_type {
|
||||||
|
CallType::DelegateCall => Call {
|
||||||
|
from: p.address,
|
||||||
|
to: p.code_address,
|
||||||
|
value: p.value.value(),
|
||||||
|
gas: p.gas,
|
||||||
|
input: p.data.unwrap_or_else(Vec::new),
|
||||||
|
call_type: p.call_type,
|
||||||
|
},
|
||||||
|
_ => Call {
|
||||||
from: p.sender,
|
from: p.sender,
|
||||||
to: p.address,
|
to: p.address,
|
||||||
value: p.value.value(),
|
value: p.value.value(),
|
||||||
gas: p.gas,
|
gas: p.gas,
|
||||||
input: p.data.unwrap_or_else(Vec::new),
|
input: p.data.unwrap_or_else(Vec::new),
|
||||||
call_type: p.call_type,
|
call_type: p.call_type,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,8 @@
|
|||||||
0ACF9AC71E30FAB600D5C935 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0ACF9AC51E30FAB600D5C935 /* MainMenu.xib */; };
|
0ACF9AC71E30FAB600D5C935 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0ACF9AC51E30FAB600D5C935 /* MainMenu.xib */; };
|
||||||
0AE564F11E3CE42C00BD01F7 /* GetBSDProcessList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */; };
|
0AE564F11E3CE42C00BD01F7 /* GetBSDProcessList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */; };
|
||||||
0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0AED4D9F1E3E22F800BF87C0 /* ethstore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0AED4D9F1E3E22F800BF87C0 /* ethstore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||||
|
84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B2200E559900AD6E78 /* parity-evm */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||||
|
84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B5200E56AE00AD6E78 /* ethkey */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
/* Begin PBXCopyFilesBuildPhase section */
|
/* Begin PBXCopyFilesBuildPhase section */
|
||||||
@ -22,6 +24,8 @@
|
|||||||
dstPath = "";
|
dstPath = "";
|
||||||
dstSubfolderSpec = 6;
|
dstSubfolderSpec = 6;
|
||||||
files = (
|
files = (
|
||||||
|
84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */,
|
||||||
|
84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */,
|
||||||
0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */,
|
0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */,
|
||||||
0A7A475D1E3D2CDD0093D1AB /* parity in CopyFiles */,
|
0A7A475D1E3D2CDD0093D1AB /* parity in CopyFiles */,
|
||||||
);
|
);
|
||||||
@ -38,6 +42,8 @@
|
|||||||
0ACF9AC81E30FAB600D5C935 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
0ACF9AC81E30FAB600D5C935 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetBSDProcessList.swift; sourceTree = "<group>"; };
|
0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetBSDProcessList.swift; sourceTree = "<group>"; };
|
||||||
0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../target/release/ethstore; sourceTree = "<group>"; };
|
0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../target/release/ethstore; sourceTree = "<group>"; };
|
||||||
|
84CF92B2200E559900AD6E78 /* parity-evm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "parity-evm"; path = "../target/release/parity-evm"; sourceTree = "<group>"; };
|
||||||
|
84CF92B5200E56AE00AD6E78 /* ethkey */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethkey; path = ../target/release/ethkey; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@ -54,6 +60,8 @@
|
|||||||
0ACF9AB51E30FAB600D5C935 = {
|
0ACF9AB51E30FAB600D5C935 = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
84CF92B5200E56AE00AD6E78 /* ethkey */,
|
||||||
|
84CF92B2200E559900AD6E78 /* parity-evm */,
|
||||||
0AED4D9F1E3E22F800BF87C0 /* ethstore */,
|
0AED4D9F1E3E22F800BF87C0 /* ethstore */,
|
||||||
0A7A475C1E3D2CDD0093D1AB /* parity */,
|
0A7A475C1E3D2CDD0093D1AB /* parity */,
|
||||||
0ACF9AC01E30FAB600D5C935 /* Parity Ethereum */,
|
0ACF9AC01E30FAB600D5C935 /* Parity Ethereum */,
|
||||||
@ -110,7 +118,7 @@
|
|||||||
isa = PBXProject;
|
isa = PBXProject;
|
||||||
attributes = {
|
attributes = {
|
||||||
LastSwiftUpdateCheck = 0800;
|
LastSwiftUpdateCheck = 0800;
|
||||||
LastUpgradeCheck = 0800;
|
LastUpgradeCheck = 0820;
|
||||||
ORGANIZATIONNAME = "Parity Technologies";
|
ORGANIZATIONNAME = "Parity Technologies";
|
||||||
TargetAttributes = {
|
TargetAttributes = {
|
||||||
0ACF9ABD1E30FAB600D5C935 = {
|
0ACF9ABD1E30FAB600D5C935 = {
|
||||||
@ -192,6 +200,7 @@
|
|||||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||||
CLANG_WARN_INT_CONVERSION = YES;
|
CLANG_WARN_INT_CONVERSION = YES;
|
||||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||||
|
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||||
CLANG_WARN_SUSPICIOUS_MOVES = YES;
|
CLANG_WARN_SUSPICIOUS_MOVES = YES;
|
||||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
@ -241,6 +250,7 @@
|
|||||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||||
CLANG_WARN_INT_CONVERSION = YES;
|
CLANG_WARN_INT_CONVERSION = YES;
|
||||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||||
|
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||||
CLANG_WARN_SUSPICIOUS_MOVES = YES;
|
CLANG_WARN_SUSPICIOUS_MOVES = YES;
|
||||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
|
|||||||
@ -462,7 +462,7 @@
|
|||||||
<key>OVERWRITE_PERMISSIONS</key>
|
<key>OVERWRITE_PERMISSIONS</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>VERSION</key>
|
<key>VERSION</key>
|
||||||
<string>1.8.6</string>
|
<string>1.8.7</string>
|
||||||
</dict>
|
</dict>
|
||||||
<key>UUID</key>
|
<key>UUID</key>
|
||||||
<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
|
<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
||||||
// This file is part of Parity.
|
// This file is part of Parity.
|
||||||
|
|
||||||
// Parity is free software: you can redistribute it and/or modify
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
@ -221,4 +221,3 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 372 B After Width: | Height: | Size: 679 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 707 B After Width: | Height: | Size: 1.7 KiB |
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
||||||
// This file is part of Parity.
|
// This file is part of Parity.
|
||||||
|
|
||||||
// Parity is free software: you can redistribute it and/or modify
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.8</string>
|
<string>1.9</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1</string>
|
<string>1</string>
|
||||||
<key>LSApplicationCategoryType</key>
|
<key>LSApplicationCategoryType</key>
|
||||||
|
|||||||
@ -3,8 +3,6 @@ Parity Wallet
|
|||||||
|
|
||||||
Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
|
Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
|
||||||
|
|
||||||
WARNING: This installer is **EXPERIMENTAL**. Use it at your own risk.
|
If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8180/ in your browser.
|
||||||
|
|
||||||
If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8080/ in your browser.
|
|
||||||
|
|
||||||
Parity is distributed under the terms of the GPL.
|
Parity is distributed under the terms of the GPL.
|
||||||
|
|||||||
@ -9,5 +9,4 @@ fi
|
|||||||
PLIST=~/Library/LaunchAgents/io.parity.ethereum.plist
|
PLIST=~/Library/LaunchAgents/io.parity.ethereum.plist
|
||||||
su $SUDO_USER -c "launchctl stop io.parity.ethereum"
|
su $SUDO_USER -c "launchctl stop io.parity.ethereum"
|
||||||
su $SUDO_USER -c "launchctl unload $PLIST"
|
su $SUDO_USER -c "launchctl unload $PLIST"
|
||||||
rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore $PLIST
|
rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore /usr/local/bin/ethkey /usr/local/bin/parity-evm $PLIST
|
||||||
|
|
||||||
|
|||||||
@ -6,17 +6,17 @@
|
|||||||
!define SYNC_TERM 0x00100001
|
!define SYNC_TERM 0x00100001
|
||||||
|
|
||||||
!define APPNAME "Parity"
|
!define APPNAME "Parity"
|
||||||
!define COMPANYNAME "Parity"
|
!define COMPANYNAME "Parity Technologies"
|
||||||
!define DESCRIPTION "Fast, light, robust Ethereum implementation"
|
!define DESCRIPTION "Fast, light, robust Ethereum implementation"
|
||||||
!define VERSIONMAJOR 1
|
!define VERSIONMAJOR 1
|
||||||
!define VERSIONMINOR 8
|
!define VERSIONMINOR 8
|
||||||
!define VERSIONBUILD 6
|
!define VERSIONBUILD 7
|
||||||
!define ARGS ""
|
!define ARGS ""
|
||||||
!define FIRST_START_ARGS "--mode=passive ui"
|
!define FIRST_START_ARGS "--mode=passive ui"
|
||||||
|
|
||||||
!addplugindir .\
|
!addplugindir .\
|
||||||
|
|
||||||
!define HELPURL "https://github.com/paritytech/parity/wiki" # "Support Information" link
|
!define HELPURL "https://paritytech.github.io/wiki/" # "Support Information" link
|
||||||
!define UPDATEURL "https://github.com/paritytech/parity/releases" # "Product Updates" link
|
!define UPDATEURL "https://github.com/paritytech/parity/releases" # "Product Updates" link
|
||||||
!define ABOUTURL "https://github.com/paritytech/parity" # "Publisher" link
|
!define ABOUTURL "https://github.com/paritytech/parity" # "Publisher" link
|
||||||
!define INSTALLSIZE 26120
|
!define INSTALLSIZE 26120
|
||||||
@ -88,14 +88,13 @@ section "install"
|
|||||||
!insertmacro TerminateApp
|
!insertmacro TerminateApp
|
||||||
|
|
||||||
# Files added here should be removed by the uninstaller (see section "uninstall")
|
# Files added here should be removed by the uninstaller (see section "uninstall")
|
||||||
file /oname=parity.exe ..\target\release\parity.exe
|
file /oname=parity.exe ..\target\x86_64-pc-windows-msvc\release\parity.exe
|
||||||
|
file /oname=parity-evm.exe ..\target\x86_64-pc-windows-msvc\release\parity-evm.exe
|
||||||
|
file /oname=ethstore.exe ..\target\x86_64-pc-windows-msvc\release\ethstore.exe
|
||||||
|
file /oname=ethkey.exe ..\target\x86_64-pc-windows-msvc\release\ethkey.exe
|
||||||
file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe
|
file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe
|
||||||
|
|
||||||
file "logo.ico"
|
file "logo.ico"
|
||||||
file vc_redist.x64.exe
|
|
||||||
|
|
||||||
ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
|
|
||||||
delete $INSTDIR\vc_redist.x64.exe
|
|
||||||
# Add any other files for the install directory (license files, app data, etc) here
|
# Add any other files for the install directory (license files, app data, etc) here
|
||||||
|
|
||||||
# Uninstaller - See function un.onInit and section "uninstall" for configuration
|
# Uninstaller - See function un.onInit and section "uninstall" for configuration
|
||||||
@ -167,6 +166,9 @@ section "uninstall"
|
|||||||
|
|
||||||
# Remove files
|
# Remove files
|
||||||
delete $INSTDIR\parity.exe
|
delete $INSTDIR\parity.exe
|
||||||
|
delete $INSTDIR\parity-evm.exe
|
||||||
|
delete $INSTDIR\ethstore.exe
|
||||||
|
delete $INSTDIR\ethkey.exe
|
||||||
delete $INSTDIR\ptray.exe
|
delete $INSTDIR\ptray.exe
|
||||||
delete $INSTDIR\logo.ico
|
delete $INSTDIR\logo.ico
|
||||||
|
|
||||||
@ -187,4 +189,3 @@ section "uninstall"
|
|||||||
DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
|
DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
|
||||||
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
|
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
|
||||||
sectionEnd
|
sectionEnd
|
||||||
|
|
||||||
|
|||||||
BIN
nsis/logo.ico
BIN
nsis/logo.ico
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 100 KiB |
@ -12,42 +12,21 @@
|
|||||||
### Running coverage
|
### Running coverage
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
RUSTFLAGS="-C link-dead-code" cargo test --all --exclude evmjit --no-run || exit $?
|
||||||
KCOV=${1:-kcov}
|
|
||||||
|
|
||||||
if ! type $KCOV > /dev/null; then
|
|
||||||
echo "Install kcov first (details inside this file). Aborting."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
RUSTFLAGS="-C link-dead-code" cargo test --all --exclude parity-ipfs-api --exclude evmjit --no-run || exit $?
|
|
||||||
|
|
||||||
|
|
||||||
KCOV_TARGET="target/cov"
|
KCOV_TARGET="target/cov"
|
||||||
KCOV_FLAGS="--verify"
|
KCOV_FLAGS="--verify"
|
||||||
EXCLUDE="/usr/lib,\
|
EXCLUDE="/usr/lib,/usr/include,$HOME/.cargo,$HOME/.multirust,rocksdb,secp256k1"
|
||||||
/usr/include,\
|
|
||||||
$HOME/.cargo,\
|
|
||||||
$HOME/.multirust,\
|
|
||||||
rocksdb,\
|
|
||||||
secp256k1
|
|
||||||
"
|
|
||||||
|
|
||||||
rm -rf $KCOV_TARGET
|
|
||||||
mkdir -p $KCOV_TARGET
|
mkdir -p $KCOV_TARGET
|
||||||
echo "Cover RUST"
|
echo "Cover RUST"
|
||||||
for FILE in `find target/debug/deps ! -name "*.*"`
|
for FILE in `find target/debug/deps ! -name "*.*"`
|
||||||
do
|
do
|
||||||
$KCOV --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET $FILE
|
timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET $FILE
|
||||||
done
|
done
|
||||||
|
timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
|
||||||
$KCOV --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
|
|
||||||
echo "Cover JS"
|
echo "Cover JS"
|
||||||
cd js
|
cd js
|
||||||
npm install&&npm run test:coverage
|
npm install&&npm run test:coverage
|
||||||
cd ..
|
cd ..
|
||||||
codecov
|
|
||||||
bash <(curl -s https://codecov.io/bash)&&
|
bash <(curl -s https://codecov.io/bash)&&
|
||||||
echo "Uploaded code coverage"
|
echo "Uploaded code coverage"
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e # fail on any error
|
|
||||||
set -u # treat unset variables as error
|
|
||||||
rm -rf deb
|
|
||||||
#create DEBIAN files
|
|
||||||
mkdir -p deb/usr/bin/
|
|
||||||
mkdir -p deb/DEBIAN
|
|
||||||
#create copyright, docs, compat
|
|
||||||
cp LICENSE deb/DEBIAN/copyright
|
|
||||||
echo "https://github.com/paritytech/parity/wiki" >> deb/DEBIAN/docs
|
|
||||||
echo "8" >> deb/DEBIAN/compat
|
|
||||||
#create control file
|
|
||||||
control=deb/DEBIAN/control
|
|
||||||
echo "Package: parity" >> $control
|
|
||||||
version=`grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n"`
|
|
||||||
echo "Version: $version" >> $control
|
|
||||||
echo "Source: parity" >> $control
|
|
||||||
echo "Section: science" >> $control
|
|
||||||
echo "Priority: extra" >> $control
|
|
||||||
echo "Maintainer: Parity Technologies <devops@parity.io>" >> $control
|
|
||||||
echo "Build-Depends: debhelper (>=9)" >> $control
|
|
||||||
echo "Standards-Version: 3.9.5" >> $control
|
|
||||||
echo "Homepage: https://parity.io" >> $control
|
|
||||||
echo "Vcs-Git: git://github.com/paritytech/parity.git" >> $control
|
|
||||||
echo "Vcs-Browser: https://github.com/paritytech/parity" >> $control
|
|
||||||
echo "Architecture: $1" >> $control
|
|
||||||
echo "Depends: libssl1.0.0 (>=1.0.0)" >> $control
|
|
||||||
echo "Description: Ethereum network client by Parity Technologies" >> $control
|
|
||||||
size=`du deb/|awk 'END {print $1}'`
|
|
||||||
echo "Installed-Size: $size" >> $control
|
|
||||||
#build .deb package
|
|
||||||
|
|
||||||
exit
|
|
||||||
292
scripts/gitlab-build.sh
Executable file
292
scripts/gitlab-build.sh
Executable file
@ -0,0 +1,292 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e # fail on any error
|
||||||
|
set -u # treat unset variables as error
|
||||||
|
#ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags
|
||||||
|
BUILD_PLATFORM=$1
|
||||||
|
PLATFORM=$2
|
||||||
|
ARC=$3
|
||||||
|
CC=$4
|
||||||
|
CXX=$5
|
||||||
|
VER="$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")"
|
||||||
|
S3WIN=""
|
||||||
|
echo "--------------------"
|
||||||
|
echo "Build for platform: " $BUILD_PLATFORM
|
||||||
|
echo "Cargo target: " $PLATFORM
|
||||||
|
echo "CC&CXX flags: " $CC ", " $CXX
|
||||||
|
echo "Architecture: " $ARC
|
||||||
|
echo "Libssl version: " $LIBSSL
|
||||||
|
echo "Parity version: " $VER
|
||||||
|
echo "Branch: " $CI_BUILD_REF_NAME
|
||||||
|
echo "--------------------"
|
||||||
|
|
||||||
|
set_env () {
|
||||||
|
echo "Set ENVIROMENT"
|
||||||
|
export HOST_CC=gcc
|
||||||
|
export HOST_CXX=g++
|
||||||
|
rm -rf .cargo
|
||||||
|
mkdir -p .cargo
|
||||||
|
echo "[target.$PLATFORM]" >> .cargo/config
|
||||||
|
echo "linker= \"$CC\"" >> .cargo/config
|
||||||
|
cat .cargo/config
|
||||||
|
}
|
||||||
|
set_env_win () {
|
||||||
|
set PLATFORM=x86_64-pc-windows-msvc
|
||||||
|
set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt"
|
||||||
|
set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64"
|
||||||
|
set RUST_BACKTRACE=1
|
||||||
|
#export RUSTFLAGS=$RUSTFLAGS
|
||||||
|
rustup default stable-x86_64-pc-windows-msvc
|
||||||
|
echo "MsBuild.exe windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release" > msbuild.cmd
|
||||||
|
echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd
|
||||||
|
}
|
||||||
|
build () {
|
||||||
|
echo "Build parity:"
|
||||||
|
cargo build --target $PLATFORM --features final --release
|
||||||
|
echo "Build evmbin:"
|
||||||
|
cargo build --target $PLATFORM --release -p evmbin
|
||||||
|
echo "Build ethstore-cli:"
|
||||||
|
cargo build --target $PLATFORM --release -p ethstore-cli
|
||||||
|
echo "Build ethkey-cli:"
|
||||||
|
cargo build --target $PLATFORM --release -p ethkey-cli
|
||||||
|
}
|
||||||
|
strip_md5 () {
|
||||||
|
echo "Strip binaries:"
|
||||||
|
$STRIP_BIN -v target/$PLATFORM/release/parity
|
||||||
|
$STRIP_BIN -v target/$PLATFORM/release/parity-evm
|
||||||
|
$STRIP_BIN -v target/$PLATFORM/release/ethstore
|
||||||
|
$STRIP_BIN -v target/$PLATFORM/release/ethkey;
|
||||||
|
export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
|
||||||
|
echo "Checksum calculation:"
|
||||||
|
rm -rf *.md5
|
||||||
|
export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
|
||||||
|
echo "Parity file SHA3:" $SHA3
|
||||||
|
md5sum target/$PLATFORM/release/parity > parity.md5
|
||||||
|
md5sum target/$PLATFORM/release/parity-evm > parity-evm.md5
|
||||||
|
md5sum target/$PLATFORM/release/ethstore > ethstore.md5
|
||||||
|
md5sum target/$PLATFORM/release/ethkey > ethkey.md5
|
||||||
|
}
|
||||||
|
make_deb () {
|
||||||
|
rm -rf deb
|
||||||
|
echo "create DEBIAN files"
|
||||||
|
mkdir -p deb/usr/bin/
|
||||||
|
mkdir -p deb/DEBIAN
|
||||||
|
echo "create copyright, docs, compat"
|
||||||
|
cp LICENSE deb/DEBIAN/copyright
|
||||||
|
echo "https://github.com/paritytech/parity/wiki" >> deb/DEBIAN/docs
|
||||||
|
echo "8" >> deb/DEBIAN/compat
|
||||||
|
echo "create control file"
|
||||||
|
control=deb/DEBIAN/control
|
||||||
|
echo "Package: parity" >> $control
|
||||||
|
echo "Version: $VER" >> $control
|
||||||
|
echo "Source: parity" >> $control
|
||||||
|
echo "Section: science" >> $control
|
||||||
|
echo "Priority: extra" >> $control
|
||||||
|
echo "Maintainer: Parity Technologies <devops@parity.io>" >> $control
|
||||||
|
echo "Build-Depends: debhelper (>=9)" >> $control
|
||||||
|
echo "Standards-Version: 3.9.5" >> $control
|
||||||
|
echo "Homepage: https://parity.io" >> $control
|
||||||
|
echo "Vcs-Git: git://github.com/paritytech/parity.git" >> $control
|
||||||
|
echo "Vcs-Browser: https://github.com/paritytech/parity" >> $control
|
||||||
|
echo "Architecture: $ARC" >> $control
|
||||||
|
echo "Depends: $LIBSSL" >> $control
|
||||||
|
echo "Description: Ethereum network client by Parity Technologies" >> $control
|
||||||
|
size=`du deb/|awk 'END {print $1}'`
|
||||||
|
echo "Installed-Size: $size" >> $control
|
||||||
|
echo "build .deb package"
|
||||||
|
cp target/$PLATFORM/release/parity deb/usr/bin/parity
|
||||||
|
cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
|
||||||
|
cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
|
||||||
|
cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
|
||||||
|
dpkg-deb -b deb "parity_"$VER"_"$ARC".deb"
|
||||||
|
md5sum "parity_"$VER"_"$ARC".deb" > "parity_"$VER"_"$ARC".deb.md5"
|
||||||
|
}
|
||||||
|
make_rpm () {
|
||||||
|
rm -rf /install
|
||||||
|
mkdir -p /install/usr/bin
|
||||||
|
cp target/$PLATFORM/release/parity /install/usr/bin
|
||||||
|
cp target/$PLATFORM/release/parity-evm /install/usr/bin/parity-evm
|
||||||
|
cp target/$PLATFORM/release/ethstore /install/usr/bin/ethstore
|
||||||
|
cp target/$PLATFORM/release/ethkey /install/usr/bin/ethkey
|
||||||
|
fpm -s dir -t rpm -n parity -v $VER --epoch 1 --license GPLv3 -d openssl --provides parity --url https://parity.io --vendor "Parity Technologies" -a x86_64 -m "<devops@parity.io>" --description "Ethereum network client by Parity Technologies" -C /install/
|
||||||
|
cp "parity-"$VER"-1."$ARC".rpm" "parity_"$VER"_"$ARC".rpm"
|
||||||
|
md5sum "parity_"$VER"_"$ARC".rpm" > "parity_"$VER"_"$ARC".rpm.md5"
|
||||||
|
}
|
||||||
|
make_pkg () {
|
||||||
|
echo "make PKG"
|
||||||
|
cp target/$PLATFORM/release/parity target/release/parity
|
||||||
|
cp target/$PLATFORM/release/parity-evm target/release/parity-evm
|
||||||
|
cp target/$PLATFORM/release/ethstore target/release/ethstore
|
||||||
|
cp target/$PLATFORM/release/ethkey target/release/ethkey
|
||||||
|
cd mac
|
||||||
|
xcodebuild -configuration Release
|
||||||
|
cd ..
|
||||||
|
packagesbuild -v mac/Parity.pkgproj
|
||||||
|
productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
|
||||||
|
mv target/release/Parity\ Ethereum-signed.pkg "parity_"$VER"_"$ARC".pkg"
|
||||||
|
md5sum "parity_"$VER"_"$ARC"."$EXT >> "parity_"$VER"_"$ARC".pkg.md5"
|
||||||
|
}
|
||||||
|
make_exe () {
|
||||||
|
./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity.exe"
|
||||||
|
SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity.exe -p %h)
|
||||||
|
echo "Checksum calculation:"
|
||||||
|
rm -rf *.md5
|
||||||
|
echo "Parity file SHA3:" $SHA3
|
||||||
|
rhash --md5 target/$PLATFORM/release/parity.exe -p %h > parity.exe.md5
|
||||||
|
rhash --md5 target/$PLATFORM/release/parity-evm.exe -p %h > parity-evm.exe.md5
|
||||||
|
rhash --md5 target/$PLATFORM/release/ethstore.exe -p %h > ethstore.exe.md5
|
||||||
|
rhash --md5 target/$PLATFORM/release/ethkey.exe -p %h > ethkey.exe.md5
|
||||||
|
./msbuild.cmd
|
||||||
|
./sign.cmd $keyfile $certpass windows/ptray/x64/release/ptray.exe
|
||||||
|
cd nsis
|
||||||
|
curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o vc_redist.x64.exe
|
||||||
|
echo "makensis.exe installer.nsi" > nsis.cmd
|
||||||
|
./nsis.cmd
|
||||||
|
cd ..
|
||||||
|
cp nsis/installer.exe "parity_"$VER"_"$ARC"."$EXT
|
||||||
|
./sign.cmd $keyfile $certpass "parity_"$VER"_"$ARC"."$EXT
|
||||||
|
rhash --md5 "parity_"$VER"_"$ARC"."$EXT -p %h > "parity_"$VER"_"$ARC"."$EXT".md5"
|
||||||
|
}
|
||||||
|
push_binaries () {
|
||||||
|
echo "Push binaries to AWS S3"
|
||||||
|
aws configure set aws_access_key_id $s3_key
|
||||||
|
aws configure set aws_secret_access_key $s3_secret
|
||||||
|
if [[ "$CI_BUILD_REF_NAME" = "master" || "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]];
|
||||||
|
then
|
||||||
|
export S3_BUCKET=builds-parity-published;
|
||||||
|
else
|
||||||
|
export S3_BUCKET=builds-parity;
|
||||||
|
fi
|
||||||
|
aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$BUILD_PLATFORM
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN --body target/$PLATFORM/release/parity$S3WIN
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN.md5 --body parity$S3WIN.md5
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN --body target/$PLATFORM/release/parity-evm$S3WIN
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN.md5 --body parity-evm$S3WIN.md5
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN --body target/$PLATFORM/release/ethstore$S3WIN
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN.md5 --body ethstore$S3WIN.md5
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN --body target/$PLATFORM/release/ethkey$S3WIN
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN.md5 --body ethkey$S3WIN.md5
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$ARC"."$EXT --body "parity_"$VER"_"$ARC"."$EXT
|
||||||
|
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$ARC"."$EXT".md5" --body "parity_"$VER"_"$ARC"."$EXT".md5"
|
||||||
|
}
|
||||||
|
make_archive () {
|
||||||
|
echo "add artifacts to archive"
|
||||||
|
rm -rf parity.zip
|
||||||
|
zip -r parity.zip target/$PLATFORM/release/parity$S3WIN target/$PLATFORM/release/parity-evm$S3WIN target/$PLATFORM/release/ethstore$S3WIN target/$PLATFORM/release/ethkey$S3WIN parity$S3WIN.md5 parity-evm$S3WIN.md5 ethstore$S3WIN.md5 ethkey$S3WIN.md5
|
||||||
|
}
|
||||||
|
push_release () {
|
||||||
|
echo "push release"
|
||||||
|
curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
||||||
|
curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
|
||||||
|
}
|
||||||
|
case $BUILD_PLATFORM in
|
||||||
|
x86_64-unknown-linux-gnu)
|
||||||
|
#set strip bin
|
||||||
|
STRIP_BIN="strip"
|
||||||
|
#package extention
|
||||||
|
EXT="deb"
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
x86_64-unknown-debian-gnu)
|
||||||
|
STRIP_BIN="strip"
|
||||||
|
EXT="deb"
|
||||||
|
LIBSSL="libssl1.1 (>=1.1.0)"
|
||||||
|
echo "Use libssl1.1 (>=1.1.0) for Debian builds"
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
x86_64-unknown-centos-gnu)
|
||||||
|
STRIP_BIN="strip"
|
||||||
|
EXT="rpm"
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_rpm
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
i686-unknown-linux-gnu)
|
||||||
|
STRIP_BIN="strip"
|
||||||
|
EXT="deb"
|
||||||
|
set_env
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
armv7-unknown-linux-gnueabihf)
|
||||||
|
STRIP_BIN="arm-linux-gnueabihf-strip"
|
||||||
|
EXT="deb"
|
||||||
|
set_env
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
arm-unknown-linux-gnueabihf)
|
||||||
|
STRIP_BIN="arm-linux-gnueabihf-strip"
|
||||||
|
EXT="deb"
|
||||||
|
set_env
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
aarch64-unknown-linux-gnu)
|
||||||
|
STRIP_BIN="aarch64-linux-gnu-strip"
|
||||||
|
EXT="deb"
|
||||||
|
set_env
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_deb
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
x86_64-apple-darwin)
|
||||||
|
STRIP_BIN="strip"
|
||||||
|
PLATFORM="x86_64-apple-darwin"
|
||||||
|
EXT="pkg"
|
||||||
|
build
|
||||||
|
strip_md5
|
||||||
|
make_pkg
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
;;
|
||||||
|
x86_64-unknown-snap-gnu)
|
||||||
|
cd snap
|
||||||
|
ARC="amd64"
|
||||||
|
EXT="snap"
|
||||||
|
rm -rf *snap
|
||||||
|
sed -i 's/master/'"$VER"'/g' snapcraft.yaml
|
||||||
|
snapcraft
|
||||||
|
cp "parity_"$CI_BUILD_REF_NAME"_amd64.snap" "parity_"$VER"_amd64.snap"
|
||||||
|
md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
|
||||||
|
push_binaries
|
||||||
|
;;
|
||||||
|
x86_64-pc-windows-msvc)
|
||||||
|
set_env_win
|
||||||
|
EXT="exe"
|
||||||
|
S3WIN=".exe"
|
||||||
|
build
|
||||||
|
make_exe
|
||||||
|
make_archive
|
||||||
|
push_binaries
|
||||||
|
push_release
|
||||||
|
esac
|
||||||
102
scripts/gitlab-test.sh
Executable file
102
scripts/gitlab-test.sh
Executable file
@ -0,0 +1,102 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#ARGUMENT test for RUST, JS, COVERAGE or JS_RELEASE
|
||||||
|
set -e # fail on any error
|
||||||
|
set -u # treat unset variables as error
|
||||||
|
|
||||||
|
export JS_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep ^js/ | wc -l)"
|
||||||
|
export JS_OLD_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep ^js-old/ | wc -l)"
|
||||||
|
export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ | wc -l)"
|
||||||
|
echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
|
||||||
|
echo "JS_FILES_MODIFIED: $JS_FILES_MODIFIED"
|
||||||
|
echo "JS_OLD_FILES_MODIFIED: $JS_OLD_FILES_MODIFIED"
|
||||||
|
if [[ "$CI_COMMIT_REF_NAME" = "beta" || "$CI_COMMIT_REF_NAME" = "stable" ]]; then
|
||||||
|
export GIT_COMPARE=$CI_COMMIT_REF_NAME;
|
||||||
|
else
|
||||||
|
export GIT_COMPARE=master;
|
||||||
|
fi
|
||||||
|
echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
|
||||||
|
echo "JS_FILES_MODIFIED: $JS_FILES_MODIFIED"
|
||||||
|
echo "JS_OLD_FILES_MODIFIED: $JS_OLD_FILES_MODIFIED"
|
||||||
|
TEST_SWITCH=$1
|
||||||
|
rust_test () {
|
||||||
|
git submodule update --init --recursive
|
||||||
|
rustup show
|
||||||
|
if [[ "${RUST_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping Rust tests since no Rust files modified.";
|
||||||
|
else ./test.sh;
|
||||||
|
fi
|
||||||
|
if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
|
||||||
|
then sh scripts/aura-test.sh;
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
js_test () {
|
||||||
|
git submodule update --init --recursive
|
||||||
|
if [[ "${JS_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS deps install since no JS files modified.";
|
||||||
|
else ./js/scripts/install-deps.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS (old) deps install since no JS files modified.";
|
||||||
|
else ./js-old/scripts/install-deps.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS lint since no JS files modified.";
|
||||||
|
else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS (old) lint since no JS files modified.";
|
||||||
|
else ./js-old/scripts/lint.sh && ./js-old/scripts/test.sh && ./js-old/scripts/build.sh;
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
js_release () {
|
||||||
|
rustup default stable
|
||||||
|
if [[ "${JS_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS deps install since no JS files modified.";
|
||||||
|
else ./js/scripts/install-deps.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS rebuild since no JS files modified.";
|
||||||
|
else ./js/scripts/build.sh && ./js/scripts/push-precompiled.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS (old) deps install since no JS files modified.";
|
||||||
|
else ./js-old/scripts/install-deps.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping JS (old) rebuild since no JS files modified.";
|
||||||
|
else ./js-old/scripts/build.sh && ./js-old/scripts/push-precompiled.sh;
|
||||||
|
fi
|
||||||
|
if [[ "${JS_FILES_MODIFIED}" == "0" ]] && [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
|
||||||
|
then echo "Skipping Cargo update since no JS files modified.";
|
||||||
|
else ./js/scripts/push-cargo.sh;
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
coverage_test () {
|
||||||
|
git submodule update --init --recursive
|
||||||
|
rm -rf target/*
|
||||||
|
rm -rf js/.coverage
|
||||||
|
scripts/cov.sh
|
||||||
|
}
|
||||||
|
case $TEST_SWITCH in
|
||||||
|
stable )
|
||||||
|
rustup default stable
|
||||||
|
rust_test
|
||||||
|
;;
|
||||||
|
beta)
|
||||||
|
rustup default beta
|
||||||
|
rust_test
|
||||||
|
;;
|
||||||
|
nightly)
|
||||||
|
rustup default nightly
|
||||||
|
rust_test
|
||||||
|
;;
|
||||||
|
js-test)
|
||||||
|
js_test
|
||||||
|
;;
|
||||||
|
js-release)
|
||||||
|
js_release
|
||||||
|
;;
|
||||||
|
test-coverage)
|
||||||
|
coverage_test
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@ -6,7 +6,7 @@ After=network.target
|
|||||||
# run as root, set base_path in config.toml
|
# run as root, set base_path in config.toml
|
||||||
ExecStart=/usr/bin/parity --config /etc/parity/config.toml
|
ExecStart=/usr/bin/parity --config /etc/parity/config.toml
|
||||||
# To run as user, comment out above and uncomment below, fill in user and group
|
# To run as user, comment out above and uncomment below, fill in user and group
|
||||||
# picks up users default config.toml in $HOME/.local/.share/io.parity.ethereum/
|
# picks up users default config.toml in $HOME/.local/share/io.parity.ethereum/
|
||||||
# User=username
|
# User=username
|
||||||
# Group=groupname
|
# Group=groupname
|
||||||
# ExecStart=/usr/bin/parity
|
# ExecStart=/usr/bin/parity
|
||||||
|
|||||||
@ -522,6 +522,10 @@ impl BlockDownloader {
|
|||||||
trace!(target: "sync", "Unknown new block parent, restarting sync");
|
trace!(target: "sync", "Unknown new block parent, restarting sync");
|
||||||
break;
|
break;
|
||||||
},
|
},
|
||||||
|
Err(BlockImportError::Block(BlockError::TemporarilyInvalid(_))) => {
|
||||||
|
debug!(target: "sync", "Block temporarily invalid, restarting sync");
|
||||||
|
break;
|
||||||
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
debug!(target: "sync", "Bad block {:?} : {:?}", h, e);
|
debug!(target: "sync", "Bad block {:?} : {:?}", h, e);
|
||||||
bad = true;
|
bad = true;
|
||||||
|
|||||||
@ -3,7 +3,7 @@ description = "Ethcore utility library"
|
|||||||
homepage = "http://parity.io"
|
homepage = "http://parity.io"
|
||||||
license = "GPL-3.0"
|
license = "GPL-3.0"
|
||||||
name = "ethcore-util"
|
name = "ethcore-util"
|
||||||
version = "1.8.6"
|
version = "1.8.7"
|
||||||
authors = ["Parity Technologies <admin@parity.io>"]
|
authors = ["Parity Technologies <admin@parity.io>"]
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@ use std::cmp;
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
use std::path::{PathBuf, Path};
|
use std::path::{PathBuf, Path};
|
||||||
use std::{mem, fs, io};
|
use std::{fs, io, mem, result};
|
||||||
|
|
||||||
use parking_lot::{Mutex, MutexGuard, RwLock};
|
use parking_lot::{Mutex, MutexGuard, RwLock};
|
||||||
use rocksdb::{
|
use rocksdb::{
|
||||||
@ -256,7 +256,25 @@ pub struct Database {
|
|||||||
flushing_lock: Mutex<bool>,
|
flushing_lock: Mutex<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
fn check_for_corruption<T, P: AsRef<Path>>(path: P, res: result::Result<T, String>) -> result::Result<T, String> {
|
||||||
|
if let Err(ref s) = res {
|
||||||
|
if s.starts_with("Corruption:") {
|
||||||
|
warn!("DB corrupted: {}. Repair will be triggered on next restart", s);
|
||||||
|
let _ = fs::File::create(path.as_ref().join(Database::CORRUPTION_FILE_NAME));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
res
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_corrupted(s: &str) -> bool {
|
||||||
|
s.starts_with("Corruption:") || s.starts_with("Invalid argument: You have to open all column families")
|
||||||
|
}
|
||||||
|
|
||||||
impl Database {
|
impl Database {
|
||||||
|
const CORRUPTION_FILE_NAME: &'static str = "CORRUPTED";
|
||||||
|
|
||||||
/// Open database with default settings.
|
/// Open database with default settings.
|
||||||
pub fn open_default(path: &str) -> Result<Database, String> {
|
pub fn open_default(path: &str) -> Result<Database, String> {
|
||||||
Database::open(&DatabaseConfig::default(), path)
|
Database::open(&DatabaseConfig::default(), path)
|
||||||
@ -286,6 +304,14 @@ impl Database {
|
|||||||
block_opts.set_cache(cache);
|
block_opts.set_cache(cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// attempt database repair if it has been previously marked as corrupted
|
||||||
|
let db_corrupted = Path::new(path).join(Database::CORRUPTION_FILE_NAME);
|
||||||
|
if db_corrupted.exists() {
|
||||||
|
warn!("DB has been previously marked as corrupted, attempting repair");
|
||||||
|
DB::repair(&opts, path)?;
|
||||||
|
fs::remove_file(db_corrupted).map_err(|e| e.to_string())?;
|
||||||
|
}
|
||||||
|
|
||||||
let columns = config.columns.unwrap_or(0) as usize;
|
let columns = config.columns.unwrap_or(0) as usize;
|
||||||
|
|
||||||
let mut cf_options = Vec::with_capacity(columns);
|
let mut cf_options = Vec::with_capacity(columns);
|
||||||
@ -305,12 +331,11 @@ impl Database {
|
|||||||
|
|
||||||
let mut cfs: Vec<Column> = Vec::new();
|
let mut cfs: Vec<Column> = Vec::new();
|
||||||
let db = match config.columns {
|
let db = match config.columns {
|
||||||
Some(columns) => {
|
Some(_) => {
|
||||||
match DB::open_cf(&opts, path, &cfnames, &cf_options) {
|
match DB::open_cf(&opts, path, &cfnames, &cf_options) {
|
||||||
Ok(db) => {
|
Ok(db) => {
|
||||||
cfs = cfnames.iter().map(|n| db.cf_handle(n)
|
cfs = cfnames.iter().map(|n| db.cf_handle(n)
|
||||||
.expect("rocksdb opens a cf_handle for each cfname; qed")).collect();
|
.expect("rocksdb opens a cf_handle for each cfname; qed")).collect();
|
||||||
assert!(cfs.len() == columns as usize);
|
|
||||||
Ok(db)
|
Ok(db)
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
@ -320,7 +345,7 @@ impl Database {
|
|||||||
cfs = cfnames.iter().enumerate().map(|(i, n)| db.create_cf(n, &cf_options[i])).collect::<Result<_, _>>()?;
|
cfs = cfnames.iter().enumerate().map(|(i, n)| db.create_cf(n, &cf_options[i])).collect::<Result<_, _>>()?;
|
||||||
Ok(db)
|
Ok(db)
|
||||||
},
|
},
|
||||||
err @ Err(_) => err,
|
err => err,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -330,14 +355,18 @@ impl Database {
|
|||||||
|
|
||||||
let db = match db {
|
let db = match db {
|
||||||
Ok(db) => db,
|
Ok(db) => db,
|
||||||
Err(ref s) if s.starts_with("Corruption:") => {
|
Err(ref s) if is_corrupted(s) => {
|
||||||
info!("{}", s);
|
warn!("DB corrupted: {}, attempting repair", s);
|
||||||
info!("Attempting DB repair for {}", path);
|
|
||||||
DB::repair(&opts, path)?;
|
DB::repair(&opts, path)?;
|
||||||
|
|
||||||
match cfnames.is_empty() {
|
match cfnames.is_empty() {
|
||||||
true => DB::open(&opts, path)?,
|
true => DB::open(&opts, path)?,
|
||||||
false => DB::open_cf(&opts, path, &cfnames, &cf_options)?
|
false => {
|
||||||
|
let db = DB::open_cf(&opts, path, &cfnames, &cf_options)?;
|
||||||
|
cfs = cfnames.iter().map(|n| db.cf_handle(n)
|
||||||
|
.expect("rocksdb opens a cf_handle for each cfname; qed")).collect();
|
||||||
|
db
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Err(s) => { return Err(s); }
|
Err(s) => { return Err(s); }
|
||||||
@ -424,7 +453,11 @@ impl Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
db.write_opt(batch, &self.write_opts)?;
|
|
||||||
|
check_for_corruption(
|
||||||
|
&self.path,
|
||||||
|
db.write_opt(batch, &self.write_opts))?;
|
||||||
|
|
||||||
for column in self.flushing.write().iter_mut() {
|
for column in self.flushing.write().iter_mut() {
|
||||||
column.clear();
|
column.clear();
|
||||||
column.shrink_to_fit();
|
column.shrink_to_fit();
|
||||||
@ -470,7 +503,10 @@ impl Database {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
db.write_opt(batch, &self.write_opts)
|
|
||||||
|
check_for_corruption(
|
||||||
|
&self.path,
|
||||||
|
db.write_opt(batch, &self.write_opts)).map_err(Into::into)
|
||||||
},
|
},
|
||||||
None => Err("Database is closed".to_owned())
|
None => Err("Database is closed".to_owned())
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 100 KiB |
Loading…
Reference in New Issue
Block a user