Merge branch 'master' into x2eth_200507

build/docker-compose.sh

@@ -103,7 +103,8 @@ function base_init() {
 
     # blockchain
     # TODO 剩下evm trade 测试和这个选项有关，在其他pr中解决，不使得这个pr太大
-    sed -i $sedfix 's/^enableReduceLocaldb=.*/enableReduceLocaldb=true/g' chain33.toml
+    sed -i $sedfix 's/^enableReduceLocaldb=.*/enableReduceLocaldb=false/g' chain33.toml
+    sed -i $sedfix 's/^enablePushSubscribe=.*/enablePushSubscribe=true/g' chain33.toml
 
     # ticket
     sed -i $sedfix 's/^ticketPrice =.*/ticketPrice = 10000/g' chain33.toml

chain33.para.toml

@@ -43,7 +43,8 @@ enableTxQuickIndex=true
 # 升级storedb是否重新执行localdb，bityuan主链升级不需要开启，平行链升级需要开启
 enableReExecLocal=true
 # 使能精简localdb
-enableReduceLocaldb=false
+enableReduceLocaldb=true
+enablePushSubscribe=false
 
 [p2p]
 enable=false

go.mod

@@ -3,7 +3,7 @@ module github.com/33cn/plugin
 go 1.12
 
 require (
-	github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46
+	github.com/33cn/chain33 v0.0.0-20200605043414-355d96f9ec97
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/beorn7/perks v1.0.1 // indirect

go.sum

 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46 h1:i1O/BN5IvAkc0Jy3qfXyhlqI+v9N5+1j6McAgm///Mk=
-github.com/33cn/chain33 v0.0.0-20200527072033-e43d8da29c46/go.mod h1:RJsUKcMdXtCgpqp1W1ga6jTCieuJm6n7qd3XmnPXwa4=
+github.com/33cn/chain33 v0.0.0-20200605043414-355d96f9ec97 h1:C8WKBnLjx8CGgva7PBRvosrAMofw/WOc+nB7Toobgzk=
+github.com/33cn/chain33 v0.0.0-20200605043414-355d96f9ec97/go.mod h1:RJsUKcMdXtCgpqp1W1ga6jTCieuJm6n7qd3XmnPXwa4=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7 h1:PqzgE6kAMi81xWQA2QIVxjWkFHptGgC547vchpUbtFo=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=

plugin/dapp/paracross/cmd/build/testcase.sh

@@ -49,6 +49,9 @@ function para_set_toml() {
 
     sed -i $xsedfix 's/^mainBlockHashForkHeight=.*/mainBlockHashForkHeight=1/g' "${1}"
 
+    #blockchain
+    sed -i $xsedfix 's/^enableReduceLocaldb=.*/enableReduceLocaldb=false/g' "${1}"
+    sed -i $xsedfix 's/^enablePushSubscribe=.*/enablePushSubscribe=true/g' "${1}"
     # rpc
     sed -i $xsedfix 's/^jrpcBindAddr=.*/jrpcBindAddr="0.0.0.0:8901"/g' "${1}"
     sed -i $xsedfix 's/^grpcBindAddr=.*/grpcBindAddr="0.0.0.0:8902"/g' "${1}"

plugin/dapp/privacy/crypto/onetimeed25519.go

@@ -9,7 +9,7 @@ import (
 	"unsafe"
 
 	"github.com/33cn/chain33/common/crypto"
-	"github.com/33cn/chain33/common/ed25519/edwards25519"
+	"github.com/33cn/chain33/system/crypto/ed25519/ed25519/edwards25519"
 	privacytypes "github.com/33cn/plugin/plugin/dapp/privacy/types"
 )
 

plugin/dapp/privacy/crypto/privacy.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/33cn/chain33/common/crypto"
 	"github.com/33cn/chain33/common/crypto/sha3"
-	"github.com/33cn/chain33/common/ed25519/edwards25519"
 	log "github.com/33cn/chain33/common/log/log15"
+	"github.com/33cn/chain33/system/crypto/ed25519/ed25519/edwards25519"
 	sccrypto "github.com/NebulousLabs/Sia/crypto"
 )
 

plugin/dapp/privacy/crypto/privatekey.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/33cn/chain33/common/crypto"
 	"github.com/33cn/chain33/common/crypto/sha3"
-	"github.com/33cn/chain33/common/ed25519/edwards25519"
+	"github.com/33cn/chain33/system/crypto/ed25519/ed25519/edwards25519"
 )
 
 // PrivKeyPrivacy struct data type

plugin/dapp/privacy/crypto/ring_signature.go

@@ -8,7 +8,7 @@ import (
 	"unsafe"
 
 	"github.com/33cn/chain33/common/crypto"
-	"github.com/33cn/chain33/common/ed25519/edwards25519"
+	"github.com/33cn/chain33/system/crypto/ed25519/ed25519/edwards25519"
 	"github.com/33cn/chain33/types"
 	privacytypes "github.com/33cn/plugin/plugin/dapp/privacy/types"
 )

plugin/dapp/privacy/crypto/ring_signature_crypto.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/crypto"
-	"github.com/33cn/chain33/common/ed25519/edwards25519"
+	"github.com/33cn/chain33/system/crypto/ed25519/ed25519/edwards25519"
 	"github.com/33cn/chain33/types"
 	privacytypes "github.com/33cn/plugin/plugin/dapp/privacy/types"
 )