Merge branch 'master' of github.com:diadata-org/diadata

diadata-org · Oct 31, 2023 · 6031621 · 6031621
2 parents da8d2cc + 22beef2
commit 6031621
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 12 deletions.
diff --git a/cmd/services/tradesBlockService/go.mod b/cmd/services/tradesBlockService/go.mod
@@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/services/tradesBlockService
 go 1.17
 
 require (
-	github.com/diadata-org/diadata v1.4.360
+	github.com/diadata-org/diadata v1.4.408
 	github.com/segmentio/kafka-go v0.4.35
 	github.com/sirupsen/logrus v1.8.1
 )

diff --git a/config/Binance.json b/config/Binance.json
@@ -986,7 +986,7 @@
         },
         {
             "Exchange": "Binance",
-            "ForeignName": "STORJETH",
+            "ForeignName": "STORJUSDT",
             "Ignore": false,
             "Symbol": "STORJ"
         },

diff --git a/config/BitMart.json b/config/BitMart.json
@@ -1,5 +1,11 @@
 {
   "Coins": [
+    {
+      "Exchange": "BitMart",
+      "ForeignName": "STORJ_USDT",
+      "Ignore": false,
+      "Symbol": "STORJ"
+    },
     {
       "Exchange": "BitMart",
       "ForeignName": "KAVA_USDT",

diff --git a/config/CoinBase.json b/config/CoinBase.json
@@ -180,6 +180,12 @@
       "Ignore": false,
       "Symbol": "DAI"
     },
+    {
+      "Exchange": "CoinBase",
+      "ForeignName": "STORJ-USD",
+      "Ignore": false,
+      "Symbol": "STORJ"
+    },
     {
       "Exchange": "CoinBase",
       "ForeignName": "UST-USD",

diff --git a/config/Kraken.json b/config/Kraken.json
@@ -138,6 +138,12 @@
       "Ignore": false,
       "Symbol": "SDN"
     },
+    {
+      "Exchange": "Kraken",
+      "ForeignName": "STORJUSD",
+      "Ignore": false,
+      "Symbol": "STORJ"
+    },
     {
       "Exchange": "Kraken",
       "ForeignName": "SYNUSD",

diff --git a/config/KuCoin.json b/config/KuCoin.json
@@ -24,12 +24,6 @@
             "Exchange": "KuCoin",
             "Ignore": false
         },
-        {
-            "Symbol": "ACA",
-            "ForeignName": "ACA-USDT",
-            "Exchange": "KuCoin",
-            "Ignore": false
-        },
         {
             "Symbol": "ADA",
             "ForeignName": "ADA-BTC",

diff --git a/config/MEXC.json b/config/MEXC.json
@@ -498,6 +498,12 @@
       "Exchange": "MEXC",
       "Ignore": false
     },
+    {
+      "Symbol": "STORJ",
+      "ForeignName": "STORJUSDT",
+      "Exchange": "MEXC",
+      "Ignore": false
+    },
     {
       "Symbol": "SYN",
       "ForeignName": "SYNUSDT",

diff --git a/config/gitcoinverified/BitMart.json b/config/gitcoinverified/BitMart.json
@@ -360,6 +360,12 @@
       "Blockchain": "Ethereum",
       "Address": "0x090185f2135308BaD17527004364eBcC2D37e5F6"
     },
+    {
+      "Symbol": "STORJ",
+      "Exchange": "BitMart",
+      "Blockchain": "Ethereum",
+      "Address": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+    },
     {
       "Symbol": "SYN",
       "Exchange": "BitMart",

diff --git a/config/gitcoinverified/CoinBase.json b/config/gitcoinverified/CoinBase.json
@@ -96,6 +96,12 @@
             "Blockchain": "Ethereum",
             "Address": "0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE"
         },
+        {
+            "Symbol": "STORJ",
+            "Exchange": "CoinBase",
+            "Blockchain": "Ethereum",
+            "Address": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+        },
         {
             "Symbol": "QUICK",
             "Exchange": "CoinBase",

diff --git a/config/gitcoinverified/Kraken.json b/config/gitcoinverified/Kraken.json
@@ -96,6 +96,12 @@
       "Blockchain": "Shiden",
       "Address": "0x0000000000000000000000000000000000000000"
     },
+    {
+      "Symbol": "STORJ",
+      "Exchange": "Kraken",
+      "Blockchain": "Ethereum",
+      "Address": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+    },
     {
       "Symbol": "SYN",
       "Exchange": "Kraken",

diff --git a/config/gitcoinverified/MEXC.json b/config/gitcoinverified/MEXC.json
@@ -462,6 +462,12 @@
       "Blockchain": "Ethereum",
       "Address": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
     },
+    {
+      "Symbol": "STORJ",
+      "Exchange": "MEXC",
+      "Blockchain": "Ethereum",
+      "Address": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+    },
     {
       "Symbol": "TKB",
       "Exchange": "MEXC",

diff --git a/internal/pkg/tradesBlockService/tradesBlockService.go b/internal/pkg/tradesBlockService/tradesBlockService.go
@@ -489,11 +489,11 @@ func buildBridge(t dia.Trade) dia.Asset {
 		}
 	}
 	if basetoken.Blockchain == dia.FANTOM && (t.Source == dia.SpookyswapExchange || t.Source == dia.SpiritswapExchange || t.Source == dia.BeetsExchange || t.Source == dia.SushiSwapExchangeFantom) {
-		if basetoken.Address == "0x04068DA6C83AFCFA0e13ba15A6696662335D5B75" {
+		if basetoken.Address == "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83" {
 			basetoken = dia.Asset{
-				Symbol:     "USDC",
-				Address:    "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-				Blockchain: dia.ETHEREUM,
+				Symbol:     "FTM",
+				Address:    "0x0000000000000000000000000000000000000000",
+				Blockchain: dia.FANTOM,
 			}
 		}
 	}