Skip to content

Commit

Permalink
Merge pull request #1155 from Trouble-CXB/feature_exchange
Browse files Browse the repository at this point in the history 
update exchange fee ,del ForkFix, update toml
  • Loading branch information
@vipwzw
vipwzw committed Feb 21, 2022
2 parents 8529761 + bfdbdd9 commit 65dc499
Show file tree
Hide file tree
Showing 14 changed files with 338 additions and 691 deletions.
4 changes: 0 additions & 4 deletions chain33.fork.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ Enable=0

[fork.sub.exchange]
Enable=0
ForkFix1=0
ForkFix2=0
ForkFix3=0
ForkFix4=0

[fork.sub.game]
Enable=0
Expand Down
35 changes: 24 additions & 11 deletions chain33.para.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,20 +425,33 @@ namespace=""
#exchange合约相关配置
[mver.exec.sub.exchange]
#银行帐户列表（现第一个地址用来收取手续费）
banks = ["1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"]#Fee
banks = [
"1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"
]
#币种配置，
#rate每笔手续费率,配置时需*1e8(如：收取每笔交易千分之一的手续费，rate=100000)
#minFee最小手续费,配置时需*1e8(如：最小手续费收取1个，minFee=100000000)
#coin 转入exchange合约的币种名称
#execer 转入exchange合约的币种执行器名称
#name 执行器币种的别称
coins = [
{ name = "bty", rate = 100000, minFee = 0 },
{ name = "coins.bty", rate = 100000, minFee = 0 },
{ name = "ETH", rate = 100000, minFee = 0 },
{ name = "USDT", rate = 100000, minFee = 0 },
{coin = "bty", execer = "coins", name = "BTY"},
{coin = "CCNY", execer = "token", name = "CCNY"},

{coin = "coins.bty", execer = "paracross", name = "BTY"},
{coin = "YCC", execer = "evmxgo", name = "YCC"},
{coin = "ETH", execer = "evmxgo", name = "ETH"},
{coin = "USDT", execer = "evmxgo", name = "USDT"}
]
#现货交易配置
#symbol 币种对；priceDigits 价格最小位数；amountDigits 数量最小位数； minFee 最小手续费
#taker 吃单手续费率,配置时需*1e8(如：收取每笔交易百分之一的手续费，maker=1000000)未配置交易对默认为100000
#maker 挂单手续费,配置时需*1e8(如：收取每笔交易千分之一的手续费，taker=100000)未配置交易对默认为100000
exchanges = [
{symbol = "BTY_CCNY", priceDigits = 4, amountDigits = 1, taker = 1000000, maker = 100000, minFee = 0},

{symbol = "BTY_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "YCC_USDT", priceDigits = 5, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "ETH_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0}
]

[fork.sub.exchange]
Enable=0
ForkFix1=0
ForkFix2=0
ForkFix3=0
ForkFix4=0
35 changes: 24 additions & 11 deletions chain33.para.toml.readme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,20 +426,33 @@ namespace=""
#exchange合约相关配置
[mver.exec.sub.exchange]
#银行帐户列表（现第一个地址用来收取手续费）
banks = ["1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"]#Fee
banks = [
"1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"
]
#币种配置，
#rate每笔手续费率,配置时需*1e8(如：收取每笔交易千分之一的手续费，rate=100000)
#minFee最小手续费,配置时需*1e8(如：最小手续费收取1个，minFee=100000000)
#coin 转入exchange合约的币种名称
#execer 转入exchange合约的币种执行器名称
#name 执行器币种的别称
coins = [
{ name = "bty", rate = 100000, minFee = 0 },
{ name = "coins.bty", rate = 100000, minFee = 0 },
{ name = "ETH", rate = 100000, minFee = 0 },
{ name = "USDT", rate = 100000, minFee = 0 },
{coin = "bty", execer = "coins", name = "BTY"},
{coin = "CCNY", execer = "token", name = "CCNY"},

{coin = "coins.bty", execer = "paracross", name = "BTY"},
{coin = "YCC", execer = "evmxgo", name = "YCC"},
{coin = "ETH", execer = "evmxgo", name = "ETH"},
{coin = "USDT", execer = "evmxgo", name = "USDT"}
]
#现货交易配置
#symbol 币种对；priceDigits 价格最小位数；amountDigits 数量最小位数； minFee 最小手续费
#taker 吃单手续费率,配置时需*1e8(如：收取每笔交易百分之一的手续费，maker=1000000)未配置交易对默认为100000
#maker 挂单手续费,配置时需*1e8(如：收取每笔交易千分之一的手续费，taker=100000)未配置交易对默认为100000
exchanges = [
{symbol = "BTY_CCNY", priceDigits = 4, amountDigits = 1, taker = 1000000, maker = 100000, minFee = 0},

{symbol = "BTY_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "YCC_USDT", priceDigits = 5, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "ETH_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0}
]

