Feature/usdt (#225)

* dd usdt * code clean * USDT in supported tokens * switch bot to USDT * switch price orachle to usdt * switch e2e test to USDT * trying to fix e2e * Fix docker compose watch --------- Co-authored-by: Luke Rogerson <[email protected]>
orbs-network · Jun 18, 2024 · 86a5b73 · 86a5b73
1 parent 63dcd61
commit 86a5b73
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Wait for services to be ready
         run: |
-          sleep 10
+          sleep 30
 
       - name: Set up Market Maker User
         run: |

diff --git a/cmd/order-book/main.go b/cmd/order-book/main.go
@@ -54,9 +54,7 @@ func setup() {
 		panic(fmt.Errorf("failed to parse redis URL: %v", err))
 	}
 
-	//log.Printf("Redis address: %s", opt.Addr)
 	fmt.Println("Redis address:\t", opt.Addr)
-
 	port, found := os.LookupEnv("PORT")
 	if !found {
 		port = "8080"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
     develop:
       watch:
         - action: rebuild
+          path: .
           files:
             - ./**/*.go
             - ./go.mod
@@ -49,6 +50,7 @@ services:
     develop:
       watch:
         - action: rebuild
+          path: .
           files:
             - ./**/*.go
             - ./go.mod

diff --git a/e2e/maker/main.py b/e2e/maker/main.py
@@ -16,9 +16,9 @@
     "PRIVATE_KEY", "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 )
 TICKER_URL = os.environ.get(
-    "TICKER_URL", "https://www.binance.com/api/v3/ticker/price?symbol=MATICUSDC"
+    "TICKER_URL", "https://www.binance.com/api/v3/ticker/price?symbol=MATICUSDT"
 )
-TICKER_SYMBOL = os.environ.get("TICKER_SYMBOL", "MATIC-USDC")
+TICKER_SYMBOL = os.environ.get("TICKER_SYMBOL", "MATIC-USDT")
 DEPTH_SIZE = os.environ.get("DEPTH_SIZE", "5")
 SLEEP_TIME = os.environ.get("SLEEP_TIME", "10")
 ORDER_SIZE_SCALE = os.environ.get("ORDER_SIZE_SCALE", "10")
@@ -132,7 +132,7 @@ def on_tick(self, url):
 
         ticker_data = response.json()
         ticker = Ticker(ticker_data["price"], ticker_data["symbol"])
-        print(f"ETH-USD Price: {ticker.price}")
+
         return ticker
 
     def _round(self, value):

diff --git a/e2e/tests/maker_endpoints_test.py b/e2e/tests/maker_endpoints_test.py
@@ -4,6 +4,8 @@
 A local Orderbook instance is required to run the tests.
 """
 
+PAIR = "MATIC-USDT"
+
 import pytest
 from orbs_orderbook import (
     CreateMultipleOrdersInput,
@@ -21,7 +23,7 @@ def test_create_order_success(ob_client, ob_signer):
     order_input = CreateOrderInput(
         price="0.86500000",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="sell",
         client_order_id=CLIENT_OID,
     )
@@ -43,7 +45,7 @@ def test_create_order_fails_with_same_clientoid(
     order_input = CreateOrderInput(
         price="0.86500000",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="sell",
         client_order_id=CLIENT_OID,
     )
@@ -157,7 +159,7 @@ def test_create_multiple_orders_successfully(ob_client, ob_signer):
     order_one = CreateOrderInput(
         price="0.86500000",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="buy",
         client_order_id="550e8400-e29b-41d4-a716-446655440000",
     )
@@ -166,14 +168,14 @@ def test_create_multiple_orders_successfully(ob_client, ob_signer):
     order_two = CreateOrderInput(
         price="0.87",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="sell",
         client_order_id="650e8400-e29b-41d4-a716-446655440001",
     )
     order_two_sig, order_two_msg = ob_signer.prepare_and_sign_order(order_two)
 
     create_orders_input = CreateMultipleOrdersInput(
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         orders=[
             OrderWithSignature(
                 order=order_one,
@@ -205,7 +207,7 @@ def test_create_multiple_orders_rejects_order_with_same_client_oid(
     order_one = CreateOrderInput(
         price="0.86500000",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="buy",
         client_order_id=same_client_oid,
     )
@@ -214,14 +216,14 @@ def test_create_multiple_orders_rejects_order_with_same_client_oid(
     order_two = CreateOrderInput(
         price="0.87",
         size="40",
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         side="sell",
         client_order_id=same_client_oid,
     )
     order_two_sig, order_two_msg = ob_signer.prepare_and_sign_order(order_two)
 
     create_orders_input = CreateMultipleOrdersInput(
-        symbol="MATIC-USDC",
+        symbol=PAIR,
         orders=[
             OrderWithSignature(
                 order=order_one,

diff --git a/models/symbol.go b/models/symbol.go
@@ -8,6 +8,7 @@ type Symbol string
 var (
 	symbolsMap = map[string]Symbol{
 		"MATIC-USDC": "MATIC-USDC",
+		"MATIC-USDT": "MATIC-USDT",
 	}
 
 	ErrInvalidSymbol = errors.New("invalid symbol")

diff --git a/supportedTokens.json b/supportedTokens.json
@@ -1,14 +1,19 @@
 {
-    "USDC-OLD": {
-        "desc": "first usdc we used",
+    "USDC": {
+        "desc": "Circle USDC polygon",
         "address": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
         "decimals": 6
     },
-    "USDC": {
-        "desc": "USDC.e most popular stablecoin March24",
+    "USDCE": {
+        "desc": "Circle USDC.e polygon",
         "address": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
         "decimals": 6
     },
+    "USDT": {
+        "desc": "USDT on polygon",
+        "address": "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
+        "decimals": 6
+    },
     "MATIC": {
         "desc": "erc-20 address of WMATIC wrapped",
         "address": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",