Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main v2 starcoin #85

Open
wants to merge 31 commits into
base: main-v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ad8e1c1
Add starcoin Submitter code for starcoin
welbon Mar 17, 2023
92586c3
add getStartHeight to starcoin submitter
ValentineReese Mar 18, 2023
9635aff
add ExecutionScriptFunction to starcoin submitter
ValentineReese Mar 18, 2023
c05ac12
add listener for starcoin
ValentineReese Mar 19, 2023
a88ea77
Add starcoin Submitter code for starcoin
ValentineReese Mar 23, 2023
e7cd5f2
Add Aptos replenish
wuyachi Feb 23, 2023
c9784ba
Scan tx for Ont
wuyachi Feb 27, 2023
13d89b1
Update OntEvm scan
wuyachi Feb 27, 2023
f290773
Add Ripple listener
wuyachi Mar 3, 2023
ba2878b
Update Ripple fee
wuyachi Mar 9, 2023
764107a
Update Aptos chain id
wuyachi Mar 10, 2023
b98f7ea
Update HotstuffFilteredHeader
wuyachi Mar 15, 2023
4065dae
Merge pull request #86 from wuyachi/debug
wuyachi Mar 24, 2023
58eec49
update tx vote
wuyachi Mar 24, 2023
a93d245
Add starcoin Submitter code for starcoin
welbon Mar 17, 2023
ab4d8aa
add getStartHeight to starcoin submitter
ValentineReese Mar 18, 2023
4d8d5a7
add ExecutionScriptFunction to starcoin submitter
ValentineReese Mar 18, 2023
9048b9f
add listener for starcoin
ValentineReese Mar 19, 2023
636385e
Add starcoin Submitter code for starcoin
ValentineReese Mar 23, 2023
d70b124
Merge branch 'main-v2-starcoin' of vreese:ValentineReese/poly-relayer…
ValentineReese Mar 24, 2023
a2e6125
Fix decode error
welbon Mar 27, 2023
7b5b279
Fix Starcoin commit
welbon Mar 28, 2023
969042b
Fix Starcoin commit
welbon Mar 28, 2023
0a8f9a6
Add dry run in submit function
welbon Mar 29, 2023
df35013
Fix parser error for starcoin listener
ValentineReese Apr 1, 2023
8b8c0f4
Merge remote-tracking branch 'origin/main-v2-starcoin' into main-v2-s…
ValentineReese Apr 1, 2023
3db4f02
add some unittest
welbon Apr 3, 2023
2c67858
Merge remote-tracking branch 'origin/main-v2-starcoin' into main-v2-s…
welbon Apr 3, 2023
7347855
commit config
welbon Apr 4, 2023
6e74f5b
keystore files
welbon Apr 4, 2023
303598b
Add script for start server progress
ValentineReese Apr 4, 2023
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
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ server
*.out

# Dependency directories (remove the comment below to include it)
# vendor/
.idea

