Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
474 commits
Select commit Hold shift + click to select a range
85ecd63
update golang ci lint
cheng762 Nov 20, 2020
f15f0bf
Merge pull request #1614 from cheng762/alaya-0.14.0
benbaley Nov 20, 2020
b8b82ef
Delete the ec that initializes the unit test
WeiLoy Nov 20, 2020
16328aa
Merge pull request #1616 from WeiLoy/alaya-0.14.0
benbaley Nov 20, 2020
83c6dd6
Merge pull request #1619 from PlatONnetwork/alaya-0.14.0
benbaley Nov 26, 2020
167e46e
when wasm contracts cross call, could not get the error code for the …
jatel Dec 3, 2020
aeced69
Merge pull request #1624 from jatel/alaya-develop
benbaley Dec 4, 2020
65f6d17
Modify the gasprice of gov
WeiLoy Dec 8, 2020
8496e41
Merge remote-tracking branch 'platon/alaya-0.14.0' into alaya-0.14.0
WeiLoy Dec 9, 2020
84b6d15
fix restricting cal error
cheng762 Dec 9, 2020
384ea3c
Merge pull request #1628 from WeiLoy/alaya-0.14.0
benbaley Dec 9, 2020
29224a7
add quote
cheng762 Dec 9, 2020
df1a729
Merge pull request #1627 from cheng762/alaya-develop
benbaley Dec 9, 2020
7984b7b
fix restricting
cheng762 Dec 10, 2020
9234166
add test
cheng762 Dec 10, 2020
16aced7
Merge pull request #1630 from cheng762/alaya-develop
benbaley Dec 11, 2020
c1f3d45
Modify the description of the exception
WeiLoy Dec 11, 2020
273d458
Merge pull request #1634 from WeiLoy/alaya-0.15.0
benbaley Dec 11, 2020
7cfe5bb
remove deprecated flag
cheng762 Nov 25, 2020
f9263af
remove flags txpool gasprice limit,please use minner gaslimit
cheng762 Dec 11, 2020
7b8e727
when new txpool ,init gasprice first
cheng762 Dec 11, 2020
5b0fa77
staking can use both free and restricting von
cheng762 Dec 11, 2020
fe0f00f
Merge pull request #1635 from cheng762/alaya-0.15.0
benbaley Dec 11, 2020
4e9eb1e
update wagon mod
jiangshangqifeng Dec 11, 2020
c445abd
mixPledgeLockFunds add error code
cheng762 Dec 11, 2020
91dda11
Merge remote-tracking branch 'origin/alaya-0.15.0' into alaya-0.15.0
cheng762 Dec 11, 2020
34198e6
Merge pull request #1636 from jiangshangqifeng/alaya-0.15.0
benbaley Dec 11, 2020
2be8f3a
fix des
cheng762 Dec 11, 2020
9539cfb
fix heartbeat in txpool
niuxiaojie81 Dec 11, 2020
3817598
Merge pull request #1638 from cheng762/alaya-0.15.0
benbaley Dec 11, 2020
8b7ebdd
Merge pull request #1639 from niuxiaojie89/alaya-0.15.0
benbaley Dec 11, 2020
04b72cb
add restricting roll back
cheng762 Dec 14, 2020
96a598f
1.add quote
cheng762 Dec 17, 2020
e54a662
add sort
cheng762 Dec 18, 2020
ad9c30f
1.add quote for fix plugin
cheng762 Dec 22, 2020
f52cb67
update for name
cheng762 Dec 22, 2020
de0a6d6
Merge remote-tracking branch 'origin/alaya-0.15.0' into alaya-0.15.0
cheng762 Dec 22, 2020
43217f8
fix MixPledgeLockFunds ,when user not have restricting,we just use fr…
cheng762 Dec 22, 2020
559c256
fix and add test
cheng762 Dec 23, 2020
cd0ba2a
update handleDelegate
cheng762 Dec 23, 2020
3e5de25
update for handleDelegate
cheng762 Dec 23, 2020
58b8cd6
fix handleDelegate
cheng762 Dec 24, 2020
d7d611f
Merge pull request #1641 from cheng762/alaya-0.15.0
benbaley Dec 24, 2020
d7447bc
1. fix staking rool back
cheng762 Dec 24, 2020
597a971
No need to restore the state if the staking has been revoked
WeiLoy Dec 24, 2020
aee2390
Merge pull request #1646 from cheng762/alaya-0.15.0
benbaley Dec 24, 2020
8e50b4e
update
cheng762 Dec 24, 2020
b8dfd8d
Merge pull request #1647 from WeiLoy/alaya-0.15.0
benbaley Dec 24, 2020
a073dff
update getRestrictingInfoToReturn
cheng762 Dec 28, 2020
68a3ac5
fix ctool
cheng762 Dec 28, 2020
b031e27
fix del reward cal
cheng762 Dec 28, 2020
2d16552
Merge remote-tracking branch 'origin/alaya-0.15.0' into alaya-0.15.0
cheng762 Dec 29, 2020
9353453
Dynamically calculate the P value of the binomial distribution
WeiLoy Dec 29, 2020
5cd6355
Merge remote-tracking branch 'platon/alaya-0.15.0' into alaya-0.15.0
WeiLoy Dec 29, 2020
f193258
Remove useless configuration
WeiLoy Dec 29, 2020
93b8b9a
When revoking the delegation, if the node is locked by penalty, the t…
WeiLoy Dec 29, 2020
49d27a3
fix
cheng762 Dec 29, 2020
7170513
Merge pull request #1649 from cheng762/alaya-0.15.0
benbaley Dec 30, 2020
217a402
Merge pull request #1652 from WeiLoy/alaya-0.15.0
benbaley Dec 30, 2020
62ebde3
When the new version is successfully upgraded, stop running the lower…
WeiLoy Dec 30, 2020
db4d2c8
fix cbft log
cheng762 Dec 30, 2020
6b92d78
Merge pull request #1655 from cheng762/alaya-0.15.0
benbaley Dec 30, 2020
0b8c07b
update fix issue1625,if the delegate or staking don't use restrict,no…
cheng762 Dec 30, 2020
71cb4ec
update for issue1625 accounts
cheng762 Dec 30, 2020
9e683bb
fix chainid
cheng762 Dec 30, 2020
db1e9bd
remove getRestrictingInfoByDecode
cheng762 Dec 30, 2020
2a55dda
Merge pull request #60 from PlatONnetwork/alaya-0.15.0
niuxiaojie81 Dec 30, 2020
11aa5b8
update
cheng762 Dec 30, 2020
bdc8d57
Stop running when it is lower than the newly upgraded version
WeiLoy Dec 30, 2020
79309f8
fix sort
cheng762 Dec 31, 2020
7962aaa
fix nodeid may not found
cheng762 Dec 31, 2020
a1d4768
update log
cheng762 Dec 31, 2020
cd6b22f
update
cheng762 Dec 31, 2020
0046ce4
fix for node id
cheng762 Dec 31, 2020
681f223
Modify unit test
WeiLoy Dec 31, 2020
286d282
Merge pull request #1653 from WeiLoy/alaya-0.15.0
benbaley Dec 31, 2020
e997fe7
Merge pull request #1657 from cheng762/alaya-0.15.0
benbaley Dec 31, 2020
7a42dc3
fix for CanPower update
cheng762 Dec 31, 2020
a2b3854
Merge pull request #1661 from cheng762/alaya-0.15.0
benbaley Dec 31, 2020
c8e7aaf
add comments to func Election
jiangshangqifeng Jan 4, 2021
6fa449a
Merge branch 'alaya-0.15.0' of https://github.com/PlatONnetwork/PlatO…
jiangshangqifeng Jan 4, 2021
faf8c5e
In the zero block lock, the node version will be automatically update…
WeiLoy Jan 4, 2021
299946e
Update node version number
WeiLoy Jan 4, 2021
6e93f9d
Merge pull request #61 from PlatONnetwork/alaya-0.15.0
niuxiaojie81 Jan 4, 2021
d7c34a8
Update P2p Protocol Version and Whitelist Verification
niuxiaojie81 Jan 4, 2021
3084069
Merge branch 'alaya-0.15.0' of https://github.com/niuxiaojie89/PlatON…
niuxiaojie81 Jan 4, 2021
aa3b951
Merge pull request #1663 from WeiLoy/alaya-0.15.0
benbaley Jan 4, 2021
af8ea0d
Update P2p Protocol Version and Whitelist Verification
niuxiaojie81 Jan 4, 2021
a09d0a1
Update P2p Protocol Version and Whitelist Verification
niuxiaojie81 Jan 4, 2021
351e72d
Merge pull request #1664 from niuxiaojie89/alaya-0.15.0
benbaley Jan 4, 2021
ae5cc30
update for 0.15.1
cheng762 Jan 7, 2021
55e448d
fix test
cheng762 Jan 7, 2021
5350967
fix for test
cheng762 Jan 8, 2021
0e1f851
fix error info
cheng762 Jan 8, 2021
01b057b
update for p2p allowNode
cheng762 Jan 8, 2021
309a1a1
update for address prefix save to chainconfig
cheng762 Jan 8, 2021
22b3c46
remove genesis restricting
cheng762 Jan 8, 2021
ec52913
fix cbft test
cheng762 Jan 8, 2021
d7e84f5
Merge pull request #1670 from cheng762/alaya-0.15.1
benbaley Jan 8, 2021
38c30e9
Merge pull request #1671 from cheng762/alaya-0.15.0
benbaley Jan 8, 2021
2ff94cb
1. add address check
cheng762 Jan 11, 2021
d1acd4e
update address prefix to hrp
cheng762 Jan 11, 2021
64bf252
fix cbft test
cheng762 Jan 11, 2021
8d0d24b
fix quote
cheng762 Jan 11, 2021
6af2431
fix
cheng762 Jan 11, 2021
bf37209
Merge pull request #1672 from cheng762/alaya-0.15.1
benbaley Jan 11, 2021
fa50aeb
update alayakey readme
cheng762 Jan 14, 2021
9ce2b33
Merge pull request #1676 from cheng762/alaya-0.15.1
benbaley Jan 14, 2021
2f04b71
update for web3.js
cheng762 Jan 14, 2021
ec89fab
update for web3.js
cheng762 Jan 14, 2021
5279554
Merge pull request #1678 from cheng762/alaya-0.15.1
benbaley Jan 14, 2021
462ca51
fix restricting release
cheng762 Jan 20, 2021
4cf5894
Merge pull request #1682 from cheng762/alaya-0.15.1
benbaley Jan 20, 2021
c4252c4
Merge pull request #1686 from PlatONnetwork/alaya-0.15.0
benbaley Jan 21, 2021
873ba4d
update for p2p allowNode
niuxiaojie81 Jan 25, 2021
aebbb95
update for p2p allowNode
niuxiaojie81 Jan 25, 2021
7bc9e15
Merge pull request #1692 from niuxiaojie89/alaya-develop
benbaley Jan 25, 2021
49bfebc
Optimize the logic of findnode
niuxiaojie81 Jan 26, 2021
ef779f4
Optimize the logic of findnode
niuxiaojie81 Jan 26, 2021
9867ee6
Merge pull request #1693 from niuxiaojie89/alaya-develop
benbaley Jan 26, 2021
6859c71
Merge branch 'alaya-0.15.1' into alaya-develop
benbaley Feb 3, 2021
4823da0
Merge pull request #1698 from PlatONnetwork/alaya-develop
benbaley Feb 3, 2021
5bd7b18
Modify Patch version number
niuxiaojie81 Feb 5, 2021
34c3857
Merge pull request #1702 from niuxiaojie89/alaya-0.15.1
benbaley Feb 5, 2021
fd46cfd
update for 0.16.0
cheng762 Feb 23, 2021
c9aeac5
update ci
cheng762 Feb 26, 2021
1075826
1.tps cal result data add standardDeviation
cheng762 Feb 26, 2021
0018f4f
Delete the cases directory
niuxiaojie81 Apr 12, 2021
c36f945
Modify readme
niuxiaojie81 Apr 12, 2021
2b5977c
Modify the package file
niuxiaojie81 Apr 12, 2021
fc05002
Modify the reference package name
niuxiaojie81 Apr 12, 2021
45a0e4b
Modify readme
niuxiaojie81 Apr 12, 2021
323c8e9
Modify the console welcome message
niuxiaojie81 Apr 12, 2021
a10d9f7
fix wasm external function platon_block_hash get too low block hash.
May 8, 2021
8f18e47
Merge pull request #6 from jatelDevelopmentWork/develop
benbaley May 31, 2021
58a6d43
Merge pull request #5 from niuxiaojie-Alaya/develop
benbaley May 31, 2021
1d392cd
Merge branch 'alaya-rollback-delegationlock' into feature/bump-versio…
cheng762 May 31, 2021
8385194
fix
cheng762 Jun 1, 2021
2b84eb9
fix shares
cheng762 Jun 7, 2021
fd23d1a
Merge pull request #7 from cheng762/feature/bump-version-to-0.16.0
benbaley Jun 7, 2021
ec0fb97
Modify some of the startup options, delete the options for the specif…
niuxiaojie81 Jun 9, 2021
0fe098b
1.ReceiptForStorage结构的rlp解码函数去掉V3版本的适配,同时去掉v3StoredReceiptRLP结构体
cheng762 Jun 10, 2021
4359ad0
fix ci
cheng762 Jun 10, 2021
781b505
fix ci
cheng762 Jun 10, 2021
c087007
Add 0.16.0 branch judgment
WeiLoy Jun 10, 2021
d3b96b3
fix ci
cheng762 Jun 10, 2021
dbf2504
fix ci
cheng762 Jun 10, 2021
7234a0b
Merge pull request #16 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 10, 2021
fc7622b
Modify Copyright's comment
WeiLoy Jun 10, 2021
872e3b4
BlockHash adds fork handling
Jun 10, 2021
ea19031
Modify some of the startup options, delete the options for the specif…
niuxiaojie81 Jun 10, 2021
3eecad7
fix
cheng762 Jun 10, 2021
2630e4c
implement eth/65 transaction fetcher
Jun 10, 2021
4814182
Merge pull request #10 from niuxiaojie-Alaya/fix-networkFlag
benbaley Jun 10, 2021
cab83ee
Increase economic model Hash verification
Jun 11, 2021
c737df7
update
cheng762 Jun 11, 2021
23debd5
update
cheng762 Jun 11, 2021
4b5a15a
Delete useless functions
WeiLoy Jun 11, 2021
4875cb0
update
cheng762 Jun 11, 2021
e573337
remove go vet
cheng762 Jun 11, 2021
35c930f
remove mobile test
cheng762 Jun 11, 2021
8d5a870
Merge pull request #19 from jatelReview/feature/bump-version-to-0.16.0
benbaley Jun 11, 2021
cd8d414
Modify the name of the pledge as staking
WeiLoy Jun 11, 2021
47fb4e9
Merge pull request #11 from cheng762/feature/bump-version-to-0.16.0
benbaley Jun 11, 2021
6d951bb
fix
cheng762 Jun 11, 2021
7580dce
add log
cheng762 Jun 11, 2021
80346be
Merge pull request #23 from cheng762/feature/bump-version-to-0.16.0
benbaley Jun 11, 2021
09e28f7
Modify the naming of StakingAmount in the RestrictingInfo structure
WeiLoy Jun 11, 2021
321a799
feat: add rpc method platon_chainId
van-bright Jun 15, 2021
aae1df8
Modify word
WeiLoy Jun 15, 2021
0ec50f5
Merge pull request #21 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 15, 2021
5a2dd5c
Merge pull request #20 from sweetdogLi/feature/bump-version-to-0.16.0
benbaley Jun 15, 2021
3102c72
Merge pull request #26 from oldmanfan/feature/bump-version-to-0.16.0
benbaley Jun 15, 2021
396c861
Update README
WeiLoy Jun 16, 2021
49f9546
merge platon
cheng762 Jun 16, 2021
c07c01d
Delete useless files
WeiLoy Jun 16, 2021
f51060e
Update compilation steps
WeiLoy Jun 16, 2021
66af535
Update description
WeiLoy Jun 16, 2021
d9a8d88
Modify Dockerfile content
WeiLoy Jun 17, 2021
2e10def
Limit the length of the Extra field in the block header
WeiLoy Jun 17, 2021
534ad8d
Modify email account
WeiLoy Jun 17, 2021
a611250
update ci
cheng762 Jun 17, 2021
0ac34c3
update ci
cheng762 Jun 17, 2021
463197d
update ci
cheng762 Jun 17, 2021
b1dcd54
update ci
cheng762 Jun 17, 2021
f4f8613
debug
cheng762 Jun 17, 2021
979bf85
debug
cheng762 Jun 17, 2021
51ecf24
debug
cheng762 Jun 17, 2021
0e62dfc
debug
cheng762 Jun 17, 2021
d020557
New unit test
WeiLoy Jun 17, 2021
a076c35
fix: call contract function multi times and always failed
van-bright Jun 17, 2021
2a41ab3
Modify the logic of the broadcast block, and select as many different…
niuxiaojie81 Jun 18, 2021
09809b1
Downloader mode forces the change to full when the current block is n…
niuxiaojie81 Jun 18, 2021
c311c32
Merge pull request #30 from oldmanfan/feature/bump-version-to-0.16.0
benbaley Jun 18, 2021
d586e53
Merge pull request #27 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 18, 2021
dc7a910
Update license
WeiLoy Jun 18, 2021
8b4a86d
Update license
WeiLoy Jun 18, 2021
cba5451
Update license
WeiLoy Jun 18, 2021
99d2cd4
fix issue1783
cheng762 Jun 18, 2021
814364f
Downloader mode forces the change to full when the current block is n…
niuxiaojie81 Jun 18, 2021
53a3fbb
Modify description
WeiLoy Jun 18, 2021
909547f
fix issue 1758
cheng762 Jun 18, 2021
c157b12
Merge remote-tracking branch 'alaya/feature/bump-version-to-0.16.0' i…
WeiLoy Jun 18, 2021
2287eb1
Merge pull request #28 from cheng762/megre_from_platon
benbaley Jun 18, 2021
719d7fb
Merge pull request #31 from niuxiaojie-Alaya/fix-BroadcastBlock
benbaley Jun 18, 2021
238c4d5
Roll back changes
WeiLoy Jun 18, 2021
d23f658
Modify test
WeiLoy Jun 18, 2021
65bedea
Merge pull request #32 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 19, 2021
a2604b8
Increase the judgment of the length of the extended field
WeiLoy Jun 19, 2021
5fe04d3
Merge pull request #35 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 19, 2021
3669d97
Merge remote-tracking branch 'alaya/feature/bump-version-to-0.16.0' i…
WeiLoy Jun 19, 2021
abef87b
update gov gas price checek
cheng762 Jun 21, 2021
e0a7ae6
Merge pull request #33 from cheng762/fix-issue-1783
benbaley Jun 21, 2021
8f63520
Merge pull request #34 from cheng762/fix-issue-1758
benbaley Jun 21, 2021
cd6b554
Election adds shuffling algorithm and adjust expectations
Jun 21, 2021
814e528
withdrewDelegate->withdrewDelegation naming optimization
WeiLoy Jun 21, 2021
2e23ece
Incorrect address obtained by calling contract platon_caller
Jun 21, 2021
d050dfb
Merge pull request #37 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jun 22, 2021
2025693
Merge pull request #38 from jatelReview/feature/bump-version-to-0.16.0
benbaley Jun 22, 2021
3a5cf41
Merge pull request #36 from sweetdogLi/feature/bump-version-to-0.16.0
benbaley Jun 22, 2021
d91d90c
Merge pull request #4 from AlayaNetwork/feature/bump-version-to-0.16.0
niuxiaojie81 Jun 23, 2021
32a6ff1
The clientIdentifier modifies back to platon
niuxiaojie81 Jun 23, 2021
011a8b4
The clientIdentifier modifies back to platon
niuxiaojie81 Jun 23, 2021
d011e3a
Merge pull request #39 from niuxiaojie-Alaya/fix-BroadcastBlock
benbaley Jun 23, 2021
6dcfb33
change c.name back to platon
jiangshangqifeng Jun 23, 2021
975156c
Merge pull request #41 from jiangshangqifeng/feature/bump-version-to-…
benbaley Jun 23, 2021
08d26dc
update go mod
cheng762 Jun 25, 2021
88c7e89
Merge pull request #42 from cheng762/feature/bump-version-to-0.16.0
benbaley Jun 25, 2021
b71f0bf
fix https://github.com/AlayaNetwork/Alaya-Go/issues/40
cheng762 Jun 29, 2021
8165d6c
update tx pool
cheng762 Jun 29, 2021
dceefec
update tx pool
cheng762 Jun 29, 2021
d5f35d8
Merge pull request #43 from cheng762/fix-issue-40
benbaley Jun 29, 2021
9168bfc
update unit test
cheng762 Jun 30, 2021
20cb4a3
Announcement TX hash is only broadcast to some nodes
niuxiaojie81 Jul 3, 2021
578d871
1、MaxPeers包含了MaxConsensusPeers,即MaxPeers的设置必须大于MaxConsensusPeers
niuxiaojie81 Jul 3, 2021
fe447c1
Merge pull request #45 from niuxiaojie-Alaya/feature/bump-version-to-…
benbaley Jul 3, 2021
5977f00
update unit_test
cheng762 Jul 5, 2021
9bcc5f6
update
cheng762 Jul 5, 2021
c71b560
update
cheng762 Jul 5, 2021
c03403d
update
cheng762 Jul 5, 2021
2435afe
update
cheng762 Jul 5, 2021
9ad8306
update
cheng762 Jul 5, 2021
e544a58
Merge pull request #44 from cheng762/feature/bump-version-to-0.16.0
benbaley Jul 5, 2021
e02d434
Merge pull request #5 from AlayaNetwork/feature/bump-version-to-0.16.0
niuxiaojie81 Jul 12, 2021
04eb386
The QC field in the ConfirmedViewChange wal message is allowed to be …
niuxiaojie81 Jul 12, 2021
7f73ca0
The network name in the version number is incorrect (#50)
WeiLoy Jul 12, 2021
3adcf48
Merge pull request #51 from niuxiaojie-Alaya/feature/bump-version-to-…
benbaley Jul 12, 2021
7d5c526
Merge pull request #52 from WeiLoy/feature/bump-version-to-0.16.0_local
benbaley Jul 12, 2021
c1221a4
Merge pull request #29 from AlayaNetwork/feature/bump-version-to-0.16.0
benbaley Jul 16, 2021
20c2a58
Merge branch 'master' into develop
benbaley Jul 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 0 additions & 20 deletions .github/workflows/golangci-lint.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: golangci-lint
on:
pull_request:
branches: '**'
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
id: go

- uses: actions/checkout@v2

- name: make
run: bash ./build/build_deps.sh

- name: Get dependencies
run : |
go mod download

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: 'latest'
args: --no-config --issues-exit-code=0 --timeout=30m --tests=false --skip-dirs="tests" --skip-dirs-use-default=true --disable-all --enable=misspell --enable=goconst --enable=gofmt --enable=goimports --enable=gosec --enable=unconvert --enable=unparam --enable=funlen
skip-go-installation: true
skip-pkg-cache: true
22 changes: 14 additions & 8 deletions .github/workflows/test.yml → .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Go
name: unittest

on:
pull_request:
branches: '*'
branches: '**'
env:
GO111MODULE: on
jobs:
Expand All @@ -14,25 +14,31 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: ^1.15
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2

- uses: actions/cache@v1
- uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Get dependencies
run: |
go get -v -t -d ./...

go mod download

- name: Build
run: make platon
run: make alaya

- name: Test
run: go test -tags=test -covermode=count -coverprofile=coverage.out `go list ./...|grep -v life|grep -v swarm|grep -v tests|grep -v bn256|grep -v mobile`
run: go test -tags=test -covermode=count -coverprofile=coverage.txt `go list ./...`

- name: Upload coverage report
uses: codecov/codecov-action@v1
with:
file: ./coverage.txt
flags: unittests
name: codecov-umbrella
11 changes: 10 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This is the official list of PlatON-Go authors for copyright purposes.
# This is the official list of Alaya-Go authors for copyright purposes.

Gavin <meiyan532484710@163.com>
GavinXu <meiyan532484710@163.com>
GavinXu520 <meiyan532484710@163.com>
James QU <junjie.qu@qq.com>
Joey <bglmmz@hotmail.com>
Expand All @@ -15,30 +16,38 @@ alliswell <jianghaitao@juzix.net>
awake <hietel366435@163.com>
benbaley <45843736+benbaley@users.noreply.github.com>
bglmmz <bglmmz@hotmail.com>
bglmmz <lvxiaoyi@juzix.net>
caiguopei <caiguopei@juzix.io>
chenfeixiang <chenfeixiang@juzix.net>
chenfeixiang <mokeyc@163.com>
chinese-wu <1102252651@qq.com>
chinese-wu <41734952+chinese-wu@users.noreply.github.com>
clearly <910372762@qq.com>
gavin <meiyan532484710@163.com>
guodeng <905825932@qq.com>
jianghaitao@192.168.10.68 <jianghaitao@juzix.io>
joey <bglmmz@hotmail.com>
kongwei <55940531+kw805@users.noreply.github.com>
liuzhiqiang <waxs2006>
luo-dahui <934803813@qq.com>
luodahui <934803813@qq.com>
luodahui <luo-dahui@qq.com>
luowei <luowei@juzix.net>
luowei <wei_loy@163.com>
lvxiaoyi <lvxiaoyi@juzix.io>
lvxiaoyi <lvxiaoyi@juzix.net>
mowind <wjinwen.1988@gmail.com>
niuxiaojie81 <30611384+niuxiaojie81@users.noreply.github.com>
niuxiaojie81 <85773309@qq.com>
simonhsj <huangsaijie@wxblockchain.com>
simonhsj <simonhsj@gmail.com>
simonhsj@gmail.com <simonhsj@gmail.com>
wutao <1102252651@qq.com>
wuwei <wuwei@juzix.io>
xujiacan <meiyan532484710@163.com>
yangzhou <yangzhou@juzix.io>
zhuying520 <meiyan532484710@163.com>
zjsunzone <zjsunzone@gmail.com>
姜海涛 <jianghaitao@juzix.net>
张军 <zhangjun@juzix.net>
程林 <chenglin762@gmail.com>
50 changes: 40 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
# Build Geth in a stock Go builder container
FROM golang:1.11-alpine as builder
# Build Alaya in a stock Go builder container
FROM golang:1.15-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers bash cmake g++
RUN apk add --no-cache make gcc musl-dev linux-headers g++ llvm bash cmake git gmp-dev openssl-dev

ADD . /PlatON-Go
RUN cd /PlatON-Go && make platon
RUN git clone https://github.com/dfinity/bn.git
RUN cd bn && make && make install

# Pull Geth into a second stage deploy alpine container
ADD . /Alaya-Go
RUN cd /Alaya-Go && make clean && make alaya

# Pull Alaya into a second stage deploy alpine container
FROM alpine:latest

RUN apk add --no-cache ca-certificates libstdc++ gcc
COPY --from=builder /PlatON-Go/build/bin/platon /usr/local/bin/
RUN apk add --no-cache ca-certificates libstdc++ bash tzdata gmp-dev
COPY --from=builder /Alaya-Go/build/bin/alaya /usr/local/bin/
COPY --from=builder /Alaya-Go/entrypoint.sh /usr/local/bin/
COPY --from=builder /usr/local/lib/libbls384.so /usr/local/lib/
COPY --from=builder /usr/local/lib/libmcl.so /usr/local/lib/
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

ENV ENABLE_DEBUG=false
ENV ENABLE_PPROF=false
ENV ENABLE_WS=false
ENV WSAPI=
ENV ENABLE_RPC=false
ENV RPCAPI=
ENV BOOTNODES=
ENV NEW_ACCOUNT=false
ENV INIT=false
ENV VERBOSITY=3
ENV ENBALE_DISCOVER=false
ENV ENABLE_V5DISC=false
ENV ENABLE_CBFT_TRACING=false
ENV P2PPORT=16789
ENV WSPORT=6080
ENV RPCPORT=6789
ENV PPROFPORT=6060
ENV MAXPEERS=80
ENV MAXCONSENSUSPEERS=75
ENV ENABLE_LIGHT_SRV=false
ENV SYNCMODE=full

EXPOSE 8545 8546 30303 30303/udp
ENTRYPOINT ["platon"]
VOLUME /data/alaya
EXPOSE 6060 6080 6789 16789 16789/udp
ENTRYPOINT ["alaya"]
49 changes: 40 additions & 9 deletions Dockerfile.alltools
Original file line number Diff line number Diff line change
@@ -1,15 +1,46 @@
# Build Geth in a stock Go builder container
FROM golang:1.11-alpine as builder
# Build Alaya in a stock Go builder container
FROM golang:1.15-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers
RUN apk add --no-cache make gcc musl-dev linux-headers g++ llvm bash cmake git gmp-dev openssl-dev

ADD . /go-ethereum
RUN cd /go-ethereum && make all
RUN git clone https://github.com/dfinity/bn.git
RUN cd bn && make && make install

# Pull all binaries into a second stage deploy alpine container
ADD . /Alaya-Go
RUN cd /Alaya-Go && make clean && make alaya

# Pull Alaya into a second stage deploy alpine container
FROM alpine:latest

RUN apk add --no-cache ca-certificates
COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
RUN apk add --no-cache ca-certificates libstdc++ bash tzdata gmp-dev
COPY --from=builder /Alaya-Go/build/bin/* /usr/local/bin/
COPY --from=builder /Alaya-Go/entrypoint.sh /usr/local/bin/
COPY --from=builder /usr/local/lib/libbls384.so /usr/local/lib/
COPY --from=builder /usr/local/lib/libmcl.so /usr/local/lib/
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

ENV ENABLE_DEBUG=false
ENV ENABLE_PPROF=false
ENV ENABLE_WS=false
ENV WSAPI=
ENV ENABLE_RPC=false
ENV RPCAPI=
ENV BOOTNODES=
ENV NEW_ACCOUNT=false
ENV INIT=false
ENV VERBOSITY=3
ENV ENBALE_DISCOVER=false
ENV ENABLE_V5DISC=false
ENV ENABLE_CBFT_TRACING=false
ENV P2PPORT=16789
ENV WSPORT=6080
ENV RPCPORT=6789
ENV PPROFPORT=6060
ENV MAXPEERS=80
ENV MAXCONSENSUSPEERS=75
ENV ENABLE_LIGHT_SRV=false
ENV SYNCMODE=full

EXPOSE 8545 8546 30303 30303/udp
VOLUME /data/alaya
EXPOSE 6060 6080 6789 16789 16789/udp
ENTRYPOINT ["alaya"]
34 changes: 15 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,31 @@ GO ?= latest
GPATH = $(shell go env GOPATH)
GORUN = env GO111MODULE=on GOPATH=$(GPATH) go run

platon:
alaya:
build/build_deps.sh
$(GORUN) build/ci.go install ./cmd/platon
$(GORUN) build/ci.go install ./cmd/alaya
@echo "Done building."
@echo "Run \"$(GOBIN)/platon\" to launch platon."
@echo "Run \"$(GOBIN)/alaya\" to launch alaya."

fix-cbft-test:
build/cbft_test.sh
@echo "Done fix."

platon-with-mpc:
alaya-with-mpc:
build/build_deps.sh
$(GORUN) build/ci.go install -mpc on ./cmd/platon
@echo "Done building platon with mpc."
@echo "Run \"$(GOBIN)/platon\" to launch platon."
$(GORUN) build/ci.go install -mpc on ./cmd/alaya
@echo "Done building alaya with mpc."
@echo "Run \"$(GOBIN)/alaya\" to launch alaya."

platon-with-vc:
alaya-with-vc:
build/build_deps.sh
build/build_snark.sh
$(GORUN) build/ci.go install -vc on ./cmd/platon
@echo "Done building platon with vc."
@echo "Run \"$(GOBIN)/platon\" to launch platon."
$(GORUN) build/ci.go install -vc on ./cmd/alaya
@echo "Done building alaya with vc."
@echo "Run \"$(GOBIN)/alaya\" to launch alaya."

platon-with-mv:
alaya-with-mv:
build/build_deps.sh
build/build_snark.sh
$(GORUN) build/ci.go install -mv on ./cmd/platon
@echo "Done building platon with vc."
@echo "Run \"$(GOBIN)/platon\" to launch platon."
$(GORUN) build/ci.go install -mv on ./cmd/alaya
@echo "Done building alaya with vc."
@echo "Run \"$(GOBIN)/alaya\" to launch alaya."

all:
build/build_deps.sh
Expand Down
Loading