Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

# Test binary, built with `go test -c`
*.test

.idea
# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# vendor
# Dependency directories (remove the comment below to include it)
# vendor/
5 changes: 5 additions & 0 deletions tokens/bridge/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/anyswap/CrossChain-Bridge/tokens/eth"
"github.com/anyswap/CrossChain-Bridge/tokens/fsn"
"github.com/anyswap/CrossChain-Bridge/tokens/ltc"
"github.com/anyswap/CrossChain-Bridge/tokens/zol"
)

// NewCrossChainBridge new bridge according to chain name
Expand All @@ -32,6 +33,8 @@ func NewCrossChainBridge(id string, isSrc bool) tokens.CrossChainBridge {
return eth.NewCrossChainBridge(isSrc)
case strings.HasPrefix(blockChainIden, "FUSION"):
return fsn.NewCrossChainBridge(isSrc)
case strings.HasPrefix(blockChainIden, "ZEROLIMIT"):
return zol.NewCrossChainBridge(isSrc)
default:
log.Fatalf("Unsupported block chain %v", id)
return nil
Expand Down Expand Up @@ -74,6 +77,8 @@ func InitCrossChainBridge(isServer bool) {
ltc.Init(cfg.BtcExtra)
case "BLOCK":
block.Init(cfg.BtcExtra)
case "ZEROLIMIT":
zol.Init(cfg.BtcExtra)
}

dcrm.Init(cfg.Dcrm, isServer)
Expand Down
21 changes: 21 additions & 0 deletions tokens/zol/addr_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package zol

import (
"fmt"
"github.com/anyswap/CrossChain-Bridge/tokens"
"testing"
)

func TestDecodeAddress_SOL(t *testing.T) {
b := NewCrossChainBridge(true)
b.ChainConfig = &tokens.ChainConfig{
BlockChain: "ZeroLimit",
NetID: "mainnet",
}

res, err := b.DecodeAddress("3DGNfnbTYUgJ8B3Vwq7U5cF8baXq9Tp9AC")
fmt.Printf("%v, %v", res, err)
if err != nil {
panic("")
}
}
62 changes: 62 additions & 0 deletions tokens/zol/address.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package zol

import (
"fmt"

"github.com/btcsuite/btcutil"
)

// DecodeAddress decode address
func (b *Bridge) DecodeAddress(addr string) (address btcutil.Address, err error) {
chainConfig := b.Inherit.GetChainParams()
address, err = btcutil.DecodeAddress(addr, chainConfig)
if err != nil {
return
}
if !address.IsForNet(chainConfig) {
err = fmt.Errorf("invalid address for net")
return
}
return
}

// NewAddressPubKeyHash encap
func (b *Bridge) NewAddressPubKeyHash(pkData []byte) (*btcutil.AddressPubKeyHash, error) {
return btcutil.NewAddressPubKeyHash(btcutil.Hash160(pkData), b.Inherit.GetChainParams())
}

// NewAddressScriptHash encap
func (b *Bridge) NewAddressScriptHash(redeemScript []byte) (*btcutil.AddressScriptHash, error) {
return btcutil.NewAddressScriptHash(redeemScript, b.Inherit.GetChainParams())
}

// IsValidAddress check address
func (b *Bridge) IsValidAddress(addr string) bool {
_, err := b.DecodeAddress(addr)
return err == nil
}

// IsP2pkhAddress check p2pkh addrss
func (b *Bridge) IsP2pkhAddress(addr string) bool {
address, err := b.DecodeAddress(addr)
if err != nil {
return false
}
_, ok := address.(*btcutil.AddressPubKeyHash)
return ok
}

// IsP2shAddress check p2sh addrss
func (b *Bridge) IsP2shAddress(addr string) bool {
address, err := b.DecodeAddress(addr)
if err != nil {
return false
}
_, ok := address.(*btcutil.AddressScriptHash)
return ok
}

// DecodeWIF decode wif
func DecodeWIF(wif string) (*btcutil.WIF, error) {
return btcutil.DecodeWIF(wif)
}
Loading