Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
c231cea9
Commit
c231cea9
authored
Jun 20, 2019
by
mdj33
Committed by
vipwzw
Jun 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix comments
parent
41c55a94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
chain33.para.toml
plugin/dapp/paracross/cmd/build/chain33.para.toml
+6
-6
testcase.sh
plugin/dapp/paracross/cmd/build/testcase.sh
+3
-1
filtertxs.go
plugin/dapp/paracross/executor/filtertxs.go
+1
-1
No files found.
plugin/dapp/paracross/cmd/build/chain33.para.toml
View file @
c231cea9
Title
=
"user.p.para."
TestNet
=
false
CoinSymbol
=
"
bty
"
CoinSymbol
=
"
para
"
EnableParaFork
=
true
[log]
...
...
@@ -59,9 +59,9 @@ grpcLogFile="grpc33.log"
[rpc]
# 避免与主链配置冲突
jrpcBindAddr
=
":8901"
grpcBindAddr
=
":8902"
whitelist
=
["
*
"]
jrpcBindAddr
=
"
localhost
:8901"
grpcBindAddr
=
"
localhost
:8902"
whitelist
=
["
127.0.0.1
"]
jrpcFuncWhitelist
=
["*"]
grpcFuncWhitelist
=
["*"]
...
...
@@ -111,7 +111,7 @@ waitBlocks4CommitMsg=2
searchHashMatchedBlockDepth
=
10000
#创世地址额度
genesisAmount
=
100000000
#主链支持平行链共识tx分叉高度,需要和主链保持严格一致,不可修改
#主链支持平行链共识tx分叉高度,需要和主链保持严格一致,不可修改
,2270000是bityuan主链对应高度, ycc或其他按实际修改
MainForkParacrossCommitTx
=
2270000
#平行链自共识开启对应的主链高度,需要大于等于MainForkParacrossCommitTx=2270000, -1 不开启
MainParaSelfConsensusForkHeight
=
-1
...
...
@@ -278,7 +278,7 @@ Enable=0
ForkTerminatePart
=
0
ForkUnfreezeIDX
=
0
#对已有的平行链如果不是从0开始同步数据,需要设置这个kvmvccmavl的
fork,如果从0开始同步,statedb
会跟以前mavl的不同
#对已有的平行链如果不是从0开始同步数据,需要设置这个kvmvccmavl的
对应平行链高度的fork,如果从0开始同步,statehash
会跟以前mavl的不同
[fork.sub.store-kvmvccmavl]
ForkKvmvccmavl
=
0
...
...
plugin/dapp/paracross/cmd/build/testcase.sh
View file @
c231cea9
...
...
@@ -42,6 +42,8 @@ function para_set_toml() {
sed
-i
$xsedfix
's/^MainForkParacrossCommitTx=.*/MainForkParacrossCommitTx=1/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
}
"
sed
-i
$xsedfix
's/^whitelist=.*/whitelist=["localhost","127.0.0.1","0.0.0.0"]/g'
"
${
1
}
"
sed
-i
$xsedfix
's/^ParaRemoteGrpcClient=.*/ParaRemoteGrpcClient="nginx:8803"/g'
"
${
1
}
"
...
...
@@ -337,7 +339,7 @@ function para_cross_transfer_withdraw() {
echo
"para_cross_transfer_withdraw failed"
${
CLI
}
tx query
-s
"
$hash2
"
${
PARA_CLI
}
tx query
-s
"
$hash2
"
${
PARA_CLI
}
asset balance
-a
12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
-e
user.p.para.paracross
--asset_exec
paracross
--asset_symbol
coins.
bty
${
PARA_CLI
}
asset balance
-a
12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
-e
user.p.para.paracross
--asset_exec
paracross
--asset_symbol
coins.
para
exit
1
fi
else
...
...
plugin/dapp/paracross/executor/filtertxs.go
View file @
c231cea9
...
...
@@ -59,7 +59,7 @@ func filterParaTxGroup(title string, tx *types.Transaction, main *types.BlockDet
endIdx
:=
headIdx
+
int
(
tx
.
GroupCount
)
for
i
:=
headIdx
;
i
<
endIdx
;
i
++
{
if
types
.
IsPara
()
&&
main
.
Block
.
Height
<
forkHeight
{
if
types
.
Is
MyParaExecName
(
string
(
main
.
Block
.
Txs
[
i
]
.
Execer
))
{
if
types
.
Is
SpecificParaExecName
(
title
,
string
(
main
.
Block
.
Txs
[
i
]
.
Execer
))
{
continue
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment