brightestboy
|
3235d348fc
|
Merge branch 'dev_wuwei1972' into dev_supply
# Conflicts:
# build.sbt
# conf/system.conf
# scripts/example_deploy.js
# src/main/scala/ContractAssetsTPL.scala
# src/main/scala/Contractback.txt
# src/main/scala/NewContract.scala
# src/main/scala/rep/api/SwaggerDocService.scala
# src/main/scala/rep/api/rest/RestActor.scala
# src/main/scala/rep/api/rest/RestService.scala
# src/main/scala/rep/app/conf/SystemProfile.scala
# src/main/scala/rep/crypto/ECDSASign.scala
# src/main/scala/rep/crypto/Sha256.scala
# src/main/scala/rep/crypto/SignFunc.scala
# src/main/scala/rep/log/EventActor.scala
# src/main/scala/rep/network/PeerHelper.scala
# src/main/scala/rep/network/cache/TransactionPool.scala
# src/main/scala/rep/network/consensus/block/BlockHelper.scala
# src/main/scala/rep/network/consensus/block/BlockModule.scala
# src/main/scala/rep/network/consensus/endorse/EndorsementModule.scala
# src/main/scala/rep/network/consensus/vote/CRFDVoter.scala
# src/main/scala/rep/network/consensus/vote/CRFDVoterModule.scala
# src/main/scala/rep/network/consensus/vote/VoterBase.scala
# src/main/scala/rep/network/tools/PeerExtension.scala
# src/main/scala/rep/sc/Sandbox.scala
# src/main/scala/rep/sc/Shim.scala
# src/main/scala/rep/sc/contract/Compiler.scala
# src/main/scala/rep/sc/scalax/SandboxScala.scala
# src/main/scala/rep/storage/cfg/StoreConfig.java
# src/main/scala/rep/storage/test/testmap.scala
# src/main/scala/rep/storage/util/pathUtil.java
# src/main/scala/rep/utils/SerializeUtils.scala
# src/test/scala/rep/sc/SandboxSpec.scala
|
2018-07-27 14:58:41 +08:00 |
|