Merge pull request #10 from oxygenpay/develop

merge: develop

Author: swift1337

README.md

@@ -5,10 +5,37 @@
 </p>
 
 [OxygenPay](https://o2pay.co) is a cloud or self-hosted crypto payment gateway.
-Accept ETH, MATIC, TRON, and USDT with ease. Open new opportunities for your product by accepting cryptocurrency.
+Accept ETH, MATIC, TRON, USDT, and USDC with ease. Open new opportunities for your product by accepting cryptocurrency.
 
 <img src="./.github/static/demo.jpg" alt="demo">
 
+## Supported Currencies 🔗
+
+<table>
+    <tr>
+        <td align="center">
+            <img src="./ui-dashboard/src/assets/icons/crypto/eth.svg" height="64" alt="eth">
+            <div>Ethereum</div>
+        </td>
+        <td>
+            <img src="./ui-dashboard/src/assets/icons/crypto/matic.svg" height="64" alt="matic">
+            <div>Polygon</div>
+        </td>
+        <td align="center">
+            <img src="./ui-dashboard/src/assets/icons/crypto/tron.svg" height="64" alt="tron">
+            <div>TRON</div>
+        </td>
+        <td align="center">
+            <img src="./ui-dashboard/src/assets/icons/crypto/usdt.svg" height="64" alt="usdt">
+            <div>USDT</div>
+        </td>
+        <td align="center">
+            <img src="./ui-dashboard/src/assets/icons/crypto/usdc.svg" height="64" alt="usdc">
+            <div>USDC</div>
+        </td>
+    </tr>
+</table>
+
 ## Features ✨
 
 - Self-hosted
@@ -29,7 +56,7 @@ Visit [docs.o2pay.co](https://docs.o2pay.co) for setup guides.
 
 ## Roadmap 🛣️
 
-- [ ] Support for USDC
+- [x] Support for USDC
 - [ ] Support for Binance Smart Chain (BNB, BUSD)
 - [ ] Donations feature
 - [ ] Support for [WalletConnect](https://walletconnect.com/)

api/proto/merchant/v1/merchant.yml

@@ -42,7 +42,7 @@ definitions:
         minItems: 1
         items:
           type: string
-          enum: [ ETH, ETH_USDT, MATIC, MATIC_USDT, TRON, TRON_USDT ]
+          example: ETH_USDT
 
   UpdateMerchantRequest: *createMerchantRequest
 

internal/service/blockchain/currencies.json

@@ -24,6 +24,19 @@
         "minimal_withdrawal_amount_usd": "40",
         "minimal_instant_internal_transfer_amount_usd": "100"
     },
+    {
+        "blockchain": "ETH",
+        "blockchainName": "Ethereum",
+        "ticker": "ETH_USDC",
+        "type": "token",
+        "name": "USDC",
+        "tokenAddress": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+        "decimals": "6",
+        "networkId": "1",
+        "testNetworkId": "5",
+        "minimal_withdrawal_amount_usd": "40",
+        "minimal_instant_internal_transfer_amount_usd": "100"
+    },
     {
         "blockchain": "MATIC",
         "blockchainName": "Polygon",
@@ -49,6 +62,19 @@
         "minimal_withdrawal_amount_usd": "10",
         "minimal_instant_internal_transfer_amount_usd": "30"
     },
+    {
+        "blockchain": "MATIC",
+        "blockchainName": "Polygon",
+        "ticker": "MATIC_USDC",
+        "type": "token",
+        "name": "USDC",
+        "tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+        "decimals": "6",
+        "networkId": "137",
+        "testNetworkId": "80001",
+        "minimal_withdrawal_amount_usd": "10",
+        "minimal_instant_internal_transfer_amount_usd": "30"
+    },
     {
         "blockchain": "TRON",
         "blockchainName": "Tron",

internal/service/blockchain/service_convertor.go

@@ -71,10 +71,10 @@ func (s *Service) GetExchangeRate(ctx context.Context, from, to string) (Exchang
 
 	switch convType {
 	case ConversionTypeFiatToFiat, ConversionTypeCryptoToFiat:
-		rate, at, err = s.getExchangeRate(ctx, normalizeTicker(to), normalizeTicker(from))
+		rate, at, err = s.getExchangeRate(ctx, NormalizeTicker(to), NormalizeTicker(from))
 	case ConversionTypeFiatToCrypto:
 		// Tatum does not support USD to ETH, that's why we need to calculate ETH to USD and reverse it
-		rate, at, err = s.getExchangeRate(ctx, normalizeTicker(from), normalizeTicker(to))
+		rate, at, err = s.getExchangeRate(ctx, NormalizeTicker(from), NormalizeTicker(to))
 		if err == nil {
 			rate = 1 / rate
 		}
@@ -336,9 +336,14 @@ func determineConversionType(from, to string) (ConversionType, error) {
 // e.g. ETH_USDT -> USDT
 var normalizations = map[string]string{
 	"_USDT": "USDT",
+	"_USDC": "USDC",
+	"_BUSD": "BUSD",
 }
 
-func normalizeTicker(ticker string) string {
+// NormalizeTicker normalizes fiat / crypto ticker for further usage in external services (e.g. Tatum).
+func NormalizeTicker(ticker string) string {
+	ticker = strings.ToUpper(ticker)
+
 	for substr, replaced := range normalizations {
 		if strings.Contains(ticker, substr) {
 			return replaced

internal/service/blockchain/service_convertor_test.go

@@ -23,10 +23,12 @@ func TestConvertor(t *testing.T) {
 	tatum.SetupRates(money.USD.String(), money.EUR, 0.91)
 	tatum.SetupRates("ETH", money.USD, 1000)
 	tatum.SetupRates("ETH_USDT", money.USD, 1)
+	tatum.SetupRates("MATIC_USDC", money.USD, 1)
 	tatum.SetupRates("TRON", money.USD, 0.07)
 
 	eth := lo.Must(conv.GetCurrencyByTicker("ETH"))
 	ethUSDT := lo.Must(conv.GetCurrencyByTicker("ETH_USDT"))
+	ethUSDC := lo.Must(conv.GetCurrencyByTicker("ETH_USDC"))
 
 	for _, tt := range []struct {
 		from        string
@@ -101,6 +103,17 @@ func TestConvertor(t *testing.T) {
 				To:   lo.Must(ethUSDT.MakeAmount("500_000_000")),
 			},
 		},
+		{
+			from:   "USD",
+			to:     "ETH_USDC",
+			amount: "200",
+			expected: blockchain.Conversion{
+				Type: blockchain.ConversionTypeFiatToCrypto,
+				Rate: 1,
+				From: lo.Must(money.USD.MakeAmount("200_00")),
+				To:   lo.Must(ethUSDC.MakeAmount("200_000_000")),
+			},
+		},
 		{
 			// case-insensitive
 			from:   "usd",

internal/test/mocks_tatum.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/labstack/echo/v4"
 	"github.com/oxygenpay/oxygen/internal/money"
 	tatumprovider "github.com/oxygenpay/oxygen/internal/provider/tatum"
+	"github.com/oxygenpay/oxygen/internal/service/blockchain"
 	"github.com/oxygenpay/oxygen/internal/service/registry"
 	"github.com/oxygenpay/tatum-sdk/tatum"
 	"github.com/rs/zerolog"
@@ -53,7 +53,7 @@ func (m *TatumMock) SetupRates(from string, to money.FiatCurrency, rate float64)
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	from = transformTicker(from)
+	from = blockchain.NormalizeTicker(from)
 
 	if m.rates[from] == nil {
 		m.rates[from] = make(map[string]float64, 0)
@@ -62,11 +62,11 @@ func (m *TatumMock) SetupRates(from string, to money.FiatCurrency, rate float64)
 	m.rates[from][string(to)] = rate
 }
 
-func (m *TatumMock) SetupSubscription(blockchain, address string, isTest bool, resultID string) {
+func (m *TatumMock) SetupSubscription(chain, address string, isTest bool, resultID string) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	m.wallets[tatumSubKey(blockchain, address, isTest)] = resultID
+	m.wallets[tatumSubKey(chain, address, isTest)] = resultID
 }
 
 func (m *TatumMock) Clear() {
@@ -78,7 +78,7 @@ func (m *TatumMock) Clear() {
 }
 
 func (m *TatumMock) ratesEndpoint(c echo.Context) error {
-	from := transformTicker(c.Param("from"))
+	from := blockchain.NormalizeTicker(c.Param("from"))
 	to := c.QueryParam("basePair")
 
 	rate, exists := m.rates[from][to]
@@ -127,14 +127,6 @@ func (m *TatumMock) subscriptionEndpoint(c echo.Context) error {
 	return c.JSON(http.StatusOK, tatumprovider.SubscriptionResponse{ID: id})
 }
 
-func tatumSubKey(blockchain, address string, isTest bool) string {
-	return fmt.Sprintf("%s/%s/is_test:%t", blockchain, address, isTest)
-}
-
-func transformTicker(from string) string {
-	if strings.Contains(from, "USDT") {
-		from = "USDT"
-	}
-
-	return from
+func tatumSubKey(chain, address string, isTest bool) string {
+	return fmt.Sprintf("%s/%s/is_test:%t", chain, address, isTest)
 }