Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Komodoplatform dev #43

Merged
merged 97 commits into from
Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
78e78f0
Merge pull request #278 from KomodoPlatform/dev
ca333 Mar 2, 2020
a570d7a
Merge pull request #293 from KomodoPlatform/beta
ca333 Mar 4, 2020
a9679e1
fix dead openssl download path
ca333 Apr 5, 2020
b498aa2
add VOTE2020
ca333 Apr 14, 2020
b099cf6
add ac_public param
ca333 Apr 14, 2020
b8e6272
assetchains file fix
kolobus Apr 23, 2020
4507757
assetchains file fix
kolobus Apr 23, 2020
f2c1fee
VOTE and STBL added
kolobus Apr 23, 2020
605dd49
VOTE and STBL added
kolobus Apr 23, 2020
ebe91e1
Merge pull request #331 from kolobus/beta
ca333 Apr 23, 2020
30333c3
Merge pull request #332 from kolobus/master
ca333 Apr 23, 2020
d261319
Update year of copyright
travinkeith Apr 26, 2020
a5e46cc
Merge branch 'dev' into patch-1
ca333 Apr 26, 2020
b15bfff
bump KMD version
ca333 May 11, 2020
7836f2b
remove time adjustment
ca333 May 11, 2020
ade38f6
remove time adjustment
ca333 May 11, 2020
64bf8e4
Merge pull request #351 from KomodoPlatform/rewrite_addtimedata
ca333 May 12, 2020
fd39435
remove WLC
smk762 May 13, 2020
ec01dfe
Remove HUSH3
smk762 May 13, 2020
bca1d41
Delete wlc
smk762 May 13, 2020
50f4e83
Delete wlc
smk762 May 13, 2020
d15309c
Update assetchains.old
smk762 May 13, 2020
44233d2
Merge pull request #352 from smk762/patch-7
ca333 May 14, 2020
945936c
Merge pull request #353 from smk762/patch-8
ca333 May 14, 2020
eded49c
feat: dpow season 4
ca333 May 17, 2020
391dcb6
Update src/komodo_defs.h
ca333 May 18, 2020
b0a96af
update S4 hardfork height
ca333 May 18, 2020
3179865
update pbca26 pubkey
ca333 May 18, 2020
a8e545d
update starfleet pubkey
ca333 May 18, 2020
845862c
Merge pull request #354 from KomodoPlatform/s4
ca333 May 18, 2020
5a8f567
Merge branch 'beta' into dev
ca333 May 18, 2020
b00ad77
Merge pull request #337 from travinkeith/patch-1
ca333 May 18, 2020
718adca
synced ci_cd files with research state
tonymorony May 19, 2020
5523a55
build scripts for ci_cd
tonymorony May 19, 2020
6d57d4c
revert updating of non ci_cd related build scripts
tonymorony May 19, 2020
74453e8
use CC tests for dev CC code base
tonymorony May 19, 2020
1101102
Merge pull request #355 from KomodoPlatform/ci_cd_sync
tonymorony May 19, 2020
1d02800
Merge pull request #315 from KomodoPlatform/dev
ca333 May 19, 2020
e68462b
bump version - major update
ca333 May 19, 2020
c340cdd
Merge pull request #356 from KomodoPlatform/dev
ca333 May 19, 2020
1e1c631
Merge pull request #357 from KomodoPlatform/beta
ca333 May 20, 2020
80b7a94
bump deprecation height
ca333 May 21, 2020
c227519
add todo
ca333 May 21, 2020
7af1817
Merge branch 'dev' of https://github.com/komodoplatform/komodo into dev
ca333 May 21, 2020
e7e8145
Merge pull request #358 from KomodoPlatform/dev
ca333 May 21, 2020
b998ca1
Merge pull request #359 from KomodoPlatform/beta
ca333 May 21, 2020
4db5591
disable throw_if_sync
ca333 May 22, 2020
b1ce090
MESH - CC Activation
himu007 May 26, 2020
48afc55
MESH - CC Activation
himu007 May 26, 2020
6ad6bc2
Merge pull request #361 from himu007/dev
ca333 May 26, 2020
79daaa1
minor spelling fix
smk762 Jun 3, 2020
42a2cb6
Merge pull request #363 from smk762/patch-9
ca333 Jun 3, 2020
d8ecf0c
fix windows build guide
DeckerSU Jun 3, 2020
650dca8
Merge pull request #365 from DeckerSU/patch-winbuild-guide
ca333 Jun 4, 2020
eb31d6c
+ CountBits in crypto/common.h
DeckerSU Jun 5, 2020
377c9c5
Add asmap utility which queries a mapping
DeckerSU Jun 5, 2020
5550e12
p2p: supplying and using asmap to improve IP bucketing in addrman
DeckerSU Jun 5, 2020
4544c1f
Return mapped AS in RPC call getpeerinfo and in GUI
DeckerSU Jun 5, 2020
67cb0ca
Addrman Google Tests
DeckerSU Jun 6, 2020
421795c
add legacy and asmap addrman tests
DeckerSU Jun 6, 2020
d5d1249
when clearing addrman clear mapInfo and mapAddr
DeckerSU Jun 7, 2020
f4cb8b9
add addrman serialization test
DeckerSU Jun 7, 2020
7d411ae
addrman: Add missing lock in Clear() (CAddrMan)
DeckerSU Jun 7, 2020
49cdd67
add fsbridge namespace (using by addrman in DecodeAsmap)
DeckerSU Jun 7, 2020
cc1ca6e
fix copyStats call (asmap)
DeckerSU Jun 7, 2020
e05f1c7
remove inactive coins
himu007 Jun 9, 2020
7971f32
remove SEC
himu007 Jun 9, 2020
d9749eb
Merge pull request #366 from DeckerSU/patch-asmap
ca333 Jun 10, 2020
97e3b9f
Merge pull request #367 from himu007/s4
ca333 Jun 10, 2020
49397ba
Update funcs.mk
crackfoo Jun 12, 2020
567103d
Tmp renames
jl777 Jun 14, 2020
7631f34
Revert
jl777 Jun 14, 2020
2e86703
More reverts
jl777 Jun 14, 2020
05c7464
Sync miner.cpp
jl777 Jun 14, 2020
c86bd5a
net.h
jl777 Jun 14, 2020
28947fa
build.sh
jl777 Jun 14, 2020
c815fa1
Fix
jl777 Jun 14, 2020
91d000e
update funcs.mk
ca333 Jun 14, 2020
3bb5331
Merge pull request #368 from crackfoo/patch-4
ca333 Jun 14, 2020
19c27f2
updates assetchains.json to mirror dPoW repo
gcharang Jun 14, 2020
b37b004
updates the assetchains.old file to mirror the dPoW repo
gcharang Jun 14, 2020
30cfb89
removes cli files of etomic and kv
gcharang Jun 14, 2020
e159b4e
Merge pull request #371 from gcharang/dev
ca333 Jun 14, 2020
d2d2ac3
resolve conflict net.h
ca333 Jun 14, 2020
2ba9366
resolve conflict miner.cpp
ca333 Jun 14, 2020
2b2df5d
Merge pull request #1850 from ca333/patch-13
jl777 Jun 14, 2020
fba0c71
resolve conflict komodod_ci.yml
ca333 Jun 14, 2020
a99809d
resolve conflict pytest_util.py
ca333 Jun 14, 2020
5529641
resolve conflict conftest.py
ca333 Jun 14, 2020
ac4498c
Merge pull request #1851 from ca333/patch-13
jl777 Jun 14, 2020
54fd345
Merge branch 'dev' into dev
ca333 Jun 14, 2020
7fddf74
revert conflict resolution merge from jl777:dev
ca333 Jun 14, 2020
5000f2a
bump version
ca333 Jun 21, 2020
40878ca
updates the assetchains.old file to add "$1" at the end of all the ch…
gcharang Jun 30, 2020
987f1b7
refactor: remove unused header var in GetBlockProof
DeckerSU Jul 1, 2020
9ac57b9
Merge pull request #375 from gcharang/dev
ca333 Jul 2, 2020
465f5e3
Merge pull request #376 from DeckerSU/patch-getblockproof
ca333 Jul 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
name: Komodo CI
name: Komodo Linux CI

