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
b3a67a40
Commit
b3a67a40
authored
Aug 27, 2019
by
mdj33
Committed by
vipwzw
Aug 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter
parent
59f5fe56
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
para.go
plugin/consensus/para/para.go
+0
-1
kv.go
plugin/dapp/paracross/executor/kv.go
+6
-6
No files found.
plugin/consensus/para/para.go
View file @
b3a67a40
...
@@ -41,7 +41,6 @@ const (
...
@@ -41,7 +41,6 @@ const (
defaultMainBlockHashForkHeight
int64
=
209186
//calc block hash fork height in main chain
defaultMainBlockHashForkHeight
int64
=
209186
//calc block hash fork height in main chain
mainParaSelfConsensusForkHeight
int64
=
types
.
MaxHeight
//para chain self consensus height switch, must >= ForkParacrossCommitTx of main
mainParaSelfConsensusForkHeight
int64
=
types
.
MaxHeight
//para chain self consensus height switch, must >= ForkParacrossCommitTx of main
mainForkParacrossCommitTx
int64
=
types
.
MaxHeight
//support paracross commit tx fork height in main chain: ForkParacrossCommitTx
mainForkParacrossCommitTx
int64
=
types
.
MaxHeight
//support paracross commit tx fork height in main chain: ForkParacrossCommitTx
batchFetchBlockCount
int64
=
1000
)
)
var
(
var
(
...
...
plugin/dapp/paracross/executor/kv.go
View file @
b3a67a40
...
@@ -98,15 +98,15 @@ func getParaNodeIDSuffix(id string) string {
...
@@ -98,15 +98,15 @@ func getParaNodeIDSuffix(id string) string {
}
}
ids
:=
strings
.
Split
(
id
,
"-"
)
ids
:=
strings
.
Split
(
id
,
"-"
)
txI
d
:=
ids
[
len
(
ids
)
-
1
]
txI
D
:=
ids
[
len
(
ids
)
-
1
]
if
strings
.
HasPrefix
(
txI
d
,
"0x"
)
{
if
strings
.
HasPrefix
(
txI
D
,
"0x"
)
{
return
txI
d
return
txI
D
}
}
//对于nodegroup 创建的"mavl-paracross-title-nodegroupid-user.p.para.-0xb6cd0274587...a61e444e9f848a4c02d7b-1"特殊场景
//对于nodegroup 创建的"mavl-paracross-title-nodegroupid-user.p.para.-0xb6cd0274587...a61e444e9f848a4c02d7b-1"特殊场景
if
len
(
ids
)
>
1
{
if
len
(
ids
)
>
1
{
txI
d
=
ids
[
len
(
ids
)
-
2
]
+
"-"
+
txId
txI
D
=
ids
[
len
(
ids
)
-
2
]
+
"-"
+
txID
if
strings
.
HasPrefix
(
txI
d
,
"0x"
)
{
if
strings
.
HasPrefix
(
txI
D
,
"0x"
)
{
return
txI
d
return
txI
D
}
}
}
}
return
id
return
id
...
...
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