Merge branch 'master' into withdraw_opt_1217

chain33.fork.toml

@@ -50,9 +50,7 @@ Enable=0
 [fork.sub.coinsx]
 Enable=0
 
-[fork.sub.collateralize]
-Enable=0
-ForkCollateralizeTableUpdate=0
+
 
 [fork.sub.dpos]
 Enable=0
@@ -94,6 +92,12 @@ ForkBadRepeatSecret=2715575
 [fork.sub.issuance]
 Enable=0
 ForkIssuanceTableUpdate=0
+ForkIssuancePrecision=0
+
+[fork.sub.collateralize]
+Enable=0
+ForkCollateralizeTableUpdate=0
+ForkCollateralizePrecision=0
 
 [fork.sub.jsvm]
 Enable=0
@@ -107,7 +111,7 @@ Enable=0
 [fork.sub.multisig]
 Enable=0
 
-[fork.sub.NormX]
+[fork.sub.norm]
 Enable=0
 
 [fork.sub.oracle]
@@ -120,6 +124,7 @@ ForkParacrossCommitTx=1850000
 ForkLoopCheckCommitTxDone=3230000
 ForkParaAssetTransferRbk=4500000
 ForkParaSupervision=6000000
+ForkParaAutonomySuperGroup=10200000
 #以下仅平行链适用
 ForkParaSelfConsStages=-1
 ForkParaFullMinerHeight=-1
@@ -181,8 +186,6 @@ Enable=0
 [fork.sub.wasm]
 Enable=0
 
-[fork.sub.x2ethereum]
-Enable=0
 
 [fork.sub.store-kvmvccmavl]
 ForkKvmvccmavl=1870000

go.mod

@@ -3,7 +3,7 @@ module github.com/33cn/plugin
 go 1.15
 
 require (
-	github.com/33cn/chain33 v1.65.6-0.20211130044919-77e92a34438a
+	github.com/33cn/chain33 v1.65.6-0.20211220075037-0e6ddce83502
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/NebulousLabs/errors v0.0.0-20181203160057-9f787ce8f69e // indirect

go.sum

@@ -48,8 +48,8 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr
 dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-github.com/33cn/chain33 v1.65.6-0.20211130044919-77e92a34438a h1:jLm8iWEWpWk0+dQZK7cQUFOxUhACsJ1heDc5Pme+drc=
-github.com/33cn/chain33 v1.65.6-0.20211130044919-77e92a34438a/go.mod h1:27Z1b54wJ6EhE1IGA3S5AxSQ/t8dktFVgPnkLNbMFoE=
+github.com/33cn/chain33 v1.65.6-0.20211220075037-0e6ddce83502 h1:Yb5vA4AOkYufoPzjy0daQeEP6o/V90wh6GHmTqO5x9E=
+github.com/33cn/chain33 v1.65.6-0.20211220075037-0e6ddce83502/go.mod h1:27Z1b54wJ6EhE1IGA3S5AxSQ/t8dktFVgPnkLNbMFoE=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=

plugin/dapp/autonomy/doc.go

@@ -33,5 +33,13 @@
 //6）董事会成员可以对提案进行评论，评论将以交易的形式提出并且与提案相关联，显示到提案区，参与评论的截止时间以实际提案结束投票高度为准。
 //
 //（3）提案投票自治系统参数修改，如达成董事会投票的参与率/通过率，全体持票人重大项目的否决率，提案费用，重大项目金额阈值的修改。
+/*
+Item项目提案:
+Item是针对系统配置项的自治合约管理，用户需要在配置项修改合约提交申请交易，在Autonomy自治合约提交包含申请交易id的item申请，社区委员会投票
+满足设定成员投票通过后，在原合约提交approve交易，附带autonomy合约申请id，原合约查询Autonomy合约后完成配置项的修改
+1. manage合约 增加新的配置项申请交易，在Autonomy提交item申请，board投票通过，manager合约提交附带item id的approve交易，完成配置项修改
+2. paracross nodegroup申请。首先在paracross 提交nodegroup申请交易，在Autonomy提交item申请，board投票通过，paracross合约提交approve申请完成注册。
+
+*/
 
 package autonomy

plugin/dapp/cross2eth/ebrelayer/relayer/chain33/transceiver/sync/sync_tx_receipts.go

@@ -135,7 +135,7 @@ func bindOrResumePush(cfg *relayerTypes.SyncTxReceiptConfig) {
 		LastSequence:  cfg.StartSyncSequence,
 		LastHeight:    cfg.StartSyncHeight,
 		LastBlockHash: cfg.StartSyncHash,
-		Type:          blockchain.PushEVMEvent,
+		Type:          int32(blockchain.PushEVMEvent),
 		Contract:      contract,
 	}
 	var res types.ReplySubscribePush

plugin/dapp/x2ethereum/ebrelayer/relayer/chain33/transceiver/sync/sync_tx_receipts.go

@@ -132,7 +132,7 @@ func bindOrResumePush(cfg *relayerTypes.SyncTxReceiptConfig) {
 		LastSequence:  cfg.StartSyncSequence,
 		LastHeight:    cfg.StartSyncHeight,
 		LastBlockHash: cfg.StartSyncHash,
-		Type:          blockchain.PushTxReceipt,
+		Type:          int32(blockchain.PushTxReceipt),
 		Contract:      contract,
 	}
 	var res types.ReplySubscribePush

plugin/p2p/gossip/process.go

@@ -461,11 +461,13 @@ func (n *Node) queryMempool(ty int64, data interface{}) (interface{}, error) {
 }
 
 func (n *Node) postBlockChain(blockHash, pid string, block *types.Block) error {
-	return n.p2pMgr.PubBroadCast(blockHash, &types.BlockPid{Pid: pid, Block: block}, types.EventBroadcastAddBlock)
+	_, err := n.p2pMgr.PubBroadCast(blockHash, &types.BlockPid{Pid: pid, Block: block}, types.EventBroadcastAddBlock)
+	return err
 }
 
 func (n *Node) postMempool(txHash string, tx *types.Transaction) error {
-	return n.p2pMgr.PubBroadCast(txHash, tx, types.EventTx)
+	_, err := n.p2pMgr.PubBroadCast(txHash, tx, types.EventTx)
+	return err
 }
 
 //检测是否冗余发送, 或者添加到发送过滤(内部存在直接修改读写保护的数据, 对filter lru的读写需要外层锁保护)