on: [push, pull_request]
on:
pull_request:
types: [opened, synchronize, reopened]
schedule:
- cron: '0 0 * * 1'

jobs:

linux-build:
name: Linux Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (Linux)

env:
DEBIAN_FRONTEND: noninteractive
if: runner.os == 'Linux'
run: |
sudo apt-get remove php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17 mysql-server*
sudo apt-get update
sudo ACCEPT_EULA=Y apt-get upgrade -y
sudo apt-get install -q \
curl \
python3 \
Expand All @@ -30,52 +35,25 @@ jobs:
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
./zcutil/fetch-params.sh

- name: Build (Linux)
if: runner.os == 'Linux'
run: |
# flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build.sh -j$(nproc)
tar -czvf komodo-linux.tar.gz src/komodod src/komodo-cli

- name: Upload komodo-linux.tar.gz as artifact
uses: actions/upload-artifact@v1
with:
name: komodo-linux
path: ./komodo-linux.tar.gz
# - name: Install deps (macOS)
# if: runner.os == 'macOS'
# run: |
# brew update
# brew upgrade
# brew tap discoteq/discoteq; brew install flock
# brew install autoconf autogen automake
# brew install gcc@8
# brew install binutils
# brew install protobuf
# brew install coreutils
# brew install wget
# brew install python3
# pip3 install setuptools wheel slick-bitcoinrpc pytest wget
# ./zcutil/fetch-params.sh

