Merge branch 'feat/ccc' into dev

sjatsh · sjatsh · commit fc28e45c25a7 · 2024-09-13T16:23:04.000+08:00
# Conflicts:
#	tables/t_order_info.go
diff --git a/config/config.go b/config/config.go
@@ -193,7 +193,7 @@ func GetPaymentAddress(payTokenId tables.PayTokenId, paymentAddress string) (str
 		if _, ok := Cfg.Chain.Polygon.AddrMap[paymentAddress]; ok {
 			return strings.ToLower(paymentAddress), nil
 		}
-	case tables.PayTokenIdDAS, tables.PayTokenIdCKB:
+	case tables.PayTokenIdDAS, tables.PayTokenIdCKB, tables.PayTokenIdCkbCCC:
 		if _, ok := Cfg.Chain.Ckb.AddrMap[paymentAddress]; ok {
 			if parseAddr, err := address.Parse(paymentAddress); err != nil {
 				return "", fmt.Errorf("address.Parse err: %s[%s]", err.Error(), paymentAddress)
diff --git a/tables/t_order_info.go b/tables/t_order_info.go
@@ -57,6 +57,7 @@ const (
 	PayTokenIdStripeUSD PayTokenId = "stripe_usd"
 	PayTokenIdDIDPoint  PayTokenId = "did_point"
 	PayTokenIdBTC       PayTokenId = "btc_btc"
+	PayTokenIdCkbCCC               = "ckb_ccc"
 )
 
 func (p PayTokenId) GetContractAddress(net common.DasNetType) string {

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ func GetPaymentAddress(payTokenId tables.PayTokenId, paymentAddress string) (str`
`193`	`193`	`if _, ok := Cfg.Chain.Polygon.AddrMap[paymentAddress]; ok {`
`194`	`194`	`return strings.ToLower(paymentAddress), nil`
`195`	`195`	`}`
`196`		`- case tables.PayTokenIdDAS, tables.PayTokenIdCKB:`
	`196`	`+ case tables.PayTokenIdDAS, tables.PayTokenIdCKB, tables.PayTokenIdCkbCCC:`
`197`	`197`	`if _, ok := Cfg.Chain.Ckb.AddrMap[paymentAddress]; ok {`
`198`	`198`	`if parseAddr, err := address.Parse(paymentAddress); err != nil {`
`199`	`199`	`return "", fmt.Errorf("address.Parse err: %s[%s]", err.Error(), paymentAddress)`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ const (`
`57`	`57`	`PayTokenIdStripeUSD PayTokenId = "stripe_usd"`
`58`	`58`	`PayTokenIdDIDPoint PayTokenId = "did_point"`
`59`	`59`	`PayTokenIdBTC PayTokenId = "btc_btc"`
	`60`	`+ PayTokenIdCkbCCC = "ckb_ccc"`
`60`	`61`	`)`
`61`	`62`
`62`	`63`	`func (p PayTokenId) GetContractAddress(net common.DasNetType) string {`