Merge branch 'develop' into sdp-2009-add-public-endpoint

Author: JiahuiWho

.github/workflows/e2e_integration_test.yml

@@ -30,6 +30,7 @@ jobs:
           - "Stellar-email" # Stellar distribution account where receivers are registered with their email
           - "Circle-transfers-phone" # Circle(Transfers) distribution account where receivers are registered with their phone number
           - "Circle-payouts-phoneWallet" # Circle(Payouts) distribution account where receivers are registered with their phone number and wallet address
+          - "Stellar-embeddedWallet" # Embedded wallet (contract account) E2E test with disbursement to C-address
         include:
           - platform: "Stellar-phone"
             environment: "Receiver Registration - E2E Integration Tests (Stellar)"
@@ -76,6 +77,16 @@ jobs:
             DISBURSED_ASSET_CODE: "XLM"
             NETWORK_PASSPHRASE: "Test SDF Future Network ; October 2022"
             HORIZON_URL: "https://horizon-futurenet.stellar.org"
+          - platform: "Stellar-embeddedWallet"
+            environment: "Receiver Registration - E2E Integration Tests (Stellar)"
+            DISTRIBUTION_ACCOUNT_TYPE: "DISTRIBUTION_ACCOUNT.STELLAR.ENV"
+            DISBURSEMENT_CSV_FILE_NAME: "disbursement_instructions_embedded_wallet.csv"
+            REGISTRATION_CONTACT_TYPE: "PHONE_NUMBER"
+            DISBURSED_ASSET_CODE: "XLM"
+            NETWORK_PASSPHRASE: "Test SDF Network ; September 2015"
+            HORIZON_URL: "https://horizon-testnet.stellar.org"
+            RPC_URL: "https://soroban-testnet.stellar.org"
+            TEST_TYPE: "embedded-wallet"
     environment: ${{ matrix.environment }}
     env:
       DISTRIBUTION_ACCOUNT_TYPE: ${{ matrix.DISTRIBUTION_ACCOUNT_TYPE }}
@@ -86,6 +97,10 @@ jobs:
       NETWORK_PASSPHRASE: ${{ matrix.NETWORK_PASSPHRASE }}
       HORIZON_URL: ${{ matrix.HORIZON_URL }}
       CIRCLE_API_TYPE: ${{ matrix.CIRCLE_API_TYPE || 'TRANSFERS' }}