# - name: Build (macOS)
# if: runner.os == 'macOS'
# run: |
# # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
# export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
# CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build-mac.sh -j4
# - name: Run CC tests
# if: runner.os == 'Linux' || runner.os == 'macOS'


linux-test-dice-token-reards-faucet-cc:

name: Test (Linux/Dice, Token, Faucet, Rewards)
runs-on: ubuntu-latest
needs: linux-build

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (Dice, Token, Faucet, Rewards CC)
run: |
Expand All @@ -90,7 +68,6 @@ jobs:
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema

- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand All @@ -104,14 +81,14 @@ jobs:
./zcutil/fetch-params.sh
cd qa/pytest_komodo
./ci_setup.sh "cc_modules/test_dice.py cc_modules/test_faucet.py cc_modules/test_token.py cc_modules/test_rewards.py"

linux-test-oracles:

name: Test (Linux/OraclesCC)
runs-on: ubuntu-latest
needs: linux-build

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (OraclesCC)
run: |
Expand All @@ -126,7 +103,6 @@ jobs:
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema

- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand All @@ -140,14 +116,14 @@ jobs:
./zcutil/fetch-params.sh
cd qa/pytest_komodo
./ci_setup.sh cc_modules/test_oracles.py

linux-test-baserpc:

name: Test (Linux/BasicRPC)
runs-on: ubuntu-latest
needs: linux-build

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (BasicRPC)
run: |
Expand All @@ -162,7 +138,6 @@ jobs:
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema

- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand All @@ -176,14 +151,14 @@ jobs:
./zcutil/fetch-params.sh
cd qa/pytest_komodo
./ci_setup.sh basic

linux-test-channels:

name: Test (Linux/ChannelsCC)
runs-on: ubuntu-latest
needs: linux-build

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (ChannelsCC)
run: |
Expand All @@ -198,7 +173,6 @@ jobs:
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema

- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand All @@ -212,14 +186,14 @@ jobs:
./zcutil/fetch-params.sh
cd qa/pytest_komodo
./ci_setup.sh cc_modules/test_channels.py

linux-test-heir:

name: Test (Linux/HeirCC)
runs-on: ubuntu-latest
needs: linux-build

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Install deps (HeirCC)
run: |
Expand All @@ -234,7 +208,6 @@ jobs:
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema

- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand All @@ -248,33 +221,3 @@ jobs:
./zcutil/fetch-params.sh
cd qa/pytest_komodo
./ci_setup.sh cc_modules/test_heir.py

windows-build:

name: Win Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Build Win on Unix
env:
DEBIAN_FRONTEND: noninteractive
if: runner.os == 'Linux'
run: |
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17
sudo apt-get update
sudo ACCEPT_EULA=Y apt-get upgrade -y
sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool libncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang libsodium-dev -y
sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl cmake mingw-w64 -y
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
rustup target add x86_64-pc-windows-gnu
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build-win.sh -j$(nproc)
zip --junk-paths komodod_win src/komodod.exe
- name: Upload komodod.exe as artifact
uses: actions/upload-artifact@v1
with:
name: komodod_win
path: ./komodod_win.zip
Loading