Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
2621363
optimized and add bsc
zouxyan Aug 21, 2020
d7f7f01
refactor (#4)
zhiqiangxu Dec 21, 2020
401b0fd
mod text (#5)
zhiqiangxu Dec 21, 2020
df2b459
add config.json to gitignore (#6)
zhiqiangxu Dec 21, 2020
8fe4b2b
fix (#8)
zhiqiangxu Dec 21, 2020
0cfa9d5
add SendBnbCrossEth (#9)
zhiqiangxu Dec 22, 2020
58b0395
fix testcase (#10)
zhiqiangxu Dec 22, 2020
08d6dde
fix test
zhiqiangxu Dec 22, 2020
d536403
log
zhiqiangxu Dec 25, 2020
afe2135
log
zhiqiangxu Dec 25, 2020
32c71f3
add GetBlockHeaderByHash
zhiqiangxu Dec 28, 2020
96ac034
mod .gitignore
zhiqiangxu Dec 30, 2020
259f098
mod bsc blkToWait
zhiqiangxu Dec 30, 2020
31235e4
Revert "mod bsc blkToWait"
zhiqiangxu Dec 30, 2020
bbdf771
add testcase
zhiqiangxu Dec 30, 2020
51459c0
add testcase
zhiqiangxu Dec 30, 2020
d4fb0b7
add neo support to bsc
zhiqiangxu Dec 30, 2020
91beffa
testcase for eth->bsc
zhiqiangxu Jan 19, 2021
3baf4ae
add NeoToBscCircle
zhiqiangxu Jan 19, 2021
6a1faf9
feat: register and sync for zilliqa devnet
renlulu Mar 2, 2021
0fb4bf0
chore: remove testcode
renlulu Mar 2, 2021
c370cc3
fix: register ccmc address
renlulu Mar 2, 2021
23168ea
chore: update config file
renlulu Mar 2, 2021
808fb29
chore: recovery some default config
renlulu Mar 3, 2021
7acc009
fix: one node's ipaddr
renlulu Mar 3, 2021
8969b70
chore: update zilliqa sdk version
renlulu Mar 3, 2021
a9f6e79
fix(synczil): add 0x for raw header
renlulu Mar 3, 2021
a6cff00
chore(zil): ds node ip
renlulu Mar 4, 2021
085527b
fix ide warning
zhiqiangxu Mar 15, 2021
de7937f
add msc
zhiqiangxu Mar 15, 2021
48932df
feat(zil) contract deploy
renlulu Mar 16, 2021
02b38d5
fix: rename
renlulu Mar 16, 2021
aee1f33
add ok
zhiqiangxu Mar 23, 2021
4957a20
add ok support
zhiqiangxu Mar 24, 2021
b037c28
mod cosmos
zhiqiangxu Mar 25, 2021
3b37921
add o3 deployer
zhiqiangxu Mar 25, 2021
a9f4e9d
mod for o3
zhiqiangxu Mar 25, 2021
5922ea6
o3too3
zhiqiangxu Mar 25, 2021
e0be86b
mod
zhiqiangxu Mar 25, 2021
fd094b8
use clique for o3
zhiqiangxu Mar 25, 2021
bbb16b3
sync genesis for okex
zhiqiangxu Mar 26, 2021
5de694a
add heco deployer
zhiqiangxu Mar 27, 2021
f2fe506
mod o3 deployer
zhiqiangxu Mar 31, 2021
735ef1e
fix(zilliqa): get rid of hard code for syncing genesis info
renlulu Apr 8, 2021
4c7596c
Merge branch 'msc' into zilliqa
Apr 8, 2021
9f8b17d
further resolve conflicts
renlulu Apr 8, 2021
cff11b9
fix bracket localtion
renlulu Apr 8, 2021
ba1f697
Merge pull request #1 from zhiqiangxu/zilliqa
zhiqiangxu Apr 8, 2021
c337647
fix(zilliqa): register chain
renlulu Apr 8, 2021
10ae34b
fix(zil): sync header
renlulu Apr 8, 2021
22edb31
refactor(zil): change veriable name, add some annotation
renlulu Apr 8, 2021
d58e484
add tools for neo3
joeqian10 Apr 20, 2021
6cde6c7
Merge branch 'master' into master
joeqian10 Apr 20, 2021
4d91a2e
Merge pull request #3 from joeqian10/master
zhiqiangxu Apr 20, 2021
9b1a3bd
fix a typo
joeqian10 Apr 20, 2021
69bad75
Merge branch 'master' of https://github.com/joeqian10/poly-io-test
joeqian10 Apr 20, 2021
25b1cba
Merge pull request #4 from joeqian10/master
zhiqiangxu Apr 20, 2021
0ef3062
rm dup field
zhiqiangxu Apr 21, 2021
2940c84
update neo-gogogo version
joeqian10 Apr 21, 2021
afce2e0
Merge pull request #5 from joeqian10/master
zhiqiangxu Apr 21, 2021
6e47a1d
fix
zhiqiangxu Apr 21, 2021
fe89489
update .gitignore
zhiqiangxu Apr 21, 2021
176f22a
mod msg
zhiqiangxu Apr 21, 2021
a3119bd
add ok
zhiqiangxu May 13, 2021
d91cc98
add ok
zhiqiangxu May 13, 2021
6e018ba
mod
zhiqiangxu May 14, 2021
5b5af3d
update neo3 ccmc format
joeqian10 May 14, 2021
4e49606
Merge branch 'master' into master
joeqian10 May 14, 2021
d17e7c9
Merge pull request #6 from joeqian10/master
zhiqiangxu May 14, 2021
580d0e5
fix
zhiqiangxu May 14, 2021
d9203a9
add neo3 state validator related commands
joeqian10 May 14, 2021
6a1ea4a
Merge pull request #7 from joeqian10/master
zhiqiangxu May 17, 2021
02d0f95
update dependency
joeqian10 May 17, 2021
cdcc794
Merge pull request #8 from joeqian10/master
zhiqiangxu May 17, 2021
73dce0e
use new poly-go-sdk
joeqian10 May 17, 2021
fd6e4f6
update flag name to neo3_state_validators
joeqian10 May 17, 2021
4ff50cc
Merge pull request #9 from joeqian10/master
zhiqiangxu May 17, 2021
69613c1
rm useless
zhiqiangxu May 17, 2021
1456619
fix
zhiqiangxu May 17, 2021
02a0595
add update_ok
zhiqiangxu May 17, 2021
1fafb3f
mod tidy
zhiqiangxu May 17, 2021
7da3ffe
add extra info (Neo3Magic) when registering or updating neo3 chain
joeqian10 May 18, 2021
a900f83
Merge pull request #10 from joeqian10/master
zhiqiangxu May 18, 2021
57a401c
fix param order
joeqian10 May 18, 2021
2fe969b
Merge pull request #11 from joeqian10/master
zhiqiangxu May 18, 2021
3e850fa
add test kai chain
dogecoindev May 20, 2021
f362d6c
add sync kai genesis header command
dogecoindev May 20, 2021
177fb31
Merge branch 'master' of https://github.com/zhiqiangxu/poly-io-test i…
dogecoindev May 21, 2021
63a10fe
merge
dogecoindev May 21, 2021
8a8dbed
Merge pull request #12 from dogecoindev/kai
zhiqiangxu May 21, 2021
1d18f02
update kardiachain config
dogecoindev May 21, 2021
4964e59
fix kai signing
dogecoindev May 21, 2021
cb80176
Merge pull request #14 from dogecoindev/kai
zhiqiangxu May 21, 2021
740543f
update kaichain id
dogecoindev May 21, 2021
5436f81
update kai endpoint
dogecoindev May 21, 2021
aaa3ed6
mod for kai
zhiqiangxu May 26, 2021
03b9007
fix kai client
dogecoindev May 26, 2021
4982f6c
update kaiclient
dogecoindev May 27, 2021
f1e4ce0
Fix DeploySmartContract logic in kai_invoker
trinhdn97 May 27, 2021
0a88534
upgrade kai relayer version
dogecoindev May 31, 2021
5d6fda0
Merge pull request #15 from dogecoindev/kai
zhiqiangxu May 31, 2021
9739cc8
update kai epoch
dogecoindev May 31, 2021
310187b
Merge pull request #16 from dogecoindev/kai
zhiqiangxu May 31, 2021
65b566a
update kai testcases
dogecoindev Jun 2, 2021
f49fb3f
UPDATE KAI TEST
dogecoindev Jun 3, 2021
b04f874
FIX SendKaiToEthChain
dogecoindev Jun 8, 2021
c43d5c9
update
dogecoindev Jun 8, 2021
26ef7dd
fix register kai
dogecoindev Jun 9, 2021
93de4b9
update kai testcases
dogecoindev Jun 2, 2021
6ec4b38
UPDATE KAI TEST
dogecoindev Jun 3, 2021
e6023b2
FIX SendKaiToEthChain
dogecoindev Jun 8, 2021
39e8c6a
update
dogecoindev Jun 8, 2021
f65c214
fix register kai
dogecoindev Jun 9, 2021
29471d4
Merge remote-tracking branch 'origin/kai' into kai
dogecoindev Jun 9, 2021
b62117e
uncomment ontInvoker, neoInvoker. revert max confirmation time in eth…
dogecoindev Jun 11, 2021
ba8604d
update kai config, log register kai chain
dogecoindev Jun 11, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions chains/eth/eth_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ func (ethInvoker *EInvoker) url() string {
return ethInvoker.TConfiguration.O3URL
case ethInvoker.TConfiguration.OkChainID:
return ethInvoker.TConfiguration.OKURL
case ethInvoker.TConfiguration.KaiChainID:
return ethInvoker.TConfiguration.KaiUrl
default:
panic(fmt.Sprintf("unknown chain id:%d", ethInvoker.ChainID))
panic(fmt.Sprintf("url:unknown chain id:%d", ethInvoker.ChainID))
}
}

Expand All @@ -104,8 +106,10 @@ func (ethInvoker *EInvoker) privateKey() string {
return ethInvoker.TConfiguration.O3PrivateKey
case ethInvoker.TConfiguration.OkChainID:
return ethInvoker.TConfiguration.OKPrivateKey
case ethInvoker.TConfiguration.KaiChainID:
return ethInvoker.TConfiguration.KaiPrivateKey
default:
panic(fmt.Sprintf("unknown chain id:%d", ethInvoker.ChainID))
panic(fmt.Sprintf("privateKey:unknown chain id:%d", ethInvoker.ChainID))
}
}

Expand Down Expand Up @@ -238,6 +242,8 @@ func (ethInvoker *EInvoker) BindAssetHash(lockProxyAddr, fromAssetHash, toAssetH
toAddr = ethComm.HexToAddress(toAssetHash).Bytes()
} else if uint64(toChainId) == config.DefConfig.O3ChainID {
toAddr = ethComm.HexToAddress(toAssetHash).Bytes()
} else if uint64(toChainId) == config.DefConfig.KaiChainID {
toAddr = ethComm.HexToAddress(toAssetHash).Bytes()
} else if uint64(toChainId) == config.DefConfig.NeoChainID {
other, err := helper.UInt160FromString(toAssetHash)
if err != nil {
Expand Down
10 changes: 10 additions & 0 deletions cmd/cctest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func main() {
mscInvoker *eth.EInvoker
o3Invoker *eth.EInvoker
cmInvoker *cosmos.CosmosInvoker
kaiInvoker *eth.EInvoker
)
if config.DefConfig.EthChainID > 0 {
ethInvoker = eth.NewEInvoker(config.DefConfig.EthChainID)
Expand All @@ -83,6 +84,10 @@ func main() {
if config.DefConfig.O3ChainID > 0 {
o3Invoker = eth.NewEInvoker(config.DefConfig.O3ChainID)
}

if config.DefConfig.KaiChainID > 0 {
kaiInvoker = eth.NewEInvoker(config.DefConfig.KaiChainID)
}

//btcInvoker, err := btc.NewBtcInvoker(config.DefConfig.RchainJsonRpcAddress, config.DefConfig.RCWallet,
// config.DefConfig.RCWalletPwd, config.DefConfig.BtcRestAddr, config.DefConfig.BtcRestUser,
Expand Down Expand Up @@ -124,6 +129,11 @@ func main() {
if o3Invoker != nil {
testframework.TFramework.SetO3Invoker(o3Invoker)
}

if kaiInvoker != nil {
testframework.TFramework.SeKaiInvoker(kaiInvoker)
}

//testframework.TFramework.SetBtcInvoker(btcInvoker)
testframework.TFramework.SetOntInvoker(ontInvoker)
testframework.TFramework.SetCosmosInvoker(cmInvoker)
Expand Down
Loading