Merge branch '1.6' into 'DockerBuild'
1.6 into DockerBuild See merge request !1229
No related branches found
No related tags found
Showing
- .eslintignore 2 additions, 0 deletions.eslintignore
- .gitignore 6 additions, 0 deletions.gitignore
- .travis.yml 1 addition, 1 deletion.travis.yml
- app/modules/prover/lib/PowWorker.ts 95 additions, 0 deletionsapp/modules/prover/lib/PowWorker.ts
- app/modules/prover/lib/blockGenerator.ts 3 additions, 1 deletionapp/modules/prover/lib/blockGenerator.ts
- app/modules/prover/lib/blockProver.ts 7 additions, 5 deletionsapp/modules/prover/lib/blockProver.ts
- app/modules/prover/lib/constants.ts 1 addition, 0 deletionsapp/modules/prover/lib/constants.ts
- app/modules/prover/lib/engine.ts 5 additions, 14 deletionsapp/modules/prover/lib/engine.ts
- app/modules/prover/lib/permanentProver.ts 3 additions, 1 deletionapp/modules/prover/lib/permanentProver.ts
- app/modules/prover/lib/powCluster.ts 84 additions, 82 deletionsapp/modules/prover/lib/powCluster.ts
- app/modules/prover/lib/proof.ts 238 additions, 231 deletionsapp/modules/prover/lib/proof.ts
- app/modules/router.ts 2 additions, 4 deletionsapp/modules/router.ts
- app/modules/ws2p/lib/WS2PCluster.ts 4 additions, 4 deletionsapp/modules/ws2p/lib/WS2PCluster.ts
- app/modules/ws2p/lib/WS2PServer.ts 2 additions, 3 deletionsapp/modules/ws2p/lib/WS2PServer.ts
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- index.ts 48 additions, 34 deletionsindex.ts
- test/fast/prover/pow-1-cluster.ts 39 additions, 5 deletionstest/fast/prover/pow-1-cluster.ts
- test/fast/prover/pow-2-engine.js 3 additions, 0 deletionstest/fast/prover/pow-2-engine.js
- test/integration/branches.js 0 additions, 59 deletionstest/integration/branches.js
- test/integration/branches2.js 0 additions, 214 deletionstest/integration/branches2.js
Loading
Please register or sign in to comment