fix token order bug in traderjoev2.1 scraper. add bridge in tbs.

diadata-org · Sep 12, 2023 · f56f289 · f56f289
1 parent 8012b9c
commit f56f289
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmd/exchange-scrapers/collector/go.mod b/cmd/exchange-scrapers/collector/go.mod
@@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/exchange-scrapers/collector
 go 1.17
 
 require (
-	github.com/diadata-org/diadata v1.4.358
+	github.com/diadata-org/diadata v1.4.359
 	github.com/segmentio/kafka-go v0.4.35
 	github.com/sirupsen/logrus v1.9.0
 )

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.324
+	github.com/diadata-org/diadata v1.4.359
 	github.com/segmentio/kafka-go v0.4.35
 	github.com/sirupsen/logrus v1.8.1
 )

diff --git a/internal/pkg/tradesBlockService/tradesBlockService.go b/internal/pkg/tradesBlockService/tradesBlockService.go
@@ -581,7 +581,7 @@ func buildBridge(t dia.Trade) dia.Asset {
 			}
 		}
 	}
-	if basetoken.Blockchain == dia.ARBITRUM && (t.Source == dia.UniswapExchangeV3Arbitrum || t.Source == dia.SushiSwapExchangeArbitrum || t.Source == dia.CamelotExchange) {
+	if basetoken.Blockchain == dia.ARBITRUM && (t.Source == dia.UniswapExchangeV3Arbitrum || t.Source == dia.SushiSwapExchangeArbitrum || t.Source == dia.CamelotExchange || t.Source == dia.TraderJoeExchangeV2_1Arbitrum) {
 		if basetoken.Address == common.HexToAddress("0x82aF49447D8a07e3bd95BD0d56f35241523fBab1").Hex() {
 			basetoken = dia.Asset{
 				Symbol:     "ETH",

diff --git a/pkg/dia/scraper/exchange-scrapers/TraderJoeScraper.go b/pkg/dia/scraper/exchange-scrapers/TraderJoeScraper.go
@@ -391,8 +391,8 @@ func (tjs *TraderJoeScraper) sendTrade(traderjoeswap TraderJoeSwap, pool *Trader
 	t := &dia.Trade{
 		Symbol:         pool.Token0.Symbol,
 		Pair:           pool.ForeignName,
-		QuoteToken:     token1,
-		BaseToken:      token0,
+		QuoteToken:     token0,
+		BaseToken:      token1,
 		Price:          price,
 		Volume:         volume,
 		Time:           time.Unix(0, traderjoeswap.Timestamp),