[fork.sub.exchange]
Enable=0
ForkFix1=0
ForkFix2=0
ForkFix3=0
ForkFix4=0
32 changes: 25 additions & 7 deletions chain33.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,31 @@ namespace=""
#exchange合约相关配置
[mver.exec.sub.exchange]
#银行帐户列表（现第一个地址用来收取手续费）
banks = ["1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"]#Fee
banks = [
"1PTGVR7TUm1MJUH7M1UNcKBGMvfJ7nCrnN"
]
#币种配置，
#rate每笔手续费率,配置时需*1e8(如：收取每笔交易千分之一的手续费，rate=100000)
#coin 转入exchange合约的币种名称
#execer 转入exchange合约的币种执行器名称
#name 执行器币种的别称
#minFee最小手续费,配置时需*1e8(如：最小手续费收取1个，minFee=100000000)
coins = [
{ name = "bty", rate = 100000, minFee = 0 },
{ name = "coins.bty", rate = 100000, minFee = 0 },
{ name = "ETH", rate = 100000, minFee = 0 },
{ name = "USDT", rate = 100000, minFee = 0 },
]
{coin = "bty", execer = "coins", name = "BTY"},
{coin = "CCNY", execer = "token", name = "CCNY"},

{coin = "coins.bty", execer = "paracross", name = "BTY"},
{coin = "YCC", execer = "evmxgo", name = "YCC"},
{coin = "ETH", execer = "evmxgo", name = "ETH"},
{coin = "USDT", execer = "evmxgo", name = "USDT"}
]
#现货交易配置
#symbol 币种对；priceDigits 价格最小位数；amountDigits 数量最小位数； minFee 最小手续费
#taker 吃单手续费率,配置时需*1e8(如：收取每笔交易百分之一的手续费，maker=1000000)未配置交易对默认为100000
#maker 挂单手续费,配置时需*1e8(如：收取每笔交易千分之一的手续费，taker=100000)未配置交易对默认为100000
exchanges = [
{symbol = "BTY_CCNY", priceDigits = 4, amountDigits = 1, taker = 1000000, maker = 100000, minFee = 0},

{symbol = "BTY_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "YCC_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0},
{symbol = "ETH_USDT", priceDigits = 4, amountDigits = 4, taker = 1000000, maker = 100000, minFee = 0}
]
2 changes: 1 addition & 1 deletion plugin/dapp/exchange/executor/entrust.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func (a *Action) ExchangeBind(payload *et.ExchangeBind) (*types.Receipt, error)
if a.fromaddr != payload.GetExchangeAddress() {
return nil, types.ErrFromAddr
}
// 为空时代表解除绑定，不为空时校验地址格式
// If the value is null, the binding is unbound. If the value is not null, the address format is verified
if len(payload.GetEntrustAddress()) > 0 {
if err := address.CheckAddress(payload.GetEntrustAddress()); err != nil {
return nil, err
Expand Down
Loading

0 comments on commit 65dc499

Please sign in to comment.