+      RPC_URL: ${{ matrix.RPC_URL }}
+      ENABLE_EMBEDDED_WALLETS: ${{ matrix.ENABLE_EMBEDDED_WALLETS}}
+      EMBEDDED_WALLETS_WASM_HASH: ${{ matrix.EMBEDDED_WALLETS_WASM_HASH }}
+      TEST_TYPE: ${{ matrix.TEST_TYPE }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -148,7 +163,12 @@ jobs:
       - name: Start integration test command
         run: |
           echo "Running integration tests with native SDP SEP services"
-          docker exec e2e-sdp-api sh -c "./stellar-disbursement-platform integration-tests start"
+          if [ "${{ env.TEST_TYPE }}" = "embedded-wallet" ]; then
+            echo "Running embedded wallet integration tests..."
+            docker exec e2e-sdp-api sh -c "./stellar-disbursement-platform integration-tests start-embedded-wallet"
+          else
+            docker exec e2e-sdp-api sh -c "./stellar-disbursement-platform integration-tests start"
+          fi
         shell: bash
 
       - name: Docker logs

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## [Unreleased]
+
+### Added
+
+- Add integration tests for embedded wallets. [1041](https://github.com/stellar/stellar-disbursement-platform-backend/pull/1041)
+
 ## [6.1.0](https://github.com/stellar/stellar-disbursement-platform-backend/releases/tag/6.1.0) ([diff](https://github.com/stellar/stellar-disbursement-platform-backend/compare/6.0.1...6.1.0))
 
 ### Fixed

cmd/integration_tests.go

@@ -32,7 +32,7 @@ func (c *IntegrationTestsCommand) Command() *cobra.Command {
 			Name:      "disbursed-asset-issuer",
 			Usage:     "Issuer if the asset to be disbursed",
 			OptType:   types.String,
-			ConfigKey: &integrationTestsOpts.DisbursetAssetIssuer,
+			ConfigKey: &integrationTestsOpts.DisbursedAssetIssuer,
 			Required:  false,
 		},
 		{
@@ -148,7 +148,8 @@ func (c *IntegrationTestsCommand) Command() *cobra.Command {
 
 	startIntegrationTestsCmd := c.StartIntegrationTestsCommand(integrationTestsOpts)
 	createIntegrationTestsDataCmd := c.CreateIntegrationTestsDataCommand(integrationTestsOpts)
-	integrationTestsCmd.AddCommand(startIntegrationTestsCmd, createIntegrationTestsDataCmd)
+	startEmbeddedWalletTestsCmd := c.StartEmbeddedWalletTestsCommand(integrationTestsOpts)
+	integrationTestsCmd.AddCommand(startIntegrationTestsCmd, createIntegrationTestsDataCmd, startEmbeddedWalletTestsCmd)
 
 	return integrationTestsCmd
 }
@@ -307,3 +308,68 @@ func (c *IntegrationTestsCommand) CreateIntegrationTestsDataCommand(integrationT
 
 	return createIntegrationTestsDataCmd
 }
+
+func (c *IntegrationTestsCommand) StartEmbeddedWalletTestsCommand(integrationTestsOpts *integrationtests.IntegrationTestsOpts) *cobra.Command {
+	configOpts := config.ConfigOptions{
+		{
+			Name:      "embedded-wallets-wasm-hash",
+			Usage:     "The WASM hash of the embedded wallet smart contract",
+			OptType:   types.String,
+			ConfigKey: &integrationTestsOpts.EmbeddedWalletsWasmHash,
+			Required:  true,
+		},
+		{
+			Name:           "rpc-url",
+			Usage:          "URL of the Stellar RPC server used for contract deployment",
+			OptType:        types.String,
+			CustomSetValue: utils.SetConfigOptionURLString,
+			ConfigKey:      &integrationTestsOpts.RPCUrl,
+			Required:       true,
+		},
+		{
+			Name:      "disbursement-csv-file-name",
+			Usage:     "File name of the integration test disbursement file.",
+			OptType:   types.String,
+			ConfigKey: &integrationTestsOpts.DisbursementCSVFileName,
+			Required:  true,
+		},
+		{
+			Name:      "disbursement-csv-file-path",
+			Usage:     "File path of the integration test disbursement file.",
+			OptType:   types.String,
+			ConfigKey: &integrationTestsOpts.DisbursementCSVFilePath,
+			Required:  true,
+		},
+	}
+
+	startEmbeddedWalletTestsCmd := &cobra.Command{
+		Use:   "start-embedded-wallet",
+		Short: "Run the embedded wallet (contract account) e2e tests",
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			ctx := cmd.Context()
+			cmd.Parent().PersistentPreRun(cmd.Parent(), args)
+
+			// Validate & ingest input parameters
+			configOpts.Require()
+			err := configOpts.SetValues()
+			if err != nil {
+				log.Ctx(ctx).Fatalf("Error setting values of config options: %s", err.Error())
+			}
+		},
+		Run: func(cmd *cobra.Command, _ []string) {
+			ctx := cmd.Context()
+
+			err := c.Service.StartEmbeddedWalletIntegrationTests(ctx, *integrationTestsOpts)
+			if err != nil {
+				log.Ctx(ctx).Fatalf("Error starting embedded wallet integration tests: %s", err.Error())
+			}
+		},
+	}
+
+	err := configOpts.Init(startEmbeddedWalletTestsCmd)
+	if err != nil {
+		log.Ctx(startEmbeddedWalletTestsCmd.Context()).Fatalf("Error initializing StartEmbeddedWalletTestsCommand: %s", err.Error())
+	}
+
+	return startEmbeddedWalletTestsCmd
+}

cmd/integration_tests_test.go

@@ -28,6 +28,10 @@ func (m *mockIntegrationTests) CreateTestData(ctx context.Context, opts integrat
 	return m.Called(ctx, opts).Error(0)
 }
 
+func (m *mockIntegrationTests) StartEmbeddedWalletIntegrationTests(ctx context.Context, opts integrationtests.IntegrationTestsOpts) error {
+	return m.Called(ctx, opts).Error(0)
+}
+
 func Test_IntegrationTestsCommand_StartIntegrationTestsCommand(t *testing.T) {
 	serviceMock := &mockIntegrationTests{}
 	command := &IntegrationTestsCommand{Service: serviceMock}
@@ -41,7 +45,7 @@ func Test_IntegrationTestsCommand_StartIntegrationTestsCommand(t *testing.T) {
 		UserEmail:                  "mockemail@test.com",
 		UserPassword:               "mockPassword123!",
 		DisbursedAssetCode:         "USDC",
-		DisbursetAssetIssuer:       "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVV",
+		DisbursedAssetIssuer:       "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVV",
 		WalletName:                 "walletTest",
 		DisbursementCSVFilePath:    "mockPath",
 		DisbursementCSVFileName:    "file.csv",
@@ -107,7 +111,7 @@ func Test_IntegrationTestsCommand_CreateIntegrationTestsDataCommand(t *testing.T
 	integrationTestsOpts := &integrationtests.IntegrationTestsOpts{
 		DatabaseDSN:          "randomDatabaseDSN",
 		DisbursedAssetCode:   "USDC",
-		DisbursetAssetIssuer: "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVV",
+		DisbursedAssetIssuer: "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVV",
 		WalletName:           "walletTest",
 		WalletHomepage:       "https://www.test_wallet.com",
 		WalletDeepLink:       "test-wallet://sdp",
@@ -149,3 +153,52 @@ func Test_IntegrationTestsCommand_CreateIntegrationTestsDataCommand(t *testing.T
 
 	serviceMock.AssertExpectations(t)
 }
+
+func Test_IntegrationTestsCommand_StartEmbeddedWalletTestsCommand(t *testing.T) {
+	serviceMock := &mockIntegrationTests{}
+	command := &IntegrationTestsCommand{Service: serviceMock}
+
+	parentCmdMock := &cobra.Command{
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {},
+	}
+
+	integrationTestsOpts := &integrationtests.IntegrationTestsOpts{
+		EmbeddedWalletsWasmHash: "0123456789abcdef",
+		RPCUrl:                  "https://rpc.test",
+		DisbursementCSVFileName: "disbursement.csv",
+		DisbursementCSVFilePath: "/tmp",
+	}
+
+	cmd := command.StartEmbeddedWalletTestsCommand(integrationTestsOpts)
+	parentCmdMock.AddCommand(cmd)
+
+	t.Setenv("ENABLE_EMBEDDED_WALLETS", "true")
+	t.Setenv("EMBEDDED_WALLETS_WASM_HASH", "0123456789abcdef")
+	t.Setenv("RPC_URL", "https://rpc.test")
+	t.Setenv("DISBURSEMENT_CSV_FILE_NAME", "disbursement.csv")
+	t.Setenv("DISBURSEMENT_CSV_FILE_PATH", "/tmp")
+
+	parentCmdMock.SetArgs([]string{
+		"start-embedded-wallet",
+	})
+
+	t.Run("exit with status 1 when integration tests service fails", func(t *testing.T) {
+		utils.AssertFuncExitsWithFatal(t, func() {
+			serviceMock.
+				On("StartEmbeddedWalletIntegrationTests", context.Background(), *integrationTestsOpts).
+				Return(errors.New("unexpected error"))
+			_ = parentCmdMock.Execute()
+		}, "Error starting embedded wallet integration tests: unexpected error")
+	})
+
+	t.Run("executes the start embedded wallet integration tests command successfully", func(t *testing.T) {
+		serviceMock.
+			On("StartEmbeddedWalletIntegrationTests", context.Background(), *integrationTestsOpts).
+			Return(nil)
+
+		err := parentCmdMock.Execute()
+		require.NoError(t, err)
+	})
+
+	serviceMock.AssertExpectations(t)
+}

contracts/Cargo.lock

@@ -58,11 +58,11 @@ services:
 
       # SEP-45 configuration
       ENABLE_SEP45: ${ENABLE_SEP45:-false}
-      SEP45_CONTRACT_ID: ${SEP45_CONTRACT_ID:-}
+      SEP45_CONTRACT_ID: ${SEP45_CONTRACT_ID:-CDY4CS2VWHAZOMYVTKUFKGNZKIVFBCXUFNFQ5KSXOTAHKL5H5ZRTAUTH}
 
       # Embedded wallet configuration
       ENABLE_EMBEDDED_WALLETS: ${ENABLE_EMBEDDED_WALLETS:-false}
-      EMBEDDED_WALLETS_WASM_HASH: ${EMBEDDED_WALLETS_WASM_HASH:-}
+      EMBEDDED_WALLETS_WASM_HASH: ${EMBEDDED_WALLETS_WASM_HASH:-9b784817dff1620a3e2b223fe1eb8dac56e18980dea9726f692847ccbbd3a853}
 
       # multi-tenant secrets
       ADMIN_ACCOUNT: ${ADMIN_ACCOUNT:-SDP-admin}

dev/docker-compose-sdp.yml

@@ -722,7 +722,7 @@ func CreateEmbeddedWalletFixture(t *testing.T, ctx context.Context, sqlExec db.S
 		token = randomToken
 	}
 	if wasmHash == "" {
-		wasmHash = "6223a23026480644055230783215652de8695abc8a9dbb56a94972eb341a4663"
+		wasmHash = "9b784817dff1620a3e2b223fe1eb8dac56e18980dea9726f692847ccbbd3a853"
 	}
 
 	q := fmt.Sprintf(`

internal/data/fixtures.go

@@ -273,13 +273,13 @@ func (wm *WalletModel) Insert(ctx context.Context, newWallet WalletInsert) (*Wal
 	return wallet, nil
 }
 
-func (wm *WalletModel) GetOrCreate(ctx context.Context, name, homepage, deepLink, sep10Domain string) (*Wallet, error) {
+func (wm *WalletModel) GetOrCreate(ctx context.Context, name, homepage, deepLink, sep10Domain string, embedded bool) (*Wallet, error) {
 	const query = `
 	WITH create_wallet AS(
 		INSERT INTO wallets
-			(name, homepage, deep_link_schema, sep_10_client_domain)
+			(name, homepage, deep_link_schema, sep_10_client_domain, embedded)
 		VALUES
-			($1, $2, $3, $4)
+			($1, $2, $3, $4, $5)
 		ON CONFLICT (name, homepage, deep_link_schema) DO NOTHING
 		RETURNING
 			*
@@ -293,7 +293,7 @@ func (wm *WalletModel) GetOrCreate(ctx context.Context, name, homepage, deepLink
 	`
 
 	var wallet Wallet
-	err := wm.dbConnectionPool.GetContext(ctx, &wallet, query, name, homepage, deepLink, sep10Domain)
+	err := wm.dbConnectionPool.GetContext(ctx, &wallet, query, name, homepage, deepLink, sep10Domain, embedded)
 	if err != nil {
 		return nil, fmt.Errorf("error getting or creating wallet: %w", err)
 	}