Merge pull request #80 from iulianpascalau/removes-crypto-payments-service

Removed the crypto payments service

Author: iulianpascalau

Jenkinsfile-crypto-prod

@@ -6,8 +6,8 @@ toolchain go1.24.11
 
 require (
 	github.com/dchest/captcha v1.1.0
-	github.com/gin-gonic/gin v1.10.0
 	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/iulianpascalau/mx-crypto-payments v1.0.5
 	github.com/joho/godotenv v1.5.1
 	github.com/mattn/go-sqlite3 v1.14.33
 	github.com/multiversx/mx-chain-core-go v1.4.1
@@ -50,6 +50,7 @@ require (
 	github.com/gin-contrib/cors v1.6.0 // indirect
 	github.com/gin-contrib/pprof v1.4.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.10.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect

Jenkinsfile-crypto-staging

@@ -268,6 +268,8 @@ github.com/ipfs/go-test v0.0.4 h1:DKT66T6GBB6PsDFLoO56QZPrOmzJkqU1FZH5C9ySkew=
 github.com/ipfs/go-test v0.0.4/go.mod h1:qhIM1EluEfElKKM6fnWxGn822/z9knUGM1+I/OAQNKI=
 github.com/ipld/go-ipld-prime v0.21.0 h1:n4JmcpOlPDIxBcY037SVfpd1G+Sj1nKZah0m6QH9C2E=
 github.com/ipld/go-ipld-prime v0.21.0/go.mod h1:3RLqy//ERg/y5oShXXdx5YIp50cFGOanyMctpPjsvxQ=
+github.com/iulianpascalau/mx-crypto-payments v1.0.5 h1:VuIssbSGLPvz9LDdtWVyF8qUMtl4ea7kgByra0epZAg=
+github.com/iulianpascalau/mx-crypto-payments v1.0.5/go.mod h1:4/NVijzrXB9NswwfiG8QSV4KkolilWOCjcxIhpVFSUw=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=

Jenkinsfile-proxy-prod Jenkinsfile-prodJenkinsfile-proxy-prod renamed to Jenkinsfile-prod

@@ -1,4 +1,4 @@
-package _go
+package integrationTests
 
 import (
 	"context"
@@ -8,23 +8,30 @@ import (
 	"testing"
 	"time"
 
-	"github.com/iulianpascalau/mx-epoch-proxy-go/integrationTests/go/framework"
+	cryptoPaymentsFramework "github.com/iulianpascalau/mx-crypto-payments/integrationTests/framework"
+	"github.com/iulianpascalau/mx-epoch-proxy-go/integrationTests/framework"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
+	logger "github.com/multiversx/mx-chain-logger-go"
 	"github.com/stretchr/testify/require"
 )
 
+var log = logger.GetOrCreate("integrationTests")
+
 func TestCreateFreeUserAndCreateKeyAndTestRequestsAreThrottledThenSwitchToPremium(t *testing.T) {
 	if !framework.IsChainSimulatorIsRunning() {
 		t.Skip("No chain simulator instance running found. Skipping slow test")
 	}
+
+	framework.EnsureTestContracts(t)
+
 	proxyService := framework.NewProxyService(t)
-	cryptoPaymentService := framework.NewCryptoPaymentService(t)
+	cryptoPaymentService := cryptoPaymentsFramework.NewCryptoPaymentService(t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
 	proxyService.Setup(ctx)
-	cryptoPaymentService.Setup(ctx, 100)
+	cryptoPaymentService.Setup(ctx, 100, framework.GetContractPath("credits"))
 
 	defer proxyService.TearDown()
 	defer cryptoPaymentService.TearDown()
@@ -87,7 +94,7 @@ func TestCreateFreeUserAndCreateKeyAndTestRequestsAreThrottledThenSwitchToPremiu
 	// Value: 0.5 EGLD = 0.5 * 10^18 = 500000000000000000
 	value := "500000000000000000"
 
-	receiverAddr := framework.NewMvxAddressFromBech32(t, session.GetDepositAddress())
+	receiverAddr := cryptoPaymentsFramework.NewMvxAddressFromBech32(t, session.GetDepositAddress())
 
 	// Send Tx
 	hash, _, status := cryptoPaymentService.ChainSimulator.SendTx(ctx, senderSk, receiverAddr, value, 500000, []byte{})

Jenkinsfile-proxy-staging Jenkinsfile-stagingJenkinsfile-proxy-staging renamed to Jenkinsfile-staging

@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	cryptoPaymentsFramework "github.com/iulianpascalau/mx-crypto-payments/integrationTests/framework"
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/pubkeyConverter"
 	apiCore "github.com/multiversx/mx-chain-core-go/data/api"
@@ -44,9 +45,10 @@ const (
 )
 
 var (
-	log          = logger.GetOrCreate("integrationTests")
-	signer       = &singlesig.Ed25519Signer{}
-	keyGenerator = signing.NewKeyGenerator(ed25519.NewEd25519())
+	log                       = logger.GetOrCreate("integrationTests")
+	signer                    = &singlesig.Ed25519Signer{}
+	keyGenerator              = signing.NewKeyGenerator(ed25519.NewEd25519())
+	addressPubkeyConverter, _ = pubkeyConverter.NewBech32PubkeyConverter(32, "erd")
 )
 
 // ESDTSupply represents the DTO that holds the supply values for a token
@@ -132,7 +134,7 @@ func (instance *chainSimulatorWrapper) GetNetworkAddress() string {
 }
 
 // DeploySC will deploy the provided smart contract and return its address
-func (instance *chainSimulatorWrapper) DeploySC(ctx context.Context, wasmFilePath string, ownerSK []byte, gasLimit uint64, parameters []string) (*MvxAddress, string, *data.TransactionOnNetwork) {
+func (instance *chainSimulatorWrapper) DeploySC(ctx context.Context, wasmFilePath string, ownerSK []byte, gasLimit uint64, parameters []string) (*cryptoPaymentsFramework.MvxAddress, string, *data.TransactionOnNetwork) {
 	networkConfig, err := instance.proxyInstance.GetNetworkConfig(ctx)
 	require.Nil(instance.TB, err)
 
@@ -164,11 +166,11 @@ func (instance *chainSimulatorWrapper) DeploySC(ctx context.Context, wasmFilePat
 	require.Nil(instance, err)
 	require.Equal(instance, transaction.TxStatusSuccess, txStatus, fmt.Sprintf("tx hash: %s,\n tx: %s", hash, string(jsonData)))
 
-	return NewMvxAddressFromBech32(instance.TB, txResult.Logs.Events[0].Address), hash, txResult
+	return cryptoPaymentsFramework.NewMvxAddressFromBech32(instance.TB, txResult.Logs.Events[0].Address), hash, txResult
 }
 
 // UpgradeSC will upgrade the provided smart contract
-func (instance *chainSimulatorWrapper) UpgradeSC(ctx context.Context, scAddress *MvxAddress, wasmFilePath string, ownerSK []byte, gasLimit uint64, parameters []string) (string, *data.TransactionOnNetwork) {
+func (instance *chainSimulatorWrapper) UpgradeSC(ctx context.Context, scAddress *cryptoPaymentsFramework.MvxAddress, wasmFilePath string, ownerSK []byte, gasLimit uint64, parameters []string) (string, *data.TransactionOnNetwork) {
 	networkConfig, err := instance.proxyInstance.GetNetworkConfig(ctx)
 	require.Nil(instance.TB, err)
 
@@ -253,12 +255,12 @@ func (instance *chainSimulatorWrapper) GenerateBlocksUntilTxProcessed(ctx contex
 }
 
 // ScCall will make the provided sc call
-func (instance *chainSimulatorWrapper) ScCall(ctx context.Context, senderSK []byte, contract *MvxAddress, value string, gasLimit uint64, function string, parameters []string) (string, *data.TransactionOnNetwork, transaction.TxStatus) {
+func (instance *chainSimulatorWrapper) ScCall(ctx context.Context, senderSK []byte, contract *cryptoPaymentsFramework.MvxAddress, value string, gasLimit uint64, function string, parameters []string) (string, *data.TransactionOnNetwork, transaction.TxStatus) {
 	return instance.SendTx(ctx, senderSK, contract, value, gasLimit, createTxData(function, parameters))
 }
 
 // ScCallWithoutGenerateBlocks will make the provided sc call and do not trigger the generate blocks command
-func (instance *chainSimulatorWrapper) ScCallWithoutGenerateBlocks(ctx context.Context, senderSK []byte, contract *MvxAddress, value string, gasLimit uint64, function string, parameters []string) string {
+func (instance *chainSimulatorWrapper) ScCallWithoutGenerateBlocks(ctx context.Context, senderSK []byte, contract *cryptoPaymentsFramework.MvxAddress, value string, gasLimit uint64, function string, parameters []string) string {
 	return instance.SendTxWithoutGenerateBlocks(ctx, senderSK, contract, value, gasLimit, createTxData(function, parameters))
 }
 
@@ -271,7 +273,7 @@ func createTxData(function string, parameters []string) []byte {
 }
 
 // SendTx will build and send a transaction
-func (instance *chainSimulatorWrapper) SendTx(ctx context.Context, senderSK []byte, receiver *MvxAddress, value string, gasLimit uint64, dataField []byte) (string, *data.TransactionOnNetwork, transaction.TxStatus) {
+func (instance *chainSimulatorWrapper) SendTx(ctx context.Context, senderSK []byte, receiver *cryptoPaymentsFramework.MvxAddress, value string, gasLimit uint64, dataField []byte) (string, *data.TransactionOnNetwork, transaction.TxStatus) {
 	hash := instance.SendTxWithoutGenerateBlocks(ctx, senderSK, receiver, value, gasLimit, dataField)
 	instance.GenerateBlocks(ctx, 1)
 	txResult, txStatus := instance.GetTransactionResult(ctx, hash)
@@ -280,7 +282,7 @@ func (instance *chainSimulatorWrapper) SendTx(ctx context.Context, senderSK []by
 }
 
 // SendTxWithoutGenerateBlocks will build and send a transaction without generating blocks
-func (instance *chainSimulatorWrapper) SendTxWithoutGenerateBlocks(ctx context.Context, senderSK []byte, receiver *MvxAddress, value string, gasLimit uint64, dataField []byte) string {
+func (instance *chainSimulatorWrapper) SendTxWithoutGenerateBlocks(ctx context.Context, senderSK []byte, receiver *cryptoPaymentsFramework.MvxAddress, value string, gasLimit uint64, dataField []byte) string {
 	senderPK := instance.getPublicKey(senderSK)
 	nonce, err := instance.getNonce(ctx, senderPK)
 	require.Nil(instance, err)
@@ -289,7 +291,7 @@ func (instance *chainSimulatorWrapper) SendTxWithoutGenerateBlocks(ctx context.C
 }
 
 // SendTxWithNonceWithoutGenerateBlocks will build a transaction with given nonce and send it without generating blocks
-func (instance *chainSimulatorWrapper) SendTxWithNonceWithoutGenerateBlocks(ctx context.Context, senderSK []byte, receiver *MvxAddress, nonce uint64, value string, gasLimit uint64, dataField []byte) string {
+func (instance *chainSimulatorWrapper) SendTxWithNonceWithoutGenerateBlocks(ctx context.Context, senderSK []byte, receiver *cryptoPaymentsFramework.MvxAddress, nonce uint64, value string, gasLimit uint64, dataField []byte) string {
 	networkConfig, err := instance.proxyInstance.GetNetworkConfig(ctx)
 	require.Nil(instance, err)
 
@@ -337,7 +339,7 @@ func (instance *chainSimulatorWrapper) FundWallets(ctx context.Context, wallets
 }
 
 // GetESDTBalance returns the balance of the esdt token for the provided address
-func (instance *chainSimulatorWrapper) GetESDTBalance(ctx context.Context, address *MvxAddress, token string) string {
+func (instance *chainSimulatorWrapper) GetESDTBalance(ctx context.Context, address *cryptoPaymentsFramework.MvxAddress, token string) string {
 	tokenData, err := instance.proxyInstance.GetESDTTokenData(ctx, address, token, apiCore.AccountQueryOptions{
 		OnFinalBlock: true,
 	})
@@ -426,7 +428,7 @@ func computeTransactionSignature(senderSk []byte, tx *transaction.FrontendTransa
 // ExecuteVMQuery will try to execute a VM query and return the results
 func (instance *chainSimulatorWrapper) ExecuteVMQuery(
 	ctx context.Context,
-	scAddress *MvxAddress,
+	scAddress *cryptoPaymentsFramework.MvxAddress,
 	function string,
 	hexParams []string,
 ) [][]byte {

go.mod

@@ -3,13 +3,18 @@ package framework
 import (
 	"path/filepath"
 	"runtime"
+	"testing"
+
+	cryptoPaymentsFramework "github.com/iulianpascalau/mx-crypto-payments/integrationTests/framework"
+	"github.com/stretchr/testify/require"
 )
 
-// PaymentGasLimit is the gas limit for the payment transaction
-const PaymentGasLimit = 50000
+// GetProxyRootPath returns the absolute path to the proxy service root path
+func GetProxyRootPath(templateFile string) string {
+	currentDir := traverse("integrationTests")
 
-// CallGasLimit is the gas limit for a SC call
-const CallGasLimit = 3000000
+	return filepath.Join(currentDir, "services", "proxy", templateFile)
+}
 
 // GetContractPath returns the absolute path to the wasm file
 func GetContractPath(contractName string) string {
@@ -18,11 +23,13 @@ func GetContractPath(contractName string) string {
 	return filepath.Join(currentDir, "contracts", contractName, contractName+".wasm")
 }
 
-// GetProxyRootPath returns the absolute path to the proxy service root path
-func GetProxyRootPath(templateFile string) string {
-	currentDir := traverse("integrationTests")
+// EnsureTestContracts test if the contracts are present in the project, if not, download them
+func EnsureTestContracts(tb testing.TB) {
+	root := traverse("integrationTests")
+	extractTarget := filepath.Join(root, "contracts")
 
-	return filepath.Join(currentDir, "services", "proxy", templateFile)
+	err := cryptoPaymentsFramework.EnsureContractCredits(cryptoPaymentsFramework.ContractCreditsURL, extractTarget)
+	require.NoError(tb, err)
 }
 
 func traverse(upToDir string) string {

go.sum

@@ -3,8 +3,8 @@ package framework
 import (
 	"context"
 
-	"github.com/iulianpascalau/mx-epoch-proxy-go/services/crypto-payment/factory"
-	"github.com/iulianpascalau/mx-epoch-proxy-go/services/crypto-payment/process"
+	"github.com/iulianpascalau/mx-crypto-payments/factory"
+	"github.com/iulianpascalau/mx-crypto-payments/process"
 	proxyApi "github.com/iulianpascalau/mx-epoch-proxy-go/services/proxy/api"
 	proxyFactory "github.com/iulianpascalau/mx-epoch-proxy-go/services/proxy/factory"
 	"github.com/multiversx/mx-chain-core-go/data/api"