keystore/*
vendor/
.idea
2 changes: 1 addition & 1 deletion bus/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"

"github.com/go-redis/redis/v8"
"github.com/polynetwork/bridge-common/util"
"github.com/polynetwork/bridge-common/log"
"github.com/polynetwork/bridge-common/util"
)

type RedisConn struct {
Expand Down
75 changes: 75 additions & 0 deletions config.devnet.poly-starcoin.conf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"Env": "testnet",
"Bus": {
"HeightUpdateInterval": 1,
"Config": {
"Addr": "127.0.0.1:6379",
"DB": 2
}
},
"log": {
"Path": "./logs"
},
"BoltPath": "boltdb.bin",
"Poly": {
"Nodes": [
"http://43.163.197.59:22002"
],
"Wallet": {
"KeyStoreProviders": [
{
"Passwords": {
"0xd2eb785623a96592b223df9a37a2397c9dfcedb4": "pass1"
},
"Path": "./keystore/poly"
}
]
},
"Signer": {
"KeyStoreProviders": [
{
"Passwords": {
"0xd2eb785623a96592b223df9a37a2397c9dfcedb4": "pass1"
},
"Path": "./keystore/signer"
}
]
},
"PolyTxSync": {
"Enabled": false
}
},
"Chains": {
"318": {
"Nodes": [
"https://proxima-seed.starcoin.org"
],
"CheckFee": false,
"CCMContract": "0xf8ea2d94b8a7d83ace33bb56731268e0",
"CCDContract": "",
"Wallet": {
"Address": "0xf8ea2d94b8a7d83ace33bb56731268e0",
"PrivateKey": "4070faabb6492000697c7d6192ab2a3f198c551f764c56c2eb88761ecabbffe0"
}
}
},
"Host": "",
"Port": 6601,
"ValidMethods": [
"mint",
"burn",
"unwrap",
"add",
"remove",
"swap",
"unlock",
"addExtension",
"removeExtension",
"registerAsset",
"onCrossTransfer"
],
"Bridge": [
"https://bridge.poly.network/testnet/v1"
]
}

9 changes: 9 additions & 0 deletions config.devnet.poly-starcoin.roles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"318": {
"PolyCommit": true,
"EpochSync": true
},
"0": {
"PolyListen": true
}
}
74 changes: 74 additions & 0 deletions config.devnet.starcoin-poly.conf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"Env": "testnet",
"BoltPath": "boltdb.bin",
"Poly": {
"Nodes": [
"http://43.163.197.59:22002"
],
"Wallet": {
"KeyStoreProviders": [
{
"Passwords": {
"0xd2eb785623a96592b223df9a37a2397c9dfcedb4": "pass1"
},
"Path": "./keystore/poly"
}
]
},
"Signer": {
"KeyStoreProviders": [
{
"Passwords": {
"0xd2eb785623a96592b223df9a37a2397c9dfcedb4": "pass1"
},
"Path": "./keystore/poly"
}
]
},
"PolyTxSync": {
"Enabled": false
}
},
"Chains": {
"318": {
"Nodes": [
"https://proxima-seed.starcoin.org"
],
"CCMContract": "0xf8ea2d94b8a7d83ace33bb56731268e0",
"CrossChainEventCreationNum": "6",
"TxVote": {
"StartHeight": 937,
"Poly": {
"Wallet": {
"KeyStoreProviders": [
{
"Passwords": {
"0xd2eb785623a96592b223df9a37a2397c9dfcedb4": "pass1"
},
"Path": "./keystore/poly"
}
]
}
}
}
}
},
"Host": "",
"Port": 6601,
"ValidMethods": [
"mint",
"burn",
"unwrap",
"add",
"remove",
"swap",
"unlock",
"addExtension",
"removeExtension",
"registerAsset",
"onCrossTransfer"
],
"Bridge": [
"https://bridge.poly.network/testnet/v1"
]
}
5 changes: 5 additions & 0 deletions config.devnet.starcoin-poly.roles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"318": {
"TxVote": true
}
}
5 changes: 5 additions & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ type ChainConfig struct {
CCMContract string
CCDContract string
CrossChainEventCreationNum string // Aptos
MultiSignAccount string // Ripple
ListenCheck int
CheckFee bool
Defer int
Expand All @@ -155,6 +156,7 @@ type ListenerConfig struct {
CCMContract string
CCDContract string
CrossChainEventCreationNum string // Aptos
MultiSignAccount string // Ripple
ListenCheck int
Bus *BusConfig
Defer int
Expand Down Expand Up @@ -581,6 +583,9 @@ func (c *ChainConfig) FillListener(o *ListenerConfig, bus *BusConfig) *ListenerC
if o.CrossChainEventCreationNum == "" {
o.CrossChainEventCreationNum = c.CrossChainEventCreationNum
}
if o.MultiSignAccount == "" {
o.MultiSignAccount = c.MultiSignAccount
}
if len(o.LockProxyContract) == 0 {
o.LockProxyContract = c.LockProxyContract
}
Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ require (
github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20210927032600-4c733f2cb879
github.com/boltdb/bolt v1.3.1
github.com/btcsuite/btcd v0.22.1
github.com/devfans/zion-sdk v0.0.24
github.com/devfans/zion-sdk v0.0.27
github.com/ethereum/go-ethereum v1.10.11
github.com/go-redis/redis/v8 v8.11.3
github.com/joeqian10/neo3-gogogo v1.2.1
github.com/ontio/ontology v1.11.1-0.20200812075204-26cf1fa5dd47
github.com/ontio/ontology-crypto v1.2.1
github.com/ontio/ontology-go-sdk v1.11.4
github.com/polynetwork/bridge-common v0.0.36-2
github.com/polynetwork/bridge-common v0.0.39-2
github.com/polynetwork/ripple-sdk v0.0.0-20220616022641-d64d4aa053fe
github.com/portto/aptos-go-sdk v0.0.0-20230118094238-99813673238c
github.com/starcoinorg/starcoin-go v0.0.0-20220821052347-0e482a42c59e
github.com/rubblelabs/ripple v0.0.0-20220222071018-38c1a8b14c18
github.com/tendermint/tendermint v0.35.9
github.com/urfave/cli/v2 v2.3.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
Expand Down
Loading