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

Update qa branch for v0.3.0 #479

Merged
merged 153 commits into from
Aug 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
3fb2517
merge geth v1.10.15
temaniarpit27 Jan 12, 2022
371a411
fix: Removed FastSync from cli server
0xsharma Feb 2, 2022
2111d4c
fix: TestHeadersRLPStorage
0xsharma Feb 2, 2022
a6c5473
Merge branch 'master' into gethv1.10.15-merge
0xsharma Feb 2, 2022
672a15e
Added t.skip(ETH2 in bor)
0xsharma Feb 2, 2022
08509c6
fix: flow in create consensus engine
manav2401 Feb 2, 2022
c8587b0
bumped version
ssandeep Feb 11, 2022
51d17ea
Fix typo
Feb 2, 2022
555e238
increase block time
temaniarpit27 Feb 24, 2022
111a204
remove file
temaniarpit27 Feb 24, 2022
c8c9296
Merge branch 'master' of https://github.com/maticnetwork/bor into v0.…
manav2401 Mar 30, 2022
ebf95b9
bumped version
manav2401 Mar 30, 2022
a551f01
merge gethv1.10.17
manav2401 Apr 4, 2022
54c6db5
merge master into v0.2.16-candidate
manav2401 Apr 11, 2022
44e5edf
bumped version
manav2401 Apr 11, 2022
d5b76d4
fix failing tests
temaniarpit27 Apr 11, 2022
bf85e15
Bump Go version to v1.18 (#368)
Apr 19, 2022
1a31178
Build using netgo tag
Dec 22, 2021
0525715
Merge 'master' into 'v0.2.16-candidate'
manav2401 Apr 26, 2022
429deab
Fix meta
Apr 26, 2022
cc7c5b3
initial implementation for common ancestor approach
manav2401 May 2, 2022
2cb82c9
extract whitelist interface
JekaMas May 5, 2022
aa3004b
fix types
JekaMas May 5, 2022
0a63981
add seperate module config for http and ws
manav2401 Jan 27, 2022
0232c6a
Do not build classic docker image
Feb 2, 2022
b416577
Protobuf tooling fix and upgrade (#313)
vcastellm Feb 3, 2022
66fc055
Build and run the new CLI (#318)
vcastellm Feb 3, 2022
e10b10a
start http rpc server and eth namespace by default (#319)
manav2401 Feb 4, 2022
1ef2726
Add ability to run using chain json file
0xKrishna Jan 21, 2022
b398409
Updated file check
0xKrishna Jan 21, 2022
d7ebe2f
Add test case for Import from file
0xKrishna Jan 24, 2022
98b7117
Rename chain test case
0xKrishna Jan 24, 2022
4e6d323
Added GetSnapshotProposerSequence
0xsharma Feb 15, 2022
e496afb
Minor Fix
0xsharma Feb 15, 2022
e0b43b0
Minor fix
0xsharma Feb 15, 2022
b172ba8
Sorted Difficulties
0xsharma Feb 16, 2022
c3d180c
Minor fix
0xsharma Feb 16, 2022
5039f4f
Added bor fingerprint
0xsharma Jan 21, 2022
d503410
code refactor
0xsharma Jan 24, 2022
be2463b
read/write IOPS added
0xsharma Jan 31, 2022
55aa9af
Removed Fio installation process
0xsharma Feb 16, 2022
7f54699
Initial Work Setup
0xsharma Mar 16, 2022
1530452
minor fixes
0xsharma Mar 17, 2022
065556d
Minor Fixes
0xsharma Mar 17, 2022
0736fde
Added console + attach refactor
0xsharma Mar 22, 2022
00e51a9
Removed console command
0xsharma Mar 23, 2022
388b68c
Minor Fixes
0xsharma Apr 20, 2022
597037d
Update default cli config (#323)
manav2401 Apr 26, 2022
a131e42
Automatically generate markdown pages from bor CLI
cffls Apr 22, 2022
ad8bede
Add bootnode cli
cffls May 3, 2022
8fc86cc
Fix prometheus path and add prometheus to bor.service
cffls May 6, 2022
a885651
Merge pull request #381 from maticnetwork/jc/clidoc
cffls May 10, 2022
110ea65
Merge pull request #385 from cffls/jc/prometheus
cffls May 10, 2022
eb76df2
better ci
JekaMas May 11, 2022
5192fd7
split units and integration. step 1
JekaMas May 11, 2022
ee5b7c0
integration tag
JekaMas May 11, 2022
63cd7a3
move integration ci
JekaMas May 11, 2022
b43ebd5
fix build
JekaMas May 11, 2022
3c2510a
move integration ci
JekaMas May 11, 2022
1590047
linters
JekaMas May 11, 2022
a6ec55b
fix tests and format
manav2401 May 11, 2022
64ad2f9
update linter list
JekaMas May 11, 2022
834c774
only new issues
JekaMas May 11, 2022
cd4b40f
test without linters
JekaMas May 11, 2022
6a598b4
revert
JekaMas May 11, 2022
348f91e
more time for tests for data races
JekaMas May 11, 2022
5458ac0
fix
JekaMas May 11, 2022
b2b327e
ignore cmd tests
JekaMas May 11, 2022
7c6357e
group concurrency
JekaMas May 11, 2022
e36a54d
goleak
JekaMas May 11, 2022
2bac6ce
remove shuffle for e2e
JekaMas May 11, 2022
ca19e01
fix
JekaMas May 11, 2022
9838fef
Set default user to ubuntu in bor.service
cffls May 11, 2022
bae9c44
add unit tests for IsValidChain function
manav2401 May 12, 2022
f0f113c
run versus origin/master
JekaMas May 12, 2022
594c9ab
vs master
JekaMas May 12, 2022
a57d211
leaks
JekaMas May 12, 2022
b05c336
fmt
JekaMas May 12, 2022
30641c0
Merge pull request #396 from cffls/v0.3.0-dev
cffls May 12, 2022
39d943d
stable tests
JekaMas May 13, 2022
81ede2f
where to run
JekaMas May 13, 2022
485762a
where to run
JekaMas May 13, 2022
3268c14
where to run
JekaMas May 13, 2022
276e82b
where to run1
JekaMas May 13, 2022
a8a9229
where to run2
JekaMas May 13, 2022
5a3eb08
where to run3
JekaMas May 13, 2022
95bfcdc
macos tests
JekaMas May 13, 2022
e787097
restore codecov
JekaMas May 13, 2022
52647fc
run on forked branches
JekaMas May 16, 2022
30dd11a
run on forked branches
JekaMas May 16, 2022
91559f3
run on forked branches
JekaMas May 16, 2022
8de6903
Implement and enable 'unlock' flag
cffls May 16, 2022
3dd7f59
more tests
JekaMas May 17, 2022
af2b5e0
wip
JekaMas May 17, 2022
3aaf6bc
cherry-pick from Jerry's Chen branch
JekaMas May 17, 2022
2930d04
misspell
JekaMas May 17, 2022
c02e2cb
Rename whitelist to requiredblocks
cffls May 18, 2022
b1b0c0e
test ErrCheckpointMismatch
JekaMas May 18, 2022
cd1a899
Merge pull request #403 from cffls/v0.3.0-dev
cffls May 18, 2022
fb46dd8
minor fixes
JekaMas May 19, 2022
d493806
fix test
JekaMas May 19, 2022
89fadee
dont panic
JekaMas May 19, 2022
01117ac
fmt
JekaMas May 19, 2022
1b53044
internal/cli/server, eth: add option to disable personal wallet endpo…
manav2401 May 23, 2022
2323f2c
fix: modify build eth fn definition for account unlock handling (#412)
manav2401 May 23, 2022
63bedf3
Merge pull request #405 from cffls/whitelist
cffls May 23, 2022
87a2e52
Merge pull request #395 from maticnetwork/testing-flags
JekaMas May 23, 2022
12ab0f0
Lint consensus/bor module
cffls May 20, 2022
2b089ee
fix: return value for no remote block
manav2401 May 24, 2022
c46a293
handle all errors
manav2401 May 24, 2022
9c86192
modularise fake chain validator in downloader
manav2401 May 24, 2022
cb9d291
add more tests
manav2401 May 24, 2022
2ba7c03
fix tests
manav2401 May 24, 2022
45a72bc
Lint internal/cli
cffls May 20, 2022
2e2557a
Enable prealloc check and improve address comparison
cffls May 24, 2022
96228cc
Merge pull request #410 from cffls/v0.3.0-dev-lint
cffls May 26, 2022
5092006
Fix default Dockerfile for new CLI
cffls May 27, 2022
3ae87c0
Read static-nodes and trusted-nodes from default files if not specifi…
cffls May 26, 2022
4cec5f0
Add ability to parse legacy genesis file
cffls May 26, 2022
96ac8d1
Overwrite default config with CLI input even when the input value is …
cffls Jun 1, 2022
d4e7603
add debug rpc endpoints for checkpoint whitelist service
manav2401 Jun 2, 2022
8255d19
minor fixes and enhancements
manav2401 Jun 2, 2022
b19d5e1
Merge branch 'master' into rfc35/common-ancestor-approach-units
manav2401 Jun 2, 2022
4ffdbfe
Merge pull request #417 from cffls/v0.3.0-dev-lint
cffls Jun 2, 2022
57e829f
avoid capping warnings for gas set by internal system transactions
karlonovak Jun 3, 2022
c9a3b99
use typed mocks
JekaMas Jun 3, 2022
494687f
fix
JekaMas Jun 3, 2022
01b6d6c
fix
JekaMas Jun 3, 2022
208133b
fix
JekaMas Jun 3, 2022
f8a56b8
fix close
JekaMas Jun 3, 2022
b4872ca
fix
JekaMas Jun 3, 2022
0d2b1d0
internal/cli: add block tracing (#397)
manav2401 Jun 6, 2022
8808c23
Merge pull request #419 from cffls/v0.3.0-dev-flags
cffls Jun 7, 2022
ed2d9ae
Merge pull request #386 from maticnetwork/rfc35/common-ancestor-appro…
temaniarpit27 Jun 8, 2022
c3a0c20
Create stale.yml
ssandeep Jun 8, 2022
9c8bf51
Prepare Bor package for testing (#416)
JekaMas Jun 8, 2022
edd21b3
Merge pull request #421 from karlonovak/master
temaniarpit27 Jun 9, 2022
8ebac95
Merge pull request #424 from maticnetwork/stale-workflows
temaniarpit27 Jun 9, 2022
342bf30
Merge develop branch into v0.3.0-dev (#430)
JekaMas Jun 15, 2022
33e646e
Add keystore option to cli
cffls Jun 14, 2022
9bc9a45
Merge branch 'v0.3.0-dev' into develop
cffls Jun 15, 2022
9ec6738
Set Heimdall client to nil when 'withoutheimdall' is set
cffls Jun 16, 2022
9592534
Integration tests
cffls Jun 16, 2022
fbaeaa2
Added reproducible build test to CI
0xKrishna Jun 21, 2022
3bb1480
Merge pull request #437 from maticnetwork/krishna/reproducible-build-…
0xKrishna Jun 21, 2022
1daa659
Merge remote-tracking branch 'upstream/develop' into develop
cffls Jun 22, 2022
88dbfa1
Merge pull request #433 from cffls/develop
cffls Jun 22, 2022
a73b0f7
change version
temaniarpit27 Jun 27, 2022
f90faf0
Match default parameters to mainnet
cffls Jun 30, 2022
f539818
Change diverged flags back to Geth's convention (POS-602) (#451)
pratikspatil024 Jul 14, 2022
e62beee
internal/cli: use config file for flags in new-cli, builder/files: up…
pratikspatil024 Jul 27, 2022
8378cc9
Add 'bor' user during package installation
cffls Jul 28, 2022
694dc02
fixed the bug caused by fillBigInt and FillTime.Duration functions (#…
pratikspatil024 Jul 29, 2022
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
11 changes: 11 additions & 0 deletions .github/matic-cli-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defaultStake: 10000
defaultFee: 2000
borChainId: "15001"
heimdallChainId: heimdall-15001
contractsBranch: jc/v0.3.1-backport
numOfValidators: 3
numOfNonValidators: 0
ethURL: http://ganache:9545
devnetType: docker
borDockerBuildContext: "../../bor"
heimdallDockerBuildContext: "https://github.com/maticnetwork/heimdall.git#v0.3.0-dev"
195 changes: 179 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,183 @@
name: CI
on: [push, pull_request]
on:
push:
branches:
- "master"
- "qa"
- "develop"
pull_request:
branches:
- "**"
types: [opened, synchronize, edited]

concurrency:
group: build-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
tests:
if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
strategy:
matrix:
os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17
- name: "Build binaries"
run: make all
- name: "Run tests"
run: make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
file: ./cover.out
- uses: actions/checkout@v3
- run: |
git submodule update --init --recursive --force
git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master

- uses: actions/setup-go@v3
with:
go-version: 1.18.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential

- name: Golang-ci install
if: runner.os == 'Linux'
run: make lintci-deps

- uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/Library/Caches/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: ${{ runner.os }}-go-

- name: Build
run: make all

- name: Lint
if: runner.os == 'Linux'
run: make lint

- name: Test
run: make test

#- name: Data race tests
# run: make test-race

- name: test-integration
run: make test-integration

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
file: ./cover.out

# # TODO: make it work
# - name: Reproducible build test
# run: |
# make geth
# shasum -a256 ./build/bin/geth > bor1.sha256
# make geth
# shasum -a256 ./build/bin/geth > bor2.sha256
# if ! cmp -s bor1.sha256 bor2.sha256; then
# echo >&2 "Reproducible build broken"; cat bor1.sha256; cat bor2.sha256; exit 1
# fi

integration-tests:
if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
strategy:
matrix:
os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
path: bor
- name: Checkout submodules
run: |
cd bor
git submodule update --init --recursive --force
git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master

- uses: actions/setup-go@v3
with:
go-version: 1.18.x

- name: Checkout matic-cli
uses: actions/checkout@v3
with:
repository: maticnetwork/matic-cli
ref: v0.3.0-dev
path: matic-cli

- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: |
sudo apt update
sudo apt install build-essential
curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
sudo snap install solc
sudo apt install python2 jq curl
sudo ln -sf /usr/bin/python2 /usr/bin/python

- uses: actions/setup-node@v3
with:
node-version: '10.17.0'
cache: 'npm'
cache-dependency-path: |
matic-cli/package-lock.json
matic-cli/devnet/code/contracts/package-lock.json
matic-cli/devnet/code/genesis-contracts/package-lock.json
matic-cli/devnet/code/genesis-contracts/matic-contracts/package-lock.json

- name: Bootstrap devnet
run: |
cd matic-cli
npm install --prefer-offline --no-audit --progress=false
mkdir devnet
cd devnet
../bin/matic-cli setup devnet -c ../../bor/.github/matic-cli-config.yml

- name: Launch devnet
run: |
cd matic-cli/devnet
bash docker-ganache-start.sh
bash docker-heimdall-start-all.sh
bash docker-bor-setup.sh
bash docker-bor-start-all.sh
sleep 120 && bash ganache-deployment-bor.sh
sleep 120 && bash ganache-deployment-sync.sh
sleep 120
docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'admin.peers'"
docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'eth.blockNumber'"

- name: Run smoke tests
run: |
echo "Deposit 100 matic for each account to bor network"
cd matic-cli/devnet/code/contracts
npm run truffle exec scripts/deposit.js -- --network development $(jq -r .root.tokens.MaticToken contractAddresses.json) 100000000000000000000
cd -
bash bor/integration-tests/smoke_test.sh

- name: Upload logs
if: always()
uses: actions/upload-artifact@v3
with:
name: logs_${{ github.run_id }}
path: |
matic-cli/devnet/logs

- name: Package code and chain data
if: always()
run: |
cd matic-cli/devnet
docker compose down
cd -
mkdir -p ${{ github.run_id }}/matic-cli
sudo mv bor ${{ github.run_id }}
sudo mv matic-cli/devnet ${{ github.run_id }}/matic-cli
sudo tar czf code.tar.gz ${{ github.run_id }}

- name: Upload code and chain data
if: always()
uses: actions/upload-artifact@v3
with:
name: code_${{ github.run_id }}
path: code.tar.gz
29 changes: 0 additions & 29 deletions .github/workflows/dockerimage.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark stale issues and pull requests

on:
schedule:
- cron: '0 0 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
stale-pr-message: 'This PR is stale because it has been open 21 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
close-issue-message: 'This issue was closed because it has been stalled for 28 days with no activity.'
close-pr-message: 'This PR was closed because it has been stalled for 35 days with no activity.'
days-before-issue-stale: 14
days-before-pr-stale: 21
days-before-issue-close: 14
days-before-pr-close: 14
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/**/*dapps*
build/_vendor/pkg

cover.out

#*
.#*
*#
Expand Down
Loading