diff --git a/.run/Run - All Servers - no Docker.run.xml b/.run/Run - All Servers - no Docker.run.xml
index fdea6e1144..37b6d97e91 100644
--- a/.run/Run - All Servers - no Docker.run.xml	
+++ b/.run/Run - All Servers - no Docker.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run - All Servers - no Docker" type="JetRunConfigurationType">
     <envs>
-      <env name="sep24.enableTest" value="true" />
+      <env name="app.enableTest" value="true" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunAllServers" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
diff --git a/.run/Run - Kotlin Reference Server - no Docker.run.xml b/.run/Run - Kotlin Reference Server - no Docker.run.xml
index 850b6fea1c..ef247dcd7e 100644
--- a/.run/Run - Kotlin Reference Server - no Docker.run.xml	
+++ b/.run/Run - Kotlin Reference Server - no Docker.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run - Kotlin Reference Server - no Docker" type="JetRunConfigurationType">
     <envs>
-      <env name="sep24.enableTest" value="true" />
+      <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="default" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunKotlinReferenceServer" />
diff --git a/docs/01 - Contributing/A - Development Environment.md b/docs/01 - Contributing/A - Development Environment.md
index d1140e132f..b4cda0d69d 100644
--- a/docs/01 - Contributing/A - Development Environment.md	
+++ b/docs/01 - Contributing/A - Development Environment.md	
@@ -164,16 +164,27 @@ Several IntelliJ run configurations are provided to make it easier to run the pr
 - `Run - Platform Server - no Docker`: runs the Platform server locally, without running `docker-compose`.
 - `Run - Event Processing Server - no Docker`: runs the Event Processing server locally, without
   running `docker-compose`.
+- `Run - Custody Server - no Docker`: runs the Custody server locally, without running `docker-compose`.
 - `Run - Java Reference Server - no Docker`: runs the Java Reference server locally, without running `docker-compose`.
 - `Run - Kotlin Reference Server - no Docker`: runs the Kotlin Reference server locally, without
   running `docker-compose`.
 
 The following run configurations are provided to run integration and end-2-end tests
 
-- `Test - Kotlin Reference Server - no Docker`: runs the Kotlin Reference server locally, without
-  running `docker-compose`.
 - `Test - End2End Test - no fullstack`: runs the end-2-end tests locally, without running `docker-compose`.
 - `Test - End2End Test - with fullstack`: runs the end-2-end tests locally, with running `docker-compose`.
+- `Test - End2End with RPC Test - no fullstack`: runs the end-2-end tests with RPC locally, 
+  without running `docker-compose`.
+- `Test - End2End with RPC Test - with fullstack`: runs the end-2-end tests with RPC locally, 
+  with running `docker-compose`.
+- `Test - Fireblocks End2End Test - no fullstack`: runs the end-2-end tests with Fireblocks locally, 
+  without running `docker-compose`.
+- `Test - Fireblocks End2End Test - with fullstack`: runs the end-2-end tests with Fireblocks locally, 
+  with running `docker-compose`. 
+- `Test - Fireblocks End2End with RPC Test - no fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
+  without running `docker-compose`.
+- `Test - Fireblocks End2End with RPC Test - with fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
+  with running `docker-compose`.
 - `Test - Integration Test - no fullstack`: runs the integration tests locally, without running `docker-compose`.
 - `Test - Integration Test - with fullstack`: runs the integration tests locally, with running `docker-compose`.
 
diff --git a/docs/README.md b/docs/README.md
index 7d3885aebe..28290b6c4c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -39,7 +39,7 @@ contribute to this project.
   infrastructures, such as database, configuration, queue, or logging implementations are assumed in this sub-project.
 - __platform__: Contains the Anchor Platform implementation that uses Spring Boot as the underlying framework. This
   sub-project is responsible for providing the infrastructure implementations, such as database, configuration, queue,
-  and logging. The `sep-server`, `platform-server`, `event-processor` and `stellar-observer` services are also implemented here.
+  and logging. The `sep-server`, `platform-server`, `custody-server`, `event-processor` and `stellar-observer` services are also implemented here.
 - __kotlin_reference_server__: Contains the anchor's reference server implementation in Kotlin.
 - __anchor_reference_server__: Contains the anchor's reference server implementation in Java. This will be deprecated soon.
 - __wallet_reference_server__: Contains the wallet's reference server implementation in Kotlin.
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
index 1ddf5b2a75..fe814fb1c9 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
@@ -37,6 +37,8 @@ open class AbstractIntegrationTest(private val config: TestConfig) {
   lateinit var sep24RpcE2eTests: Sep24RpcEnd2EndTests
   lateinit var sep24CustodyE2eTests: Sep24CustodyEnd2EndTests
   lateinit var sep24CustodyRpcE2eTests: Sep24CustodyRpcEnd2EndTests
+  lateinit var sep31RpcE2eTests: Sep31RpcEnd2EndTests
+  lateinit var sep31CustodyRpcE2eTests: Sep31CustodyRpcEnd2EndTests
 
   fun setUp(envMap: Map<String, String>) {
     envMap.forEach { (key, value) -> config.env[key] = value }
@@ -74,6 +76,8 @@ open class AbstractIntegrationTest(private val config: TestConfig) {
     sep24CustodyE2eTests = Sep24CustodyEnd2EndTests(config, jwt)
     sep24RpcE2eTests = Sep24RpcEnd2EndTests(config, jwt)
     sep24CustodyRpcE2eTests = Sep24CustodyRpcEnd2EndTests(config, jwt)
+    sep31RpcE2eTests = Sep31RpcEnd2EndTests(config, toml, jwt)
+    sep31CustodyRpcE2eTests = Sep31CustodyRpcEnd2EndTests(config, toml, jwt)
     eventProcessingServerTests = EventProcessingServerTests(config, toml, jwt)
   }
 }
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
index 6f31b9d682..fb50143c3c 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
@@ -12,7 +12,7 @@ class AnchorPlatformApiRpcEnd2EndTest :
     @BeforeAll
     @JvmStatic
     fun construct() {
-      println("Running AnchorPlatformActionsEnd2EndTest")
+      println("Running AnchorPlatformApiRpcEnd2EndTest")
       singleton.setUp(mapOf())
     }
 
@@ -28,4 +28,10 @@ class AnchorPlatformApiRpcEnd2EndTest :
   fun runSep24Test() {
     singleton.sep24RpcE2eTests.testAll()
   }
+
+  @Test
+  @Order(11)
+  fun runSep31Test() {
+    singleton.sep31RpcE2eTests.testAll()
+  }
 }
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyApiRpcEnd2EndTest.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyApiRpcEnd2EndTest.kt
index f5b818a591..e26213ecfd 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyApiRpcEnd2EndTest.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyApiRpcEnd2EndTest.kt
@@ -12,7 +12,7 @@ class AnchorPlatformCustodyApiRpcEnd2EndTest :
     @BeforeAll
     @JvmStatic
     fun construct() {
-      println("Running AnchorPlatformCustodyActionsEnd2EndTest")
+      println("Running AnchorPlatformCustodyApiRpcEnd2EndTest")
       singleton.setUp(mapOf())
     }
 
@@ -28,4 +28,10 @@ class AnchorPlatformCustodyApiRpcEnd2EndTest :
   fun runSep24Test() {
     singleton.sep24CustodyRpcE2eTests.testAll()
   }
+
+  @Test
+  @Order(11)
+  fun runSep31Test() {
+    singleton.sep31CustodyRpcE2eTests.testAll()
+  }
 }
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt
index 4c9fc1e863..9bbc362495 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt
@@ -600,7 +600,9 @@ private const val EXPECTED_TXN_REFUND_RESPONSE =
   "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
   "destination_account": "testAddress",
   "memo": "testTag",
-  "memo_type": "id"
+  "memo_type": "id",
+  "refund_memo": "12345",
+  "refund_memo_type" : "id"
 }
 """
 
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt
index ff2d632c5d..3dbe2c641d 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyEnd2EndTests.kt
@@ -65,7 +65,7 @@ class Sep24CustodyEnd2EndTests(config: TestConfig, val jwt: String) {
         socketTimeoutMillis = 300000
       }
     }
-  private val maxTries = 30
+  private val maxTries = 90
   private val anchorReferenceServerClient =
     AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
   private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
@@ -109,9 +109,9 @@ class Sep24CustodyEnd2EndTests(config: TestConfig, val jwt: String) {
       compareAndAssertEvents(asset, expectedEvents, actualEvents!!)
 
       // Check the callbacks sent to the wallet reference server are recorded correctly
-      val actualCallbacks = waitForWalletServerCallbacks(response.id, 4)
+      val actualCallbacks = waitForWalletServerCallbacks(response.id, 5)
       actualCallbacks?.let {
-        assertEquals(4, it.size)
+        assertEquals(5, it.size)
         val expectedCallbacks: List<Sep24GetTransactionResponse> =
           gson.fromJson(
             expectedDepositCallbacksJson,
@@ -152,8 +152,10 @@ class Sep24CustodyEnd2EndTests(config: TestConfig, val jwt: String) {
         expectedEvent.transaction.id = actualEvent.transaction.id
         expectedEvent.transaction.startedAt = actualEvent.transaction.startedAt
         expectedEvent.transaction.updatedAt = actualEvent.transaction.updatedAt
+        expectedEvent.transaction.completedAt = actualEvent.transaction.completedAt
         expectedEvent.transaction.stellarTransactions = actualEvent.transaction.stellarTransactions
         expectedEvent.transaction.memo = actualEvent.transaction.memo
+        expectedEvent.transaction.destinationAccount = actualEvent.transaction.destinationAccount
         actualEvent.transaction.amountIn?.let {
           expectedEvent.transaction.amountIn.amount = actualEvent.transaction.amountIn.amount
           expectedEvent.transaction.amountIn.asset = asset.sep38
@@ -271,15 +273,17 @@ class Sep24CustodyEnd2EndTests(config: TestConfig, val jwt: String) {
     count: Int
   ): List<Sep24GetTransactionResponse>? {
     var retries = 5
+    var callbacks: List<Sep24GetTransactionResponse>? = null
     while (retries > 0) {
-      val callbacks = walletServerClient.getCallbackHistory(txnId)
+      callbacks =
+        walletServerClient.getCallbackHistory(txnId, Sep24GetTransactionResponse::class.java)
       if (callbacks.size == count) {
         return callbacks
       }
       delay(1.seconds)
       retries--
     }
-    return null
+    return callbacks
   }
 
   private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
@@ -481,339 +485,233 @@ class Sep24CustodyEnd2EndTests(config: TestConfig, val jwt: String) {
 
   private val expectedWithdrawEventJson =
     """
-    [
-      {
-        "type": "transaction_created",
-        "sep": "24",
-        "transaction": {
-          "sep": "24",
-          "kind": "withdrawal",
-          "status": "incomplete",
-          "amount_expected": {
-          },
-          "started_at": "2023-07-19T20:20:51.792908200Z",
-          "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-          "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-        }
-      },
-      {
-        "type": "transaction_status_changed",
-        "sep": "24",
-        "transaction": {
-          "sep": "24",
-          "kind": "withdrawal",
-          "status": "pending_user_transfer_start",
-          "amount_expected": {
-          },
-          "amount_in": {
-          },
-          "amount_out": {
-          },
-          "amount_fee": {
-          },
-          "message": "waiting on the user to transfer funds",
-          "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-          "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-          "memo_type": "hash"
-        }
-      },
-      {
-        "type": "transaction_status_changed",
-        "id": "f0b75f9e-1b53-442a-91dd-d6c002a51bfc",
-        "sep": "24",
-        "transaction": {
-          "id": "14882409-757c-4c66-9da1-3dddef11953a",
-          "sep": "24",
-          "kind": "withdrawal",
-          "status": "pending_anchor",
-          "amount_expected": {
-          },
-          "amount_in": {
-          },
-          "amount_out": {
-          },
-          "amount_fee": {
-          },
-          "message": "Received an incoming payment",
-          "stellar_transactions": [
-            {
-              "id": "9234bd186612f4d48cafed4c702509f680a581c3e02945f0206b4c8ac627b83a",
-              "memo": "MTQ4ODI0MDktNzU3Yy00YzY2LTlkYTEtM2RkZGVmMTE\u003d",
-              "memo_type": "hash",
-              "created_at": "2023-07-19T20:21:01Z",
-              "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAGzgAAAAEAAAAAAAAAAAAAAABkuEZbAAAAAzE0ODgyNDA5LTc1N2MtNGM2Ni05ZGExLTNkZGRlZjExAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAABfXhAAAAAAAAAAABgRA+VQAAAEDlmaoq46tJ7Lja9SP4BAuTl1GOrPuf7HAsK4JyNdhxkwz2p5U181Eq394rjIn/fr43lkgarA9m05Q04t4gHqkH",
-              "payments": [
-                {
-                  "id": "2504876466638849",
-                  "amount": {
-                  },
-                  "payment_type": "payment",
-                  "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-                  "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-                }
-              ]
-            }
-          ],
-          "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-          "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-          "memo_type": "hash"
-        }
-      },
-      {
-        "type": "transaction_status_changed",
-        "id": "b44d90ec-2d9a-4768-a952-085026f5b3da",
-        "sep": "24",
-        "transaction": {
-          "id": "14882409-757c-4c66-9da1-3dddef11953a",
-          "sep": "24",
-          "kind": "withdrawal",
-          "status": "pending_external",
-          "amount_expected": {
-          },
-          "amount_in": {
-          },
-          "amount_out": {
-          },
-          "amount_fee": {
-          },
-          "message": "pending external transfer",
-          "stellar_transactions": [
-            {
-              "id": "9234bd186612f4d48cafed4c702509f680a581c3e02945f0206b4c8ac627b83a",
-              "memo": "MTQ4ODI0MDktNzU3Yy00YzY2LTlkYTEtM2RkZGVmMTE\u003d",
-              "memo_type": "hash",
-              "created_at": "2023-07-19T20:21:01Z",
-              "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAGzgAAAAEAAAAAAAAAAAAAAABkuEZbAAAAAzE0ODgyNDA5LTc1N2MtNGM2Ni05ZGExLTNkZGRlZjExAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAABfXhAAAAAAAAAAABgRA+VQAAAEDlmaoq46tJ7Lja9SP4BAuTl1GOrPuf7HAsK4JyNdhxkwz2p5U181Eq394rjIn/fr43lkgarA9m05Q04t4gHqkH",
-              "payments": [
-                {
-                  "id": "2504876466638849",
-                  "amount": {
-                  },
-                  "payment_type": "payment",
-                  "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-                  "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-                }
-              ]
-            }
-          ],
-          "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-          "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-          "memo_type": "hash"
-        }
-      },
-      {
-        "type": "transaction_status_changed",
-        "id": "0556b75c-b054-49a0-b778-654050a6cba4",
-        "sep": "24",
-        "transaction": {
-          "id": "14882409-757c-4c66-9da1-3dddef11953a",
-          "sep": "24",
-          "kind": "withdrawal",
-          "status": "completed",
-          "amount_expected": {
-          },
-          "amount_in": {
-          },
-          "amount_out": {
-          },
-          "amount_fee": {
-          },
-          "message": "Completed",
-          "stellar_transactions": [
-            {
-              "id": "9234bd186612f4d48cafed4c702509f680a581c3e02945f0206b4c8ac627b83a",
-              "memo": "MTQ4ODI0MDktNzU3Yy00YzY2LTlkYTEtM2RkZGVmMTE\u003d",
-              "memo_type": "hash",
-              "created_at": "2023-07-19T20:21:01Z",
-              "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAGzgAAAAEAAAAAAAAAAAAAAABkuEZbAAAAAzE0ODgyNDA5LTc1N2MtNGM2Ni05ZGExLTNkZGRlZjExAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAABfXhAAAAAAAAAAABgRA+VQAAAEDlmaoq46tJ7Lja9SP4BAuTl1GOrPuf7HAsK4JyNdhxkwz2p5U181Eq394rjIn/fr43lkgarA9m05Q04t4gHqkH",
-              "payments": [
-                {
-                  "id": "2504876466638849",
-                  "amount": {
-                  },
-                  "payment_type": "payment",
-                  "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-                  "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-                }
-              ]
-            }
-          ],
-          "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-          "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-          "memo_type": "hash"
-        }
-      }
-    ]
-  """
-      .trimIndent()
-
-  private val expectedWithdrawalCallbacksJson =
-    """
 [
   {
+    "type": "transaction_created",
+    "id": "a32464b5-e4f2-4d85-955a-2f09696b3103",
+    "sep": "24",
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "419d2cd3-1ebd-42fc-80c5-94fe506d144b",
+      "sep": "24",
       "kind": "withdrawal",
       "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDUsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.7uwSjsxMy5DKNtiSrncEe1Sugnhs7m2ALm1_1jJZ_Ac",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+      "amount_expected": {
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "started_at": "2023-08-30T09:48:08.715329Z",
+      "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
     }
   },
   {
+    "type": "transaction_status_changed",
+    "id": "0f454aa9-e328-4967-befe-b686410f6e54",
+    "sep": "24",
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "419d2cd3-1ebd-42fc-80c5-94fe506d144b",
+      "sep": "24",
       "kind": "withdrawal",
       "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.kjMVXWto256FX4JaT8zxIhFOSN9J3RU5j5jfhqAXL_4",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
+      "amount_expected": {
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_in": {
+        "amount": "1.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_out": {
+        "amount": "1.0",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_fee": {
+        "amount": "0.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "started_at": "2023-08-30T09:48:08.715329Z",
+      "updated_at": "2023-08-30T09:48:09.788551Z",
       "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+      "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "2653020630",
+      "memo_type": "id"
     }
   },
   {
+    "type": "transaction_status_changed",
+    "id": "e8b7a043-7952-4803-8886-34c5fefa459a",
+    "sep": "24",
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "419d2cd3-1ebd-42fc-80c5-94fe506d144b",
+      "sep": "24",
       "kind": "withdrawal",
       "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNTgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.P1dUodT6b-WeOgiJbdNdGeM-wLExbPU1olPH6CMwLaE",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+      "amount_expected": {
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_in": {
+        "amount": "1.1000000",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_out": {
+        "amount": "1.0",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_fee": {
+        "amount": "0.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "started_at": "2023-08-30T09:48:08.715329Z",
+      "updated_at": "2023-08-30T09:48:20.560738Z",
+      "message": "Received an incoming payment",
+      "stellar_transactions": [
+        {
+          "id": "979b540a85c84854980ed8378f333b470071ef34731e998a43a1272e0377c6b9",
+          "memo": "2653020630",
+          "memo_type": "id",
+          "created_at": "2023-08-30T09:48:13Z",
+          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASdQAAAAEAAAAAAAAAAAAAAABk7xEQAAAAAgAAAACeIeHWAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAKfYwAAAAAAAAAABgRA+VQAAAECf6CEOtlF882R4A650Op2kf9MwYc7E9TrQdCyzU54Dr1dZHiA3h/Yf8/51En5MIngAs0ZkIiIwIy1zD3P0KxMO",
+          "payments": [
+            {
+              "id": "5439412871634945",
+              "amount": {
+                "amount": "1.1000000",
+                "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+              },
+              "payment_type": "payment",
+              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
+            }
+          ]
+        }
+      ],
+      "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "2653020630",
+      "memo_type": "id"
     }
   },
   {
+    "type": "transaction_status_changed",
+    "id": "91da8107-2916-44e5-a34b-5e533b31b8b6",
+    "sep": "24",
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "419d2cd3-1ebd-42fc-80c5-94fe506d144b",
+      "sep": "24",
       "kind": "withdrawal",
       "status": "pending_external",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjIsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.pkolr6408DXi-SiJNy28KfRPVt2rx30FcSKxGohLY6Y",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
+      "amount_expected": {
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_in": {
+        "amount": "1.1000000",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_out": {
+        "amount": "1.0",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_fee": {
+        "amount": "0.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "started_at": "2023-08-30T09:48:08.715329Z",
+      "updated_at": "2023-08-30T09:48:26.429049Z",
       "message": "pending external transfer",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+      "stellar_transactions": [
+        {
+          "id": "979b540a85c84854980ed8378f333b470071ef34731e998a43a1272e0377c6b9",
+          "memo": "2653020630",
+          "memo_type": "id",
+          "created_at": "2023-08-30T09:48:13Z",
+          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASdQAAAAEAAAAAAAAAAAAAAABk7xEQAAAAAgAAAACeIeHWAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAKfYwAAAAAAAAAABgRA+VQAAAECf6CEOtlF882R4A650Op2kf9MwYc7E9TrQdCyzU54Dr1dZHiA3h/Yf8/51En5MIngAs0ZkIiIwIy1zD3P0KxMO",
+          "payments": [
+            {
+              "id": "5439412871634945",
+              "amount": {
+                "amount": "1.1000000",
+                "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+              },
+              "payment_type": "payment",
+              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
+            }
+          ]
+        }
+      ],
+      "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "2653020630",
+      "memo_type": "id"
     }
   },
   {
+    "type": "transaction_status_changed",
+    "id": "ed653e12-e4ad-4cec-b71f-571855dfa1bb",
+    "sep": "24",
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "419d2cd3-1ebd-42fc-80c5-94fe506d144b",
+      "sep": "24",
       "kind": "withdrawal",
       "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjMsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.Ga2LcUgRPPJYyJrlEd0r5gDvLwP3YEMb3KsN-TD6Wg8",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "Completed",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+      "amount_expected": {
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_in": {
+        "amount": "1.1000000",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_out": {
+        "amount": "1.0",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_fee": {
+        "amount": "0.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "started_at": "2023-08-30T09:48:08.715329Z",
+      "updated_at": "2023-08-30T09:48:27.467368Z",
+      "message": "completed",
+      "stellar_transactions": [
+        {
+          "id": "979b540a85c84854980ed8378f333b470071ef34731e998a43a1272e0377c6b9",
+          "memo": "2653020630",
+          "memo_type": "id",
+          "created_at": "2023-08-30T09:48:13Z",
+          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASdQAAAAEAAAAAAAAAAAAAAABk7xEQAAAAAgAAAACeIeHWAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAKfYwAAAAAAAAAABgRA+VQAAAECf6CEOtlF882R4A650Op2kf9MwYc7E9TrQdCyzU54Dr1dZHiA3h/Yf8/51En5MIngAs0ZkIiIwIy1zD3P0KxMO",
+          "payments": [
+            {
+              "id": "5439412871634945",
+              "amount": {
+                "amount": "1.1000000",
+                "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+              },
+              "payment_type": "payment",
+              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
+            }
+          ]
+        }
+      ],
+      "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "2653020630",
+      "memo_type": "id"
     }
   }
-]    
+]
+  """
+      .trimIndent()
+
+  private val expectedWithdrawalCallbacksJson =
+    """
+[
+]
   """
       .trimIndent()
 
   private val expectedDepositCallbacksJson =
     """
 [
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDcsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.mW2DHAk8wZyvTY2SM8Wzt2hpkkefWdq7RIn-SGwfk6I",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.a1o-Qw1XRy3xr84LPPf4VTJWT_NJpz9Qw-Po5Qy9GW4",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDksInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.xSaWtb4Eci_eF1CT1qD3BsYgGdTwKfSDGqoANOMbWBo",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "message": "funds received, transaction is being processed",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMTYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.tlN5RkzLTLbcWdgPRkpLO1GAArc4xQ3LBizU1t4ZE9Y",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "stellar_transaction_id": "089c75468a7927a43e5e429b7f0a2e8e0960761b2ce98fd4907998017d343bc9",
-      "message": "Outgoing payment sent",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  }
 ]
   """
       .trimIndent()
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt
index 4ff41ff154..f15550afa2 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24CustodyRpcEnd2EndTests.kt
@@ -65,7 +65,7 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         socketTimeoutMillis = 300000
       }
     }
-  private val maxTries = 30
+  private val maxTries = 90
   private val anchorReferenceServerClient =
     AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
   private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
@@ -101,17 +101,17 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
       assertEquals(fetchedTxn.id, transactionByStellarId.id)
 
       // Check the events sent to the reference server are recorded correctly
-      val actualEvents = waitForBusinessServerEvents(response.id, 4)
+      val actualEvents = waitForBusinessServerEvents(response.id, 5)
       assertNotNull(actualEvents)
-      actualEvents?.let { assertEquals(4, it.size) }
+      actualEvents?.let { assertEquals(5, it.size) }
       val expectedEvents: List<AnchorEvent> =
         gson.fromJson(expectedDepositEventsJson, object : TypeToken<List<AnchorEvent>>() {}.type)
       compareAndAssertEvents(asset, expectedEvents, actualEvents!!)
 
       // Check the callbacks sent to the wallet reference server are recorded correctly
-      val actualCallbacks = waitForWalletServerCallbacks(response.id, 4)
+      val actualCallbacks = waitForWalletServerCallbacks(response.id, 5)
       actualCallbacks?.let {
-        assertEquals(4, it.size)
+        assertEquals(5, it.size)
         val expectedCallbacks: List<Sep24GetTransactionResponse> =
           gson.fromJson(
             expectedDepositCallbacksJson,
@@ -141,7 +141,6 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
     return deposit
   }
 
-  // TODO: Validate assets of expected and actual events
   private fun compareAndAssertEvents(
     asset: StellarAssetId,
     expectedEvents: List<AnchorEvent>,
@@ -156,25 +155,22 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         expectedEvent.transaction.completedAt = actualEvent.transaction.completedAt
         expectedEvent.transaction.stellarTransactions = actualEvent.transaction.stellarTransactions
         expectedEvent.transaction.memo = actualEvent.transaction.memo
+        expectedEvent.transaction.destinationAccount = actualEvent.transaction.destinationAccount
         actualEvent.transaction.amountIn?.let {
           expectedEvent.transaction.amountIn.amount = actualEvent.transaction.amountIn.amount
-          //          expectedEvent.transaction.amountIn.asset = asset.sep38
           expectedEvent.transaction.amountIn.asset = actualEvent.transaction.amountIn.asset
         }
         actualEvent.transaction.amountOut?.let {
           expectedEvent.transaction.amountOut.amount = actualEvent.transaction.amountOut.amount
-          //          expectedEvent.transaction.amountOut.asset = asset.sep38
           expectedEvent.transaction.amountOut.asset = actualEvent.transaction.amountOut.asset
         }
         actualEvent.transaction.amountFee?.let {
           expectedEvent.transaction.amountFee.amount = actualEvent.transaction.amountFee.amount
-          //          expectedEvent.transaction.amountFee.asset = asset.sep38
           expectedEvent.transaction.amountFee.asset = actualEvent.transaction.amountFee.asset
         }
         actualEvent.transaction.amountExpected?.let {
           expectedEvent.transaction.amountExpected.amount =
             actualEvent.transaction.amountExpected.amount
-          //          expectedEvent.transaction.amountExpected.asset = asset.sep38
           expectedEvent.transaction.amountExpected.asset =
             actualEvent.transaction.amountExpected.asset
         }
@@ -278,15 +274,17 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
     count: Int
   ): List<Sep24GetTransactionResponse>? {
     var retries = 5
+    var callbacks: List<Sep24GetTransactionResponse>? = null
     while (retries > 0) {
-      val callbacks = walletServerClient.getCallbackHistory(txnId)
+      callbacks =
+        walletServerClient.getCallbackHistory(txnId, Sep24GetTransactionResponse::class.java)
       if (callbacks.size == count) {
         return callbacks
       }
       delay(1.seconds)
       retries--
     }
-    return null
+    return callbacks
   }
 
   private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
@@ -383,26 +381,26 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
 [
   {
     "type": "transaction_created",
-    "id": "60a7a212-e072-4c26-b224-d0418c4535f3",
+    "id": "069bd5fb-1411-4a31-9a09-7f7fc44de1a9",
     "sep": "24",
     "transaction": {
-      "id": "2a26c89f-feb1-4791-aba0-577cb9b157a5",
+      "id": "11b91ac1-cd1c-44bb-9f73-37c8463556b3",
       "sep": "24",
       "kind": "deposit",
       "status": "incomplete",
       "amount_expected": {
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
       },
-      "started_at": "2023-08-17T13:12:51.563498Z",
+      "started_at": "2023-08-30T09:28:53.150236Z",
       "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "b26f417f-1273-4fab-af81-5e1192edbdb5",
+    "id": "de083721-2925-48d6-ac8c-5d3402f0ac58",
     "sep": "24",
     "transaction": {
-      "id": "2a26c89f-feb1-4791-aba0-577cb9b157a5",
+      "id": "11b91ac1-cd1c-44bb-9f73-37c8463556b3",
       "sep": "24",
       "kind": "deposit",
       "status": "pending_user_transfer_start",
@@ -422,18 +420,18 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "iso4217:USD"
       },
-      "started_at": "2023-08-17T13:12:51.563498Z",
-      "updated_at": "2023-08-17T13:12:53.912336Z",
+      "started_at": "2023-08-30T09:28:53.150236Z",
+      "updated_at": "2023-08-30T09:28:55.009299Z",
       "message": "waiting on the user to transfer funds",
       "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "64eed340-e2c0-4604-98a3-a0068b4f821c",
+    "id": "b3ce2b5a-fdac-469d-9805-48520e74890a",
     "sep": "24",
     "transaction": {
-      "id": "2a26c89f-feb1-4791-aba0-577cb9b157a5",
+      "id": "11b91ac1-cd1c-44bb-9f73-37c8463556b3",
       "sep": "24",
       "kind": "deposit",
       "status": "pending_anchor",
@@ -453,21 +451,21 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "iso4217:USD"
       },
-      "started_at": "2023-08-17T13:12:51.563498Z",
-      "updated_at": "2023-08-17T13:12:55.131947Z",
+      "started_at": "2023-08-30T09:28:53.150236Z",
+      "updated_at": "2023-08-30T09:28:56.197214Z",
       "message": "funds received, transaction is being processed",
       "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "11a6427e-c37a-41a6-952f-87478e961bdd",
+    "id": "f086a1d2-6edd-4d00-a294-f925b38dba78",
     "sep": "24",
     "transaction": {
-      "id": "2a26c89f-feb1-4791-aba0-577cb9b157a5",
+      "id": "11b91ac1-cd1c-44bb-9f73-37c8463556b3",
       "sep": "24",
       "kind": "deposit",
-      "status": "completed",
+      "status": "pending_stellar",
       "amount_expected": {
         "amount": "1.1",
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
@@ -484,24 +482,55 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "iso4217:USD"
       },
-      "started_at": "2023-08-17T13:12:51.563498Z",
-      "updated_at": "2023-08-17T13:13:02.384539Z",
-      "completed_at": "2023-08-17T13:13:02.384542Z",
+      "started_at": "2023-08-30T09:28:53.150236Z",
+      "updated_at": "2023-08-30T09:28:59.880923Z",
       "message": "funds received, transaction is being processed",
+      "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+    }
+  },
+  {
+    "type": "transaction_status_changed",
+    "id": "9cdfd7ca-7bb0-4737-95db-d4c860e1b6d0",
+    "sep": "24",
+    "transaction": {
+      "id": "11b91ac1-cd1c-44bb-9f73-37c8463556b3",
+      "sep": "24",
+      "kind": "deposit",
+      "status": "completed",
+      "amount_expected": {
+        "amount": "1.1",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_in": {
+        "amount": "1.1",
+        "asset": "iso4217:USD"
+      },
+      "amount_out": {
+        "amount": "1.0",
+        "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      },
+      "amount_fee": {
+        "amount": "0.1",
+        "asset": "iso4217:USD"
+      },
+      "started_at": "2023-08-30T09:28:53.150236Z",
+      "updated_at": "2023-08-30T09:29:21.380622Z",
+      "completed_at": "2023-08-30T09:29:21.380626Z",
+      "message": "Outgoing payment sent",
       "stellar_transactions": [
         {
-          "id": "f2c2c98de19dad3d5b436fe7c3de279ed7495b81555e9364343a81746065820c",
-          "created_at": "2023-08-17T13:13:00Z",
-          "envelope": "AAAAAgAAAAACJQsPAYY4MkKbJBd8Wl742m73Fb648rWVhCuwCcbDzAAAAGQAACDKAAAgGQAAAAEAAAAAAAAAAAAAAABk3h0UAAAAAAAAAAEAAAAAAAAAAQAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAAFVU0RDAAAAAODia2IsqMlWCuY6k734V/dcCafJwfI1Qq7+/0qEd68AAAAAAACn2MAAAAAAAAAAAQnGw8wAAABAtFQn7/sdQ2z8qzWWGRcpNmL1SZEUCrT4Qu/N2Y6YQu7Sdi0UvOdcuKuSu8Li/2rQvlynIv7mOwYOUfB7FNe5Bg==",
+          "id": "8c3bde0d88ca72d41cf0e51a3731ebbcb7cb600ea480869c6a9c26d33f27fc9c",
+          "created_at": "2023-08-30T09:29:08Z",
+          "envelope": "AAAAAgAAAABBsSNsYI9mqhg2INua8oEzk88ixjqc/Yiq0/4MNDIcAwAPQkAAAcGcAAAEzgAAAAEAAAAAT+J/KQAAAABk7zYKAAAAAAAAAAEAAAAAAAAAAQAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAAFVU0RDAAAAAEI+fQXy7K+/7BkrIVo/G+lq7bjY5wJUq+NBPgIH3layAAAAAACYloAAAAAAAAAAATQyHAMAAABAGCA5DBPJJDRO+yQLgZv7XLe6HBL1z/nvGJmSUNF/PI5yNASJs+EoLZ8iZwIxQBmPrepv3sVEL0ThsfAAJ6CMAw==",
           "payments": [
             {
-              "id": "4531774612836353",
+              "id": "5438480863727617",
               "amount": {
-                "amount": "1.1000000",
+                "amount": "1.0000000",
                 "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
               },
               "payment_type": "payment",
-              "source_account": "GABCKCYPAGDDQMSCTMSBO7C2L34NU3XXCW7LR4VVSWCCXMAJY3B4YCZP",
+              "source_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
               "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
             }
           ]
@@ -520,27 +549,27 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
 [
   {
     "type": "transaction_created",
-    "id": "6d477438-d3f4-475f-8829-67a6539f2874",
+    "id": "5849cdc4-69ba-4e24-a4b1-468650b698f3",
     "sep": "24",
     "transaction": {
-      "id": "9b282aa4-739e-4869-bd57-42e81e818c4e",
+      "id": "57d95405-714b-4db2-8990-6aabb6fdead4",
       "sep": "24",
       "kind": "withdrawal",
       "status": "incomplete",
       "amount_expected": {
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
       },
-      "started_at": "2023-08-17T13:26:43.082739Z",
+      "started_at": "2023-08-30T09:52:09.053994Z",
       "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
       "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "4c8a96e9-8b7c-4a81-afbf-1f326ca71f5c",
+    "id": "d635ab90-b028-4e75-9603-3cc46f61522f",
     "sep": "24",
     "transaction": {
-      "id": "9b282aa4-739e-4869-bd57-42e81e818c4e",
+      "id": "57d95405-714b-4db2-8990-6aabb6fdead4",
       "sep": "24",
       "kind": "withdrawal",
       "status": "pending_user_transfer_start",
@@ -560,21 +589,21 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
       },
-      "started_at": "2023-08-17T13:26:43.082739Z",
-      "updated_at": "2023-08-17T13:26:44.195093Z",
+      "started_at": "2023-08-30T09:52:09.053994Z",
+      "updated_at": "2023-08-30T09:52:10.721779Z",
       "message": "waiting on the user to transfer funds",
       "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-      "memo": "OWIyODJhYTQtNzM5ZS00ODY5LWJkNTctNDJlODFlODE=",
-      "memo_type": "hash"
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "1153741388",
+      "memo_type": "id"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "20a03e0a-40c7-4373-882e-441a15028235",
+    "id": "296f1655-606c-44c7-89b1-1a5c1b8b3fd4",
     "sep": "24",
     "transaction": {
-      "id": "9b282aa4-739e-4869-bd57-42e81e818c4e",
+      "id": "57d95405-714b-4db2-8990-6aabb6fdead4",
       "sep": "24",
       "kind": "withdrawal",
       "status": "pending_anchor",
@@ -594,42 +623,42 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
       },
-      "started_at": "2023-08-17T13:26:43.082739Z",
-      "updated_at": "2023-08-17T13:26:52.617769Z",
+      "started_at": "2023-08-30T09:52:09.053994Z",
+      "updated_at": "2023-08-30T09:52:27.415929Z",
       "message": "Received an incoming payment",
       "stellar_transactions": [
         {
-          "id": "2a24a78fb7291bdb40604b400e468323049936dff760c29ccea2ed9405bb29ab",
-          "memo": "OWIyODJhYTQtNzM5ZS00ODY5LWJkNTctNDJlODFlODE=",
-          "memo_type": "hash",
-          "created_at": "2023-08-17T13:26:50Z",
-          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAQHgAAAAEAAAAAAAAAAAAAAABk3iDLAAAAAzliMjgyYWE0LTczOWUtNDg2OS1iZDU3LTQyZTgxZTgxAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAAAKfYwAAAAAAAAAABgRA+VQAAAEAYZttwln2aJ/jsodZlAnorwJXndd8f0BtsIdrvVdcNt8BM7lf45gnmebKh8GjETEbOd2bkQvPDp8KJexGp0G8M",
+          "id": "e37723397971490a1e18eba37b01cee3e41c7ae542ca5c978fecc3e7f943f571",
+          "memo": "1153741388",
+          "memo_type": "id",
+          "created_at": "2023-08-30T09:52:15Z",
+          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASdgAAAAEAAAAAAAAAAAAAAABk7xIBAAAAAgAAAABExLJMAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAKfYwAAAAAAAAAABgRA+VQAAAEAc7YJuwnoJ9FHjg+9XiDLu2BHezEmQfjVscoty3JJmpLFbuF0nQMU5W7l7Q2J0wIyE0qgMsVHQBsan43XhwOcJ",
           "payments": [
             {
-              "id": "4532461807603713",
+              "id": "5439610440126465",
               "amount": {
                 "amount": "1.1000000",
                 "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
               },
               "payment_type": "payment",
               "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+              "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
             }
           ]
         }
       ],
       "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-      "memo": "OWIyODJhYTQtNzM5ZS00ODY5LWJkNTctNDJlODFlODE=",
-      "memo_type": "hash"
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "1153741388",
+      "memo_type": "id"
     }
   },
   {
     "type": "transaction_status_changed",
-    "id": "4e9a1449-6124-4feb-aac1-18a3bb5b49ba",
+    "id": "71fdfe0a-c0ab-4a56-be6c-86beb21bfde6",
     "sep": "24",
     "transaction": {
-      "id": "9b282aa4-739e-4869-bd57-42e81e818c4e",
+      "id": "57d95405-714b-4db2-8990-6aabb6fdead4",
       "sep": "24",
       "kind": "withdrawal",
       "status": "completed",
@@ -649,35 +678,35 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
         "amount": "0.1",
         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
       },
-      "started_at": "2023-08-17T13:26:43.082739Z",
-      "updated_at": "2023-08-17T13:26:55.426864Z",
-      "completed_at": "2023-08-17T13:26:55.426865Z",
+      "started_at": "2023-08-30T09:52:09.053994Z",
+      "updated_at": "2023-08-30T09:52:31.892921Z",
+      "completed_at": "2023-08-30T09:52:31.892923Z",
       "message": "pending external transfer",
       "stellar_transactions": [
         {
-          "id": "2a24a78fb7291bdb40604b400e468323049936dff760c29ccea2ed9405bb29ab",
-          "memo": "OWIyODJhYTQtNzM5ZS00ODY5LWJkNTctNDJlODFlODE=",
-          "memo_type": "hash",
-          "created_at": "2023-08-17T13:26:50Z",
-          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAQHgAAAAEAAAAAAAAAAAAAAABk3iDLAAAAAzliMjgyYWE0LTczOWUtNDg2OS1iZDU3LTQyZTgxZTgxAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAAAKfYwAAAAAAAAAABgRA+VQAAAEAYZttwln2aJ/jsodZlAnorwJXndd8f0BtsIdrvVdcNt8BM7lf45gnmebKh8GjETEbOd2bkQvPDp8KJexGp0G8M",
+          "id": "e37723397971490a1e18eba37b01cee3e41c7ae542ca5c978fecc3e7f943f571",
+          "memo": "1153741388",
+          "memo_type": "id",
+          "created_at": "2023-08-30T09:52:15Z",
+          "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASdgAAAAEAAAAAAAAAAAAAAABk7xIBAAAAAgAAAABExLJMAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAKfYwAAAAAAAAAABgRA+VQAAAEAc7YJuwnoJ9FHjg+9XiDLu2BHezEmQfjVscoty3JJmpLFbuF0nQMU5W7l7Q2J0wIyE0qgMsVHQBsan43XhwOcJ",
           "payments": [
             {
-              "id": "4532461807603713",
+              "id": "5439610440126465",
               "amount": {
                 "amount": "1.1000000",
                 "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
               },
               "payment_type": "payment",
               "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+              "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
             }
           ]
         }
       ],
       "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
-      "memo": "OWIyODJhYTQtNzM5ZS00ODY5LWJkNTctNDJlODFlODE=",
-      "memo_type": "hash"
+      "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6",
+      "memo": "1153741388",
+      "memo_type": "id"
     }
   }
 ]
@@ -687,97 +716,6 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
   private val expectedWithdrawalCallbacksJson =
     """
 [
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDUsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.7uwSjsxMy5DKNtiSrncEe1Sugnhs7m2ALm1_1jJZ_Ac",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  },
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.kjMVXWto256FX4JaT8zxIhFOSN9J3RU5j5jfhqAXL_4",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  },
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNTgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.P1dUodT6b-WeOgiJbdNdGeM-wLExbPU1olPH6CMwLaE",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  },
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "pending_external",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjIsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.pkolr6408DXi-SiJNy28KfRPVt2rx30FcSKxGohLY6Y",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "pending external transfer",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  },
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjMsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.Ga2LcUgRPPJYyJrlEd0r5gDvLwP3YEMb3KsN-TD6Wg8",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "Completed",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  }
 ]    
   """
       .trimIndent()
@@ -785,72 +723,6 @@ class Sep24CustodyRpcEnd2EndTests(config: TestConfig, val jwt: String) {
   private val expectedDepositCallbacksJson =
     """
 [
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDcsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.mW2DHAk8wZyvTY2SM8Wzt2hpkkefWdq7RIn-SGwfk6I",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.a1o-Qw1XRy3xr84LPPf4VTJWT_NJpz9Qw-Po5Qy9GW4",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDksInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.xSaWtb4Eci_eF1CT1qD3BsYgGdTwKfSDGqoANOMbWBo",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "message": "funds received, transaction is being processed",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  },
-  {
-    "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
-      "kind": "deposit",
-      "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMTYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.tlN5RkzLTLbcWdgPRkpLO1GAArc4xQ3LBizU1t4ZE9Y",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "stellar_transaction_id": "089c75468a7927a43e5e429b7f0a2e8e0960761b2ce98fd4907998017d343bc9",
-      "message": "Outgoing payment sent",
-      "refunded": false,
-      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
-    }
-  }
 ]
   """
       .trimIndent()
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24End2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24End2EndTests.kt
index a1b2579911..2994ff79d5 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24End2EndTests.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24End2EndTests.kt
@@ -109,9 +109,9 @@ class Sep24End2EndTests(config: TestConfig, val jwt: String) {
       compareAndAssertEvents(asset, expectedEvents, actualEvents!!)
 
       // Check the callbacks sent to the wallet reference server are recorded correctly
-      val actualCallbacks = waitForWalletServerCallbacks(response.id, 4)
+      val actualCallbacks = waitForWalletServerCallbacks(response.id, 5)
       actualCallbacks?.let {
-        assertEquals(4, it.size)
+        assertEquals(5, it.size)
         val expectedCallbacks: List<Sep24GetTransactionResponse> =
           gson.fromJson(
             expectedDepositCallbacksJson,
@@ -271,15 +271,19 @@ class Sep24End2EndTests(config: TestConfig, val jwt: String) {
     count: Int
   ): List<Sep24GetTransactionResponse>? {
     var retries = 5
+    var callbacks: List<Sep24GetTransactionResponse>? = null
     while (retries > 0) {
-      val callbacks = walletServerClient.getCallbackHistory(txnId)
+      callbacks =
+        walletServerClient
+          .getCallbackHistory(txnId, Sep24GetTransactionResponse::class.java)
+          .distinctBy { it.transaction.status }
       if (callbacks.size == count) {
         return callbacks
       }
       delay(1.seconds)
       retries--
     }
-    return null
+    return callbacks
   }
 
   private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
@@ -695,7 +699,7 @@ class Sep24End2EndTests(config: TestConfig, val jwt: String) {
       "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
       "started_at": "2023-08-03T09:20:44.557598Z",
       "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "waiting on the user to transfer funds",
+      "message": "Received an incoming payment",
       "refunded": false,
       "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
       "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
@@ -795,6 +799,24 @@ class Sep24End2EndTests(config: TestConfig, val jwt: String) {
       "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
   },
+  {
+    "transaction": {
+      "id": "40781ad0-71e2-4c9d-8179-556e210bf037",
+      "kind": "deposit",
+      "status": "pending_stellar",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=40781ad0-71e2-4c9d-8179-556e210bf037&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI0MDc4MWFkMC03MWUyLTRjOWQtODE3OS01NTZlMjEwYmYwMzciLCJleHAiOjE2OTQwMTg5NjgsImRhdGEiOnt9fQ.69romZWZruIWKWqlm_QYcoL8B6QgAH5iWhmcZC0A17c",
+      "amount_in": "1.1",
+      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "amount_out": "1.0",
+      "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "amount_fee": "0.1",
+      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "started_at": "2023-09-06T16:39:23.645200Z",
+      "message": "funds received, transaction is being processed",
+      "refunded": false,
+      "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+    }
+  },
   {
     "transaction": {
       "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24RpcEnd2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24RpcEnd2EndTests.kt
index 3d53d6fd00..da8b2a57d6 100644
--- a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24RpcEnd2EndTests.kt
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24RpcEnd2EndTests.kt
@@ -141,7 +141,6 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
     return deposit
   }
 
-  // TODO: Validate assets of expected and actual events
   private fun compareAndAssertEvents(
     asset: StellarAssetId,
     expectedEvents: List<AnchorEvent>,
@@ -158,23 +157,19 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
         expectedEvent.transaction.memo = actualEvent.transaction.memo
         actualEvent.transaction.amountIn?.let {
           expectedEvent.transaction.amountIn.amount = actualEvent.transaction.amountIn.amount
-          //          expectedEvent.transaction.amountIn.asset = asset.sep38
           expectedEvent.transaction.amountIn.asset = actualEvent.transaction.amountIn.asset
         }
         actualEvent.transaction.amountOut?.let {
           expectedEvent.transaction.amountOut.amount = actualEvent.transaction.amountOut.amount
-          //          expectedEvent.transaction.amountOut.asset = asset.sep38
           expectedEvent.transaction.amountOut.asset = actualEvent.transaction.amountOut.asset
         }
         actualEvent.transaction.amountFee?.let {
           expectedEvent.transaction.amountFee.amount = actualEvent.transaction.amountFee.amount
-          //          expectedEvent.transaction.amountFee.asset = asset.sep38
           expectedEvent.transaction.amountFee.asset = actualEvent.transaction.amountFee.asset
         }
         actualEvent.transaction.amountExpected?.let {
           expectedEvent.transaction.amountExpected.amount =
             actualEvent.transaction.amountExpected.amount
-          //          expectedEvent.transaction.amountExpected.asset = asset.sep38
           expectedEvent.transaction.amountExpected.asset =
             actualEvent.transaction.amountExpected.asset
         }
@@ -196,12 +191,13 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
           startedAt = actualCallback.transaction.startedAt
           to = actualCallback.transaction.to
           amountIn = actualCallback.transaction.amountIn
-          amountInAsset?.let { amountInAsset = asset.sep38 }
+          amountInAsset?.let { amountInAsset = actualCallback.transaction.amountInAsset }
           amountOut = actualCallback.transaction.amountOut
-          amountOutAsset?.let { amountOutAsset = asset.sep38 }
+          amountOutAsset?.let { amountOutAsset = actualCallback.transaction.amountOutAsset }
           amountFee = actualCallback.transaction.amountFee
-          amountFeeAsset?.let { amountFeeAsset = asset.sep38 }
+          amountFeeAsset?.let { amountFeeAsset = actualCallback.transaction.amountFeeAsset }
           stellarTransactionId = actualCallback.transaction.stellarTransactionId
+          completedAt?.let { completedAt = actualCallback.transaction.completedAt }
         }
       }
     }
@@ -278,15 +274,19 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
     count: Int
   ): List<Sep24GetTransactionResponse>? {
     var retries = 5
+    var callbacks: List<Sep24GetTransactionResponse>? = null
     while (retries > 0) {
-      val callbacks = walletServerClient.getCallbackHistory(txnId)
+      callbacks =
+        walletServerClient
+          .getCallbackHistory(txnId, Sep24GetTransactionResponse::class.java)
+          .distinctBy { it.transaction.status }
       if (callbacks.size == count) {
         return callbacks
       }
       delay(1.seconds)
       retries--
     }
-    return null
+    return callbacks
   }
 
   private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
@@ -689,11 +689,11 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
 [
   {
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "8a1220a5-84ff-40cb-9094-5c72b316982a",
       "kind": "withdrawal",
       "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDUsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.7uwSjsxMy5DKNtiSrncEe1Sugnhs7m2ALm1_1jJZ_Ac",
-      "started_at": "2023-08-03T09:20:44.557598Z",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=8a1220a5-84ff-40cb-9094-5c72b316982a&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI4YTEyMjBhNS04NGZmLTQwY2ItOTA5NC01YzcyYjMxNjk4MmEiLCJleHAiOjE2OTQwMTg4NzAsImRhdGEiOnt9fQ.QLFpAvDm76T01Y6IIVJPZ-kTFQyJdPWFpHoxceL2_cI",
+      "started_at": "2023-09-06T16:37:49.415801600Z",
       "refunded": false,
       "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
       "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
@@ -701,17 +701,17 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
   },
   {
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "8a1220a5-84ff-40cb-9094-5c72b316982a",
       "kind": "withdrawal",
       "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNDYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.kjMVXWto256FX4JaT8zxIhFOSN9J3RU5j5jfhqAXL_4",
-      "amount_in": "5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=8a1220a5-84ff-40cb-9094-5c72b316982a&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI4YTEyMjBhNS04NGZmLTQwY2ItOTA5NC01YzcyYjMxNjk4MmEiLCJleHAiOjE2OTQwMTg4NzEsImRhdGEiOnt9fQ.-kCKPaKVPqBiKdORM1EN5xLlOxMxe4azNnWUX9QkRT0",
+      "amount_in": "1.1",
       "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
+      "amount_out": "1.0",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "0.1",
       "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:44.557598Z",
+      "started_at": "2023-09-06T16:37:49.415802Z",
       "message": "waiting on the user to transfer funds",
       "refunded": false,
       "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
@@ -720,39 +720,18 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
   },
   {
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "8a1220a5-84ff-40cb-9094-5c72b316982a",
       "kind": "withdrawal",
       "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNTgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.P1dUodT6b-WeOgiJbdNdGeM-wLExbPU1olPH6CMwLaE",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "waiting on the user to transfer funds",
-      "refunded": false,
-      "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
-    }
-  },
-  {
-    "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
-      "kind": "withdrawal",
-      "status": "pending_external",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjIsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.pkolr6408DXi-SiJNy28KfRPVt2rx30FcSKxGohLY6Y",
-      "amount_in": "5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=8a1220a5-84ff-40cb-9094-5c72b316982a&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI4YTEyMjBhNS04NGZmLTQwY2ItOTA5NC01YzcyYjMxNjk4MmEiLCJleHAiOjE2OTQwMTg4NzgsImRhdGEiOnt9fQ.Jg5cBhlCh7sO2mYsLOw0ZtQEDwG7aX4_uK0U8OBXoFU",
+      "amount_in": "1.1000000",
       "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
+      "amount_out": "1.0",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "0.1",
       "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "pending external transfer",
+      "started_at": "2023-09-06T16:37:49.415802Z",
+      "message": "Received an incoming payment",
       "refunded": false,
       "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
       "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
@@ -760,19 +739,19 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
   },
   {
     "transaction": {
-      "id": "c849c9b4-b9cd-4659-b574-fdc1d8fb7e3b",
+      "id": "8a1220a5-84ff-40cb-9094-5c72b316982a",
       "kind": "withdrawal",
       "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003dc849c9b4-b9cd-4659-b574-fdc1d8fb7e3b\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjODQ5YzliNC1iOWNkLTQ2NTktYjU3NC1mZGMxZDhmYjdlM2IiLCJleHAiOjE2OTEwNTUwNjMsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.Ga2LcUgRPPJYyJrlEd0r5gDvLwP3YEMb3KsN-TD6Wg8",
-      "amount_in": "5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=8a1220a5-84ff-40cb-9094-5c72b316982a&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI4YTEyMjBhNS04NGZmLTQwY2ItOTA5NC01YzcyYjMxNjk4MmEiLCJleHAiOjE2OTQwMTg4ODIsImRhdGEiOnt9fQ.C3baOaxBj_FtX_PyIsVakYpten9hJK5lyi-dUQRnt_A",
+      "amount_in": "1.1000000",
       "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
-      "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
+      "amount_out": "1.0",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "0.1",
       "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:44.557598Z",
-      "stellar_transaction_id": "a2d31bbed336393dda0e00c09e37cd141cf5d17b7bb780c19a204bd3976e3aa7",
-      "message": "completed",
+      "started_at": "2023-09-06T16:37:49.415802Z",
+      "completed_at": "2023-09-06T16:38:01.724059Z",
+      "message": "pending external transfer",
       "refunded": false,
       "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
       "to": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
@@ -787,28 +766,28 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
 [
   {
     "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
+      "id": "59e3aacd-4780-40b3-9bb0-ffae9fc75ff6",
       "kind": "deposit",
       "status": "incomplete",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDcsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.mW2DHAk8wZyvTY2SM8Wzt2hpkkefWdq7RIn-SGwfk6I",
-      "started_at": "2023-08-03T09:20:06.732254Z",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=59e3aacd-4780-40b3-9bb0-ffae9fc75ff6&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI1OWUzYWFjZC00NzgwLTQwYjMtOWJiMC1mZmFlOWZjNzVmZjYiLCJleHAiOjE2OTQwMTY2MTAsImRhdGEiOnt9fQ.eSoBIxs1AaVJbEngfefytWScTfW_xvCQAr3y7LJ0j1M",
+      "started_at": "2023-09-06T16:00:08.722259500Z",
       "refunded": false,
       "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
   },
   {
     "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
+      "id": "59e3aacd-4780-40b3-9bb0-ffae9fc75ff6",
       "kind": "deposit",
       "status": "pending_user_transfer_start",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDgsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.a1o-Qw1XRy3xr84LPPf4VTJWT_NJpz9Qw-Po5Qy9GW4",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=59e3aacd-4780-40b3-9bb0-ffae9fc75ff6&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI1OWUzYWFjZC00NzgwLTQwYjMtOWJiMC1mZmFlOWZjNzVmZjYiLCJleHAiOjE2OTQwMTY2MTEsImRhdGEiOnt9fQ.IKn-DFxPhv-7UtDMwZSQH3bVOhEnBeEuPmJ38XPFvJE",
+      "amount_in": "1.1",
+      "amount_in_asset": "iso4217:USD",
+      "amount_out": "1.0",
       "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:06.732254Z",
+      "amount_fee": "0.1",
+      "amount_fee_asset": "iso4217:USD",
+      "started_at": "2023-09-06T16:00:08.722260Z",
       "message": "waiting on the user to transfer funds",
       "refunded": false,
       "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
@@ -816,17 +795,17 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
   },
   {
     "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
+      "id": "59e3aacd-4780-40b3-9bb0-ffae9fc75ff6",
       "kind": "deposit",
       "status": "pending_anchor",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMDksInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.xSaWtb4Eci_eF1CT1qD3BsYgGdTwKfSDGqoANOMbWBo",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=59e3aacd-4780-40b3-9bb0-ffae9fc75ff6&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI1OWUzYWFjZC00NzgwLTQwYjMtOWJiMC1mZmFlOWZjNzVmZjYiLCJleHAiOjE2OTQwMTY2MTIsImRhdGEiOnt9fQ.nSpvvePqVJpMEep-Y7JgITi3iSmCrUberGoXwotj2Q0",
+      "amount_in": "1.1",
+      "amount_in_asset": "iso4217:USD",
+      "amount_out": "1.0",
       "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:06.732254Z",
+      "amount_fee": "0.1",
+      "amount_fee_asset": "iso4217:USD",
+      "started_at": "2023-09-06T16:00:08.722260Z",
       "message": "funds received, transaction is being processed",
       "refunded": false,
       "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
@@ -834,19 +813,19 @@ class Sep24RpcEnd2EndTests(config: TestConfig, val jwt: String) {
   },
   {
     "transaction": {
-      "id": "96166ee5-2bf1-4a44-a509-d074e505f4b3",
+      "id": "59e3aacd-4780-40b3-9bb0-ffae9fc75ff6",
       "kind": "deposit",
       "status": "completed",
-      "more_info_url": "http://localhost:8080/sep24/transaction/more_info?transaction_id\u003d96166ee5-2bf1-4a44-a509-d074e505f4b3\u0026token\u003deyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5NjE2NmVlNS0yYmYxLTRhNDQtYTUwOS1kMDc0ZTUwNWY0YjMiLCJleHAiOjE2OTEwNTUwMTYsInN1YiI6IkdESkxCWVlLTUNYTlZWTkFCT0U2Nk5ZWFFHSUE1QUM1RDIyM1oyS0Y2WkVZSzRVQkNBN0ZLTFRHIiwiZGF0YSI6e319.tlN5RkzLTLbcWdgPRkpLO1GAArc4xQ3LBizU1t4ZE9Y",
-      "amount_in": "5",
-      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_out": "4.5",
+      "more_info_url": "http://localhost:8091/sep24/transaction/more_info?transaction_id=59e3aacd-4780-40b3-9bb0-ffae9fc75ff6&token=eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI1OWUzYWFjZC00NzgwLTQwYjMtOWJiMC1mZmFlOWZjNzVmZjYiLCJleHAiOjE2OTQwMTY2MjMsImRhdGEiOnt9fQ.S0yE2pkqC7p-FpDvNXULRLTWb9YBY4NJz9cMAvsgnYs",
+      "amount_in": "1.1",
+      "amount_in_asset": "iso4217:USD",
+      "amount_out": "1.0",
       "amount_out_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "amount_fee": "0.5",
-      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
-      "started_at": "2023-08-03T09:20:06.732254Z",
-      "stellar_transaction_id": "089c75468a7927a43e5e429b7f0a2e8e0960761b2ce98fd4907998017d343bc9",
-      "message": "completed",
+      "amount_fee": "0.1",
+      "amount_fee_asset": "iso4217:USD",
+      "started_at": "2023-09-06T16:00:08.722260Z",
+      "completed_at": "2023-09-06T16:00:22.840654200Z",
+      "message": "funds received, transaction is being processed",
       "refunded": false,
       "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
     }
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31CustodyRpcEnd2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31CustodyRpcEnd2EndTests.kt
new file mode 100644
index 0000000000..888f8df1d3
--- /dev/null
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31CustodyRpcEnd2EndTests.kt
@@ -0,0 +1,463 @@
+package org.stellar.anchor.platform.test
+
+import com.google.gson.reflect.TypeToken
+import io.ktor.client.plugins.*
+import io.ktor.http.*
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.fail
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.skyscreamer.jsonassert.JSONAssert
+import org.stellar.anchor.api.event.AnchorEvent
+import org.stellar.anchor.api.sep.SepTransactionStatus
+import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerRequest
+import org.stellar.anchor.api.sep.sep31.Sep31GetTransactionResponse
+import org.stellar.anchor.api.sep.sep31.Sep31PostTransactionRequest
+import org.stellar.anchor.apiclient.PlatformApiClient
+import org.stellar.anchor.auth.AuthHelper
+import org.stellar.anchor.platform.*
+import org.stellar.anchor.util.GsonUtils
+import org.stellar.anchor.util.Log.info
+import org.stellar.anchor.util.MemoHelper
+import org.stellar.anchor.util.Sep1Helper
+import org.stellar.anchor.util.StringHelper.json
+import org.stellar.reference.client.AnchorReferenceServerClient
+import org.stellar.reference.wallet.WalletServerClient
+import org.stellar.walletsdk.ApplicationConfiguration
+import org.stellar.walletsdk.StellarConfiguration
+import org.stellar.walletsdk.Wallet
+import org.stellar.walletsdk.anchor.MemoType
+import org.stellar.walletsdk.asset.IssuedAssetId
+import org.stellar.walletsdk.asset.StellarAssetId
+import org.stellar.walletsdk.horizon.SigningKeyPair
+import org.stellar.walletsdk.horizon.sign
+
+class Sep31CustodyRpcEnd2EndTests(
+  config: TestConfig,
+  val toml: Sep1Helper.TomlContent,
+  val jwt: String
+) {
+  private val gson = GsonUtils.getInstance()
+  private val walletSecretKey = System.getenv("WALLET_SECRET_KEY") ?: CLIENT_WALLET_SECRET
+  private val keypair = SigningKeyPair.fromSecret(walletSecretKey)
+  private val wallet =
+    Wallet(
+      StellarConfiguration.Testnet,
+      ApplicationConfiguration { defaultRequest { url { protocol = URLProtocol.HTTP } } }
+    )
+  private val maxTries = 90
+  private val anchorReferenceServerClient =
+    AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
+  private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
+  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), jwt)
+  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), jwt)
+  private val sep38Client = Sep38Client(toml.getString("ANCHOR_QUOTE_SERVER"), jwt)
+  private val platformApiClient =
+    PlatformApiClient(AuthHelper.forNone(), config.env["platform.server.url"]!!)
+
+  private fun compareAndAssertEvents(
+    asset: StellarAssetId,
+    expectedEvents: List<AnchorEvent>,
+    actualEvents: List<AnchorEvent>
+  ) {
+    expectedEvents.forEachIndexed { index, expectedEvent ->
+      actualEvents[index].let { actualEvent ->
+        expectedEvent.id = actualEvent.id
+        expectedEvent.transaction.id = actualEvent.transaction.id
+        expectedEvent.transaction.startedAt = actualEvent.transaction.startedAt
+        expectedEvent.transaction.updatedAt = actualEvent.transaction.updatedAt
+        expectedEvent.transaction.transferReceivedAt = actualEvent.transaction.transferReceivedAt
+        expectedEvent.transaction.completedAt = actualEvent.transaction.completedAt
+        expectedEvent.transaction.stellarTransactions = actualEvent.transaction.stellarTransactions
+        expectedEvent.transaction.memo = actualEvent.transaction.memo
+        expectedEvent.transaction.destinationAccount = actualEvent.transaction.destinationAccount
+        expectedEvent.transaction.customers = actualEvent.transaction.customers
+        expectedEvent.transaction.quoteId = actualEvent.transaction.quoteId
+        actualEvent.transaction.amountIn?.let {
+          expectedEvent.transaction.amountIn.amount = actualEvent.transaction.amountIn.amount
+          expectedEvent.transaction.amountIn.asset = asset.sep38
+        }
+        actualEvent.transaction.amountOut?.let {
+          expectedEvent.transaction.amountOut.amount = actualEvent.transaction.amountOut.amount
+          expectedEvent.transaction.amountOut.asset = FIAT_USD
+        }
+        actualEvent.transaction.amountFee?.let {
+          expectedEvent.transaction.amountFee.amount = actualEvent.transaction.amountFee.amount
+          expectedEvent.transaction.amountFee.asset = asset.sep38
+        }
+        actualEvent.transaction.amountExpected?.let {
+          expectedEvent.transaction.amountExpected.amount =
+            actualEvent.transaction.amountExpected.amount
+          expectedEvent.transaction.amountExpected.asset = asset.sep38
+        }
+      }
+    }
+    JSONAssert.assertEquals(json(expectedEvents), gson.toJson(actualEvents), true)
+  }
+
+  private fun compareAndAssertCallbacks(
+    asset: StellarAssetId,
+    expectedCallbacks: List<Sep31GetTransactionResponse>,
+    actualCallbacks: List<Sep31GetTransactionResponse>
+  ) {
+    expectedCallbacks.forEachIndexed { index, expectedCallback ->
+      actualCallbacks[index].let { actualCallback ->
+        with(expectedCallback.transaction) {
+          id = actualCallback.transaction.id
+          startedAt = actualCallback.transaction.startedAt
+          amountIn = actualCallback.transaction.amountIn
+          amountInAsset?.let { amountInAsset = asset.sep38 }
+          amountOut = actualCallback.transaction.amountOut
+          amountOutAsset?.let { amountOutAsset = asset.sep38 }
+          amountFee = actualCallback.transaction.amountFee
+          amountFeeAsset?.let { amountFeeAsset = asset.sep38 }
+          stellarTransactionId = actualCallback.transaction.stellarTransactionId
+        }
+      }
+    }
+    JSONAssert.assertEquals(json(expectedCallbacks), json(actualCallbacks), true)
+  }
+
+  private fun `test typical receive end-to-end flow`(asset: StellarAssetId, amount: String) =
+    runBlocking {
+      walletServerClient.clearCallbacks()
+      val senderCustomerRequest =
+        gson.fromJson(testCustomer1Json, Sep12PutCustomerRequest::class.java)
+      val senderCustomer = sep12Client.putCustomer(senderCustomerRequest)
+
+      // Create receiver customer
+      val receiverCustomerRequest =
+        gson.fromJson(testCustomer2Json, Sep12PutCustomerRequest::class.java)
+      val receiverCustomer = sep12Client.putCustomer(receiverCustomerRequest)
+
+      val quote = sep38Client.postQuote(asset.sep38, amount, FIAT_USD)
+
+      // POST Sep31 transaction
+      val txnRequest = gson.fromJson(postSep31TxnRequest, Sep31PostTransactionRequest::class.java)
+      txnRequest.senderId = senderCustomer!!.id
+      txnRequest.receiverId = receiverCustomer!!.id
+      txnRequest.quoteId = quote.id
+      val postTxResponse = sep31Client.postTransaction(txnRequest)
+
+      anchorReferenceServerClient.processSep31Receive(postTxResponse.id)
+
+      // Get transaction status and make sure it is PENDING_SENDER
+      val transaction = platformApiClient.getTransaction(postTxResponse.id)
+      assertEquals(SepTransactionStatus.PENDING_SENDER, transaction.status)
+
+      val memoType: MemoType =
+        when (postTxResponse.stellarMemoType) {
+          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_ID) -> {
+            MemoType.ID
+          }
+          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_HASH) -> {
+            MemoType.HASH
+          }
+          else -> {
+            MemoType.TEXT
+          }
+        }
+
+      // Submit transfer transaction
+      val transfer =
+        wallet
+          .stellar()
+          .transaction(keypair)
+          .transfer(postTxResponse.stellarAccountId, asset, amount)
+          .addMemo(Pair(memoType, postTxResponse.stellarMemo))
+          .build()
+      transfer.sign(keypair)
+      wallet.stellar().submitTransaction(transfer)
+
+      // Wait for the status to change to COMPLETED
+      waitStatus(postTxResponse.id, SepTransactionStatus.COMPLETED)
+
+      // Check the events sent to the reference server are recorded correctly
+      val actualEvents = waitForBusinessServerEvents(postTxResponse.id, 3)
+      assertNotNull(actualEvents)
+      actualEvents?.let { assertEquals(3, it.size) }
+      val expectedEvents: List<AnchorEvent> =
+        gson.fromJson(expectedReceiveEventJson, object : TypeToken<List<AnchorEvent>>() {}.type)
+      compareAndAssertEvents(asset, expectedEvents, actualEvents!!)
+
+      // Check the callbacks sent to the wallet reference server are recorded correctly
+      val actualCallbacks = waitForWalletServerCallbacks(postTxResponse.id, 3)
+      actualCallbacks?.let {
+        assertEquals(3, it.size)
+        val expectedCallbacks: List<Sep31GetTransactionResponse> =
+          gson.fromJson(
+            expectedReceiveCallbacksJson,
+            object : TypeToken<List<Sep31GetTransactionResponse>>() {}.type
+          )
+        compareAndAssertCallbacks(asset, expectedCallbacks, actualCallbacks)
+      }
+    }
+
+  private suspend fun waitForWalletServerCallbacks(
+    txnId: String,
+    count: Int
+  ): List<Sep31GetTransactionResponse>? {
+    var retries = 5
+    var callbacks: List<Sep31GetTransactionResponse>? = null
+    while (retries > 0) {
+      callbacks =
+        walletServerClient.getCallbackHistory(txnId, Sep31GetTransactionResponse::class.java)
+      if (callbacks.size == count) {
+        return callbacks
+      }
+      delay(1.seconds)
+      retries--
+    }
+    return callbacks
+  }
+
+  private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
+    var retries = 5
+    while (retries > 0) {
+      val events = anchorReferenceServerClient.getEvents(txnId)
+      if (events.size == count) {
+        return events
+      }
+      delay(1.seconds)
+      retries--
+    }
+    return null
+  }
+
+  private suspend fun waitStatus(id: String, expectedStatus: SepTransactionStatus) {
+    var status: SepTransactionStatus? = null
+
+    for (i in 0..maxTries) {
+      // Get transaction info
+      val transaction = platformApiClient.getTransaction(id)
+
+      val current = transaction.status
+      info("Expected: $expectedStatus. Current: $current")
+      if (status != transaction.status) {
+        status = transaction.status
+        info("Deposit transaction status changed to $status. Message: ${transaction.message}")
+      }
+
+      delay(1.seconds)
+
+      if (transaction.status == expectedStatus) {
+        return
+      }
+    }
+
+    fail("Transaction wasn't $expectedStatus in $maxTries tries, last status: $status")
+  }
+
+  fun testAll() {
+    info("Running SEP-31 USDC end-to-end tests...")
+    `test typical receive end-to-end flow`(USDC, "5")
+  }
+
+  companion object {
+    private val USDC =
+      IssuedAssetId("USDC", "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5")
+    private const val FIAT_USD = "iso4217:USD"
+  }
+
+  private val expectedReceiveEventJson =
+    """
+ [
+   {
+     "type": "transaction_created",
+     "id": "628ceb6a-5430-4565-a951-ec09fe8d04e4",
+     "sep": "31",
+     "transaction": {
+       "id": "263d8177-f473-4987-9319-4fcd8f8a16b0",
+       "sep": "31",
+       "kind": "receive",
+       "status": "pending_sender",
+       "amount_expected": {
+         "amount": "5",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_in": {
+         "amount": "5",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_out": {
+         "amount": "3.8095",
+         "asset": "iso4217:USD"
+       },
+       "amount_fee": {
+         "amount": "1.00",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "quote_id": "fb90df1b-34d5-4737-8bee-efd8feeec1dd",
+       "started_at": "2023-08-30T15:14:15.047908Z",
+       "updated_at": "2023-08-30T15:14:15.051190Z",
+       "customers": {
+         "sender": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         },
+         "receiver": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         }
+       },
+       "creator": {
+         "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+       }
+     }
+   },
+   {
+     "type": "transaction_status_changed",
+     "id": "49bde28e-ea68-4227-9e6e-0ed5d8012e56",
+     "sep": "31",
+     "transaction": {
+       "id": "263d8177-f473-4987-9319-4fcd8f8a16b0",
+       "sep": "31",
+       "kind": "receive",
+       "status": "pending_receiver",
+       "amount_expected": {
+         "amount": "5",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_in": {
+         "amount": "5.0000000",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_out": {
+         "amount": "3.8095",
+         "asset": "iso4217:USD"
+       },
+       "amount_fee": {
+         "amount": "1.00",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "quote_id": "fb90df1b-34d5-4737-8bee-efd8feeec1dd",
+       "started_at": "2023-08-30T15:14:15.047908Z",
+       "updated_at": "2023-08-30T15:15:11.775070Z",
+       "transfer_received_at": "2023-08-30T15:14:21Z",
+       "message": "Received an incoming payment",
+       "stellar_transactions": [
+         {
+           "id": "d7a5bfbf09898311d2215156530e267bf2c9aecb8f3273d4de5a2a9cc2c09a6e",
+           "memo": "2393666790",
+           "memo_type": "id",
+           "created_at": "2023-08-30T15:14:21Z",
+           "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASvAAAAAEAAAAAAAAAAAAAAABk7119AAAAAgAAAACOrHTmAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAvrwgAAAAAAAAAABgRA+VQAAAEBXULBHSyn4FrZCNN5pSccVjjKRAOi+yPuYvrBe9+M3RbNd9VLboMYvqPX6GTNtFo0j9WRPks1MFIE1Kmykh0MB",
+           "payments": [
+             {
+               "id": "5455445984546817",
+               "amount": {
+                 "amount": "5.0000000",
+                 "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+               },
+               "payment_type": "payment",
+               "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+               "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
+             }
+           ]
+         }
+       ],
+       "customers": {
+         "sender": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         },
+         "receiver": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         }
+       },
+       "creator": {
+         "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+       }
+     }
+   },
+   {
+     "type": "transaction_status_changed",
+     "id": "3e4e38ec-908a-4def-85e5-11d5b61a866c",
+     "sep": "31",
+     "transaction": {
+       "id": "263d8177-f473-4987-9319-4fcd8f8a16b0",
+       "sep": "31",
+       "kind": "receive",
+       "status": "completed",
+       "amount_expected": {
+         "amount": "5",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_in": {
+         "amount": "5.0000000",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "amount_out": {
+         "amount": "3.8095",
+         "asset": "iso4217:USD"
+       },
+       "amount_fee": {
+         "amount": "1.00",
+         "asset": "stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+       },
+       "quote_id": "fb90df1b-34d5-4737-8bee-efd8feeec1dd",
+       "started_at": "2023-08-30T15:14:15.047908Z",
+       "updated_at": "2023-08-30T15:15:17.645248Z",
+       "completed_at": "2023-08-30T15:15:17.645244Z",
+       "transfer_received_at": "2023-08-30T15:14:21Z",
+       "message": "external transfer sent",
+       "stellar_transactions": [
+         {
+           "id": "d7a5bfbf09898311d2215156530e267bf2c9aecb8f3273d4de5a2a9cc2c09a6e",
+           "memo": "2393666790",
+           "memo_type": "id",
+           "created_at": "2023-08-30T15:14:21Z",
+           "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAASvAAAAAEAAAAAAAAAAAAAAABk7119AAAAAgAAAACOrHTmAAAAAQAAAAAAAAABAAAAAEGxI2xgj2aqGDYg25rygTOTzyLGOpz9iKrT/gw0MhwDAAAAAVVTREMAAAAAQj59BfLsr7/sGSshWj8b6WrtuNjnAlSr40E+AgfeVrIAAAAAAvrwgAAAAAAAAAABgRA+VQAAAEBXULBHSyn4FrZCNN5pSccVjjKRAOi+yPuYvrBe9+M3RbNd9VLboMYvqPX6GTNtFo0j9WRPks1MFIE1Kmykh0MB",
+           "payments": [
+             {
+               "id": "5455445984546817",
+               "amount": {
+                 "amount": "5.0000000",
+                 "asset": "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+               },
+               "payment_type": "payment",
+               "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+               "destination_account": "GBA3CI3MMCHWNKQYGYQNXGXSQEZZHTZCYY5JZ7MIVLJ74DBUGIOAGNV6"
+             }
+           ]
+         }
+       ],
+       "customers": {
+         "sender": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         },
+         "receiver": {
+           "id": "147d1555-bab0-462a-887b-c62edc3f8a65"
+         }
+       },
+       "creator": {
+         "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+       }
+     }
+   }
+ ]
+  """
+      .trimIndent()
+
+  private val postSep31TxnRequest =
+    """{
+    "amount": "5",
+    "asset_code": "USDC",
+    "asset_issuer": "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+    "receiver_id": "MOCK_RECEIVER_ID",
+    "sender_id": "MOCK_SENDER_ID",
+    "fields": {
+        "transaction": {
+            "receiver_routing_number": "r0123",
+            "receiver_account_number": "a0456",
+            "type": "SWIFT"
+        }
+    }
+}"""
+
+  private val expectedReceiveCallbacksJson =
+    """
+[
+]
+  """
+      .trimIndent()
+}
diff --git a/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31RpcEnd2EndTests.kt b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31RpcEnd2EndTests.kt
new file mode 100644
index 0000000000..ca297d1f1c
--- /dev/null
+++ b/integration-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31RpcEnd2EndTests.kt
@@ -0,0 +1,505 @@
+package org.stellar.anchor.platform.test
+
+import com.google.gson.reflect.TypeToken
+import io.ktor.client.plugins.*
+import io.ktor.http.*
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.fail
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.skyscreamer.jsonassert.JSONAssert
+import org.stellar.anchor.api.event.AnchorEvent
+import org.stellar.anchor.api.sep.SepTransactionStatus
+import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerRequest
+import org.stellar.anchor.api.sep.sep31.Sep31GetTransactionResponse
+import org.stellar.anchor.api.sep.sep31.Sep31PostTransactionRequest
+import org.stellar.anchor.apiclient.PlatformApiClient
+import org.stellar.anchor.auth.AuthHelper
+import org.stellar.anchor.platform.*
+import org.stellar.anchor.util.GsonUtils
+import org.stellar.anchor.util.Log.info
+import org.stellar.anchor.util.MemoHelper
+import org.stellar.anchor.util.Sep1Helper
+import org.stellar.anchor.util.StringHelper.json
+import org.stellar.reference.client.AnchorReferenceServerClient
+import org.stellar.reference.wallet.WalletServerClient
+import org.stellar.walletsdk.ApplicationConfiguration
+import org.stellar.walletsdk.StellarConfiguration
+import org.stellar.walletsdk.Wallet
+import org.stellar.walletsdk.anchor.MemoType
+import org.stellar.walletsdk.asset.IssuedAssetId
+import org.stellar.walletsdk.asset.StellarAssetId
+import org.stellar.walletsdk.horizon.SigningKeyPair
+import org.stellar.walletsdk.horizon.sign
+
+class Sep31RpcEnd2EndTests(config: TestConfig, val toml: Sep1Helper.TomlContent, val jwt: String) {
+  private val gson = GsonUtils.getInstance()
+  private val walletSecretKey = System.getenv("WALLET_SECRET_KEY") ?: CLIENT_WALLET_SECRET
+  private val keypair = SigningKeyPair.fromSecret(walletSecretKey)
+  private val wallet =
+    Wallet(
+      StellarConfiguration.Testnet,
+      ApplicationConfiguration { defaultRequest { url { protocol = URLProtocol.HTTP } } }
+    )
+  private val maxTries = 60
+  private val anchorReferenceServerClient =
+    AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
+  private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
+  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), jwt)
+  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), jwt)
+  private val sep38Client = Sep38Client(toml.getString("ANCHOR_QUOTE_SERVER"), jwt)
+  private val platformApiClient =
+    PlatformApiClient(AuthHelper.forNone(), config.env["platform.server.url"]!!)
+
+  private fun compareAndAssertEvents(
+    asset: StellarAssetId,
+    expectedEvents: List<AnchorEvent>,
+    actualEvents: List<AnchorEvent>
+  ) {
+    expectedEvents.forEachIndexed { index, expectedEvent ->
+      actualEvents[index].let { actualEvent ->
+        expectedEvent.id = actualEvent.id
+        expectedEvent.transaction.id = actualEvent.transaction.id
+        expectedEvent.transaction.startedAt = actualEvent.transaction.startedAt
+        expectedEvent.transaction.updatedAt = actualEvent.transaction.updatedAt
+        expectedEvent.transaction.transferReceivedAt = actualEvent.transaction.transferReceivedAt
+        expectedEvent.transaction.completedAt = actualEvent.transaction.completedAt
+        expectedEvent.transaction.stellarTransactions = actualEvent.transaction.stellarTransactions
+        expectedEvent.transaction.memo = actualEvent.transaction.memo
+        expectedEvent.transaction.destinationAccount = actualEvent.transaction.destinationAccount
+        expectedEvent.transaction.customers = actualEvent.transaction.customers
+        expectedEvent.transaction.quoteId = actualEvent.transaction.quoteId
+        actualEvent.transaction.amountIn?.let {
+          expectedEvent.transaction.amountIn.amount = actualEvent.transaction.amountIn.amount
+          expectedEvent.transaction.amountIn.asset = asset.sep38
+        }
+        actualEvent.transaction.amountOut?.let {
+          expectedEvent.transaction.amountOut.amount = actualEvent.transaction.amountOut.amount
+          expectedEvent.transaction.amountOut.asset = FIAT_USD
+        }
+        actualEvent.transaction.amountFee?.let {
+          expectedEvent.transaction.amountFee.amount = actualEvent.transaction.amountFee.amount
+          expectedEvent.transaction.amountFee.asset = asset.sep38
+        }
+        actualEvent.transaction.amountExpected?.let {
+          expectedEvent.transaction.amountExpected.amount =
+            actualEvent.transaction.amountExpected.amount
+          expectedEvent.transaction.amountExpected.asset = asset.sep38
+        }
+      }
+    }
+    JSONAssert.assertEquals(json(expectedEvents), gson.toJson(actualEvents), true)
+  }
+
+  private fun compareAndAssertCallbacks(
+    asset: StellarAssetId,
+    expectedCallbacks: List<Sep31GetTransactionResponse>,
+    actualCallbacks: List<Sep31GetTransactionResponse>
+  ) {
+    expectedCallbacks.forEachIndexed { index, expectedCallback ->
+      actualCallbacks[index].let { actualCallback ->
+        with(expectedCallback.transaction) {
+          id = actualCallback.transaction.id
+          startedAt = actualCallback.transaction.startedAt
+          amountIn = actualCallback.transaction.amountIn
+          amountInAsset?.let { amountInAsset = asset.sep38 }
+          amountOut = actualCallback.transaction.amountOut
+          amountOutAsset?.let { amountOutAsset = actualCallback.transaction.amountOutAsset }
+          amountFee = actualCallback.transaction.amountFee
+          amountFeeAsset?.let { amountFeeAsset = asset.sep38 }
+          stellarTransactionId = actualCallback.transaction.stellarTransactionId
+          stellarMemo?.let { stellarMemo = actualCallback.transaction.stellarMemo }
+          completedAt?.let { completedAt = actualCallback.transaction.completedAt }
+        }
+      }
+    }
+    JSONAssert.assertEquals(json(expectedCallbacks), json(actualCallbacks), true)
+  }
+
+  private fun `test typical receive end-to-end flow`(asset: StellarAssetId, amount: String) =
+    runBlocking {
+      walletServerClient.clearCallbacks()
+      val senderCustomerRequest =
+        gson.fromJson(testCustomer1Json, Sep12PutCustomerRequest::class.java)
+      val senderCustomer = sep12Client.putCustomer(senderCustomerRequest)
+
+      // Create receiver customer
+      val receiverCustomerRequest =
+        gson.fromJson(testCustomer2Json, Sep12PutCustomerRequest::class.java)
+      val receiverCustomer = sep12Client.putCustomer(receiverCustomerRequest)
+
+      val quote = sep38Client.postQuote(asset.sep38, amount, FIAT_USD)
+
+      // POST Sep31 transaction
+      val txnRequest = gson.fromJson(postSep31TxnRequest, Sep31PostTransactionRequest::class.java)
+      txnRequest.senderId = senderCustomer!!.id
+      txnRequest.receiverId = receiverCustomer!!.id
+      txnRequest.quoteId = quote.id
+      val postTxResponse = sep31Client.postTransaction(txnRequest)
+
+      anchorReferenceServerClient.processSep31Receive(postTxResponse.id)
+
+      // Get transaction status and make sure it is PENDING_SENDER
+      val transaction = platformApiClient.getTransaction(postTxResponse.id)
+      assertEquals(SepTransactionStatus.PENDING_SENDER, transaction.status)
+
+      val memoType: MemoType =
+        when (postTxResponse.stellarMemoType) {
+          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_ID) -> {
+            MemoType.ID
+          }
+          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_HASH) -> {
+            MemoType.HASH
+          }
+          else -> {
+            MemoType.TEXT
+          }
+        }
+
+      // Submit transfer transaction
+      val transfer =
+        wallet
+          .stellar()
+          .transaction(keypair)
+          .transfer(postTxResponse.stellarAccountId, asset, amount)
+          .addMemo(Pair(memoType, postTxResponse.stellarMemo))
+          .build()
+      transfer.sign(keypair)
+      wallet.stellar().submitTransaction(transfer)
+
+      // Wait for the status to change to COMPLETED
+      waitStatus(postTxResponse.id, SepTransactionStatus.COMPLETED)
+
+      // Check the events sent to the reference server are recorded correctly
+      val actualEvents = waitForBusinessServerEvents(postTxResponse.id, 3)
+      assertNotNull(actualEvents)
+      actualEvents?.let { assertEquals(3, it.size) }
+      val expectedEvents: List<AnchorEvent> =
+        gson.fromJson(expectedReceiveEventJson, object : TypeToken<List<AnchorEvent>>() {}.type)
+      compareAndAssertEvents(asset, expectedEvents, actualEvents!!)
+
+      // Check the callbacks sent to the wallet reference server are recorded correctly
+      val actualCallbacks = waitForWalletServerCallbacks(postTxResponse.id, 3)
+      actualCallbacks?.let {
+        assertEquals(3, it.size)
+        val expectedCallbacks: List<Sep31GetTransactionResponse> =
+          gson.fromJson(
+            expectedReceiveCallbacksJson,
+            object : TypeToken<List<Sep31GetTransactionResponse>>() {}.type
+          )
+        compareAndAssertCallbacks(asset, expectedCallbacks, actualCallbacks)
+      }
+    }
+
+  private suspend fun waitForWalletServerCallbacks(
+    txnId: String,
+    count: Int
+  ): List<Sep31GetTransactionResponse>? {
+    var retries = 5
+    var callbacks: List<Sep31GetTransactionResponse>? = null
+    while (retries > 0) {
+      callbacks =
+        walletServerClient
+          .getCallbackHistory(txnId, Sep31GetTransactionResponse::class.java)
+          .distinctBy { it.transaction.status }
+      if (callbacks.size == count) {
+        return callbacks
+      }
+      delay(1.seconds)
+      retries--
+    }
+    return callbacks
+  }
+
+  private suspend fun waitForBusinessServerEvents(txnId: String, count: Int): List<AnchorEvent>? {
+    var retries = 5
+    while (retries > 0) {
+      val events = anchorReferenceServerClient.getEvents(txnId)
+      if (events.size == count) {
+        return events
+      }
+      delay(1.seconds)
+      retries--
+    }
+    return null
+  }
+
+  private suspend fun waitStatus(id: String, expectedStatus: SepTransactionStatus) {
+    var status: SepTransactionStatus? = null
+
+    for (i in 0..maxTries) {
+      // Get transaction info
+      val transaction = platformApiClient.getTransaction(id)
+
+      val current = transaction.status
+      info("Expected: $expectedStatus. Current: $current")
+      if (status != transaction.status) {
+        status = transaction.status
+        info("Deposit transaction status changed to $status. Message: ${transaction.message}")
+      }
+
+      delay(1.seconds)
+
+      if (transaction.status == expectedStatus) {
+        return
+      }
+    }
+
+    fail("Transaction wasn't $expectedStatus in $maxTries tries, last status: $status")
+  }
+
+  fun testAll() {
+    info("Running SEP-31 USDC end-to-end tests...")
+    `test typical receive end-to-end flow`(USDC, "5")
+  }
+
+  companion object {
+    private val USDC =
+      IssuedAssetId("USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
+    private const val FIAT_USD = "iso4217:USD"
+  }
+
+  private val expectedReceiveEventJson =
+    """
+    [
+      {
+        "type": "transaction_created",
+        "id": "15a01867-19f5-4bdd-98b5-e28b42c18b4a",
+        "sep": "31",
+        "transaction": {
+          "id": "4f00f89f-5e89-4b7e-9c3a-81b39911349d",
+          "sep": "31",
+          "kind": "receive",
+          "status": "pending_sender",
+          "amount_expected": {
+            "amount": "5",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_in": {
+            "amount": "5",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_out": {
+            "amount": "3.8095",
+            "asset": "iso4217:USD"
+          },
+          "amount_fee": {
+            "amount": "1.00",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "quote_id": "9f6bbc16-7065-4464-a64e-2f3834a81666",
+          "started_at": "2023-08-30T14:56:40.839001Z",
+          "updated_at": "2023-08-30T14:56:40.841570Z",
+          "customers": {
+            "sender": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            },
+            "receiver": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            }
+          },
+          "creator": {
+            "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          }
+        }
+      },
+      {
+        "type": "transaction_status_changed",
+        "id": "10a28bce-721e-4886-9d94-e36bf83a9528",
+        "sep": "31",
+        "transaction": {
+          "id": "4f00f89f-5e89-4b7e-9c3a-81b39911349d",
+          "sep": "31",
+          "kind": "receive",
+          "status": "pending_receiver",
+          "amount_expected": {
+            "amount": "5",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_in": {
+            "amount": "5.0000000",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_out": {
+            "amount": "3.8095",
+            "asset": "iso4217:USD"
+          },
+          "amount_fee": {
+            "amount": "1.00",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "quote_id": "9f6bbc16-7065-4464-a64e-2f3834a81666",
+          "started_at": "2023-08-30T14:56:40.839001Z",
+          "updated_at": "2023-08-30T14:56:47.406107Z",
+          "transfer_received_at": "2023-08-30T14:56:43Z",
+          "message": "Received an incoming payment",
+          "stellar_transactions": [
+            {
+              "id": "43c58d90392a1121c2253f31c24551b44f1c74bd2bb2e26797e291483c0eae0d",
+              "memo": "NGYwMGY4OWYtNWU4OS00YjdlLTljM2EtODFiMzk5MTE=",
+              "memo_type": "hash",
+              "created_at": "2023-08-30T14:56:43Z",
+              "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAStgAAAAEAAAAAAAAAAAAAAABk71leAAAAAzRmMDBmODlmLTVlODktNGI3ZS05YzNhLTgxYjM5OTExAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAAAvrwgAAAAAAAAAABgRA+VQAAAEAWsb/oAIsF2xw0+sbF1f5Dl3jT5Nh3tsmP2lbVMKuZ/cJLatwp8ViByUQki+7FDrYdg/aKndwmi4wQgCatChEF",
+              "payments": [
+                {
+                  "id": "5454578401161217",
+                  "amount": {
+                    "amount": "5.0000000",
+                    "asset": "USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+                  },
+                  "payment_type": "payment",
+                  "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+                  "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+                }
+              ]
+            }
+          ],
+          "customers": {
+            "sender": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            },
+            "receiver": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            }
+          },
+          "creator": {
+            "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          }
+        }
+      },
+      {
+        "type": "transaction_status_changed",
+        "id": "f8c38652-0c1b-44e1-9dd8-480c075a458b",
+        "sep": "31",
+        "transaction": {
+          "id": "4f00f89f-5e89-4b7e-9c3a-81b39911349d",
+          "sep": "31",
+          "kind": "receive",
+          "status": "completed",
+          "amount_expected": {
+            "amount": "5",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_in": {
+            "amount": "5.0000000",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "amount_out": {
+            "amount": "3.8095",
+            "asset": "iso4217:USD"
+          },
+          "amount_fee": {
+            "amount": "1.00",
+            "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+          },
+          "quote_id": "9f6bbc16-7065-4464-a64e-2f3834a81666",
+          "started_at": "2023-08-30T14:56:40.839001Z",
+          "updated_at": "2023-08-30T14:56:52.459322Z",
+          "completed_at": "2023-08-30T14:56:52.459307Z",
+          "transfer_received_at": "2023-08-30T14:56:43Z",
+          "message": "external transfer sent",
+          "stellar_transactions": [
+            {
+              "id": "43c58d90392a1121c2253f31c24551b44f1c74bd2bb2e26797e291483c0eae0d",
+              "memo": "NGYwMGY4OWYtNWU4OS00YjdlLTljM2EtODFiMzk5MTE=",
+              "memo_type": "hash",
+              "created_at": "2023-08-30T14:56:43Z",
+              "envelope": "AAAAAgAAAADSsOMKYK7a1aALie83F4GQDoBdHrW86UX2SYVygRA+VQAAAGQAABUwAAAStgAAAAEAAAAAAAAAAAAAAABk71leAAAAAzRmMDBmODlmLTVlODktNGI3ZS05YzNhLTgxYjM5OTExAAAAAQAAAAAAAAABAAAAAFvGtEMyXcvbioU2IKCSomxahpl7lUyef7ftEPxWcD4bAAAAAVVTREMAAAAA4OJrYiyoyVYK5jqTvfhX91wJp8nB8jVCrv7/SoR3rwAAAAAAAvrwgAAAAAAAAAABgRA+VQAAAEAWsb/oAIsF2xw0+sbF1f5Dl3jT5Nh3tsmP2lbVMKuZ/cJLatwp8ViByUQki+7FDrYdg/aKndwmi4wQgCatChEF",
+              "payments": [
+                {
+                  "id": "5454578401161217",
+                  "amount": {
+                    "amount": "5.0000000",
+                    "asset": "USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+                  },
+                  "payment_type": "payment",
+                  "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+                  "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF"
+                }
+              ]
+            }
+          ],
+          "customers": {
+            "sender": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            },
+            "receiver": {
+              "id": "7af39a08-89a7-4fe4-a559-abae9ac15d6b"
+            }
+          },
+          "creator": {
+            "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          }
+        }
+      }
+    ]
+  """
+      .trimIndent()
+
+  private val postSep31TxnRequest =
+    """{
+    "amount": "5",
+    "asset_code": "USDC",
+    "asset_issuer": "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+    "receiver_id": "MOCK_RECEIVER_ID",
+    "sender_id": "MOCK_SENDER_ID",
+    "fields": {
+        "transaction": {
+            "receiver_routing_number": "r0123",
+            "receiver_account_number": "a0456",
+            "type": "SWIFT"
+        }
+    }
+}"""
+
+  private val expectedReceiveCallbacksJson =
+    """
+[
+  {
+    "transaction": {
+      "id": "e9683b7f-c1c2-4565-acf6-57aa9830dc24",
+      "status": "pending_sender",
+      "amount_in": "5",
+      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "amount_out": "3.8095",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "1.00",
+      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "started_at": "2023-09-06T16:00:32.267425500Z"
+    }
+  },
+  {
+    "transaction": {
+      "id": "e9683b7f-c1c2-4565-acf6-57aa9830dc24",
+      "status": "pending_receiver",
+      "amount_in": "5.0000000",
+      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "amount_out": "3.8095",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "1.00",
+      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "started_at": "2023-09-06T16:00:32.267426Z",
+      "required_info_message": "Received an incoming payment"
+    }
+  },
+  {
+    "transaction": {
+      "id": "e9683b7f-c1c2-4565-acf6-57aa9830dc24",
+      "status": "completed",
+      "amount_in": "5.0000000",
+      "amount_in_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "amount_out": "3.8095",
+      "amount_out_asset": "iso4217:USD",
+      "amount_fee": "1.00",
+      "amount_fee_asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
+      "started_at": "2023-09-06T16:00:32.267426Z",
+      "completed_at": "2023-09-06T16:00:43.479958600Z",
+      "required_info_message": "external transfer sent"
+    }
+  }
+]
+  """
+      .trimIndent()
+}
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/client/AnchorReferenceServerClient.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/client/AnchorReferenceServerClient.kt
index 78d9213a27..42eba1b410 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/client/AnchorReferenceServerClient.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/client/AnchorReferenceServerClient.kt
@@ -67,4 +67,20 @@ class AnchorReferenceServerClient(val endpoint: Url) {
       }
     }
   }
+
+  /**
+   * ATTENTION: this function is used for testing purposes only.
+   *
+   * <p>This endpoint is used to simulate SEP-31 flow
+   */
+  suspend fun processSep31Receive(transactionId: String) {
+    client.post {
+      url {
+        this.protocol = endpoint.protocol
+        host = endpoint.host
+        port = endpoint.port
+        encodedPath = "/sep31/transactions/$transactionId/process"
+      }
+    }
+  }
 }
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Config.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Config.kt
index 9400baba8d..d965d53a00 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Config.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Config.kt
@@ -11,7 +11,7 @@ data class Config(
   val sep24: Sep24
 )
 
-data class Sep24(val enableTest: Boolean, val secret: String, val interactiveJwtKey: String) {
+data class Sep24(val secret: String, val interactiveJwtKey: String) {
   val keyPair = KeyPair.fromSecretSeed(secret)
 }
 
@@ -25,7 +25,8 @@ data class AppSettings(
   val distributionWalletMemo: String,
   val distributionWalletMemoType: String,
   val custodyEnabled: Boolean,
-  val rpcEnabled: Boolean
+  val rpcEnabled: Boolean,
+  val enableTest: Boolean
 )
 
 data class AuthSettings(
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/EventService.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/EventService.kt
index a87cb55c9b..5abe2c2439 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/EventService.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/EventService.kt
@@ -25,7 +25,7 @@ class EventService {
   fun getEvents(txnId: String?): List<AnchorEvent> {
     if (txnId != null) {
       // filter events with txnId
-      return receivedEvents.filter { it.transaction.id == txnId }
+      return receivedEvents.filter { it?.transaction?.id == txnId }
     }
     // return all events
     return receivedEvents
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/plugins/ConfigureRouting.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/plugins/ConfigureRouting.kt
index d459973476..b6be1df31b 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/plugins/ConfigureRouting.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/plugins/ConfigureRouting.kt
@@ -19,13 +19,14 @@ import org.stellar.reference.data.Config
 import org.stellar.reference.event.EventService
 import org.stellar.reference.event.event
 import org.stellar.reference.sep24.DepositService
-import org.stellar.reference.sep24.Sep24Helper
 import org.stellar.reference.sep24.WithdrawalService
 import org.stellar.reference.sep24.sep24
 import org.stellar.reference.sep24.testSep24
+import org.stellar.reference.service.SepHelper
+import org.stellar.reference.service.sep31.ReceiveService
 
 fun Application.configureRouting(cfg: Config) = routing {
-  val helper = Sep24Helper(cfg)
+  val helper = SepHelper(cfg)
   val depositService = DepositService(cfg)
   val withdrawalService = WithdrawalService(cfg)
   val eventService = EventService()
@@ -42,6 +43,7 @@ fun Application.configureRouting(cfg: Config) = routing {
   val feeService = FeeService(customerRepo)
   val rateService = RateService(quotesRepo)
   val uniqueAddressService = UniqueAddressService(cfg.appSettings)
+  val receiveService = ReceiveService(cfg)
 
   sep24(helper, depositService, withdrawalService, cfg.sep24.interactiveJwtKey)
   event(eventService)
@@ -51,8 +53,12 @@ fun Application.configureRouting(cfg: Config) = routing {
   uniqueAddress(uniqueAddressService)
   sep24Interactive()
 
-  if (cfg.sep24.enableTest) {
+  if (cfg.appSettings.enableTest) {
     testSep24(helper, depositService, withdrawalService, cfg.sep24.interactiveJwtKey)
+    testSep31(receiveService)
+  }
+  if (cfg.appSettings.isTest) {
+    testCustomer(customerService)
   }
   if (cfg.appSettings.isTest) {
     testCustomer(customerService)
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/DepositService.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/DepositService.kt
index a8f44ea393..4681807297 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/DepositService.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/DepositService.kt
@@ -4,12 +4,13 @@ import java.math.BigDecimal
 import java.math.RoundingMode
 import mu.KotlinLogging
 import org.stellar.reference.data.*
+import org.stellar.reference.service.SepHelper
 import org.stellar.sdk.responses.operations.PaymentOperationResponse
 
 private val log = KotlinLogging.logger {}
 
 class DepositService(private val cfg: Config) {
-  val sep24 = Sep24Helper(cfg)
+  val sep24 = SepHelper(cfg)
 
   suspend fun processDeposit(
     transactionId: String,
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Route.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Route.kt
index b84e5fc427..5de5f35663 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Route.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Route.kt
@@ -15,11 +15,12 @@ import org.stellar.reference.data.ErrorResponse
 import org.stellar.reference.data.Success
 import org.stellar.reference.data.WithdrawalRequest
 import org.stellar.reference.jwt.JwtDecoder
+import org.stellar.reference.service.SepHelper
 
 private val log = KotlinLogging.logger {}
 
 fun Route.sep24(
-  sep24: Sep24Helper,
+  sep24: SepHelper,
   depositService: DepositService,
   withdrawalService: WithdrawalService,
   jwtKey: String
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24TestRoute.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24TestRoute.kt
index dfab758fd9..cba883f30d 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24TestRoute.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24TestRoute.kt
@@ -11,11 +11,12 @@ import kotlinx.coroutines.launch
 import mu.KotlinLogging
 import org.stellar.reference.ClientException
 import org.stellar.reference.jwt.JwtDecoder
+import org.stellar.reference.service.SepHelper
 
 private val log = KotlinLogging.logger {}
 
 fun Route.testSep24(
-  sep24: Sep24Helper,
+  sep24: SepHelper,
   depositService: DepositService,
   withdrawalService: WithdrawalService,
   jwtKey: String
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/WithdrawalService.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/WithdrawalService.kt
index 2e0a317c56..c51596f08a 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/WithdrawalService.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/WithdrawalService.kt
@@ -4,11 +4,12 @@ import java.math.BigDecimal
 import java.math.RoundingMode
 import mu.KotlinLogging
 import org.stellar.reference.data.*
+import org.stellar.reference.service.SepHelper
 
 private val log = KotlinLogging.logger {}
 
 class WithdrawalService(private val cfg: Config) {
-  private val sep24 = Sep24Helper(cfg)
+  private val sep24 = SepHelper(cfg)
 
   suspend fun processWithdrawal(
     transactionId: String,
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/ReceiveService.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/ReceiveService.kt
new file mode 100644
index 0000000000..80074adc57
--- /dev/null
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/ReceiveService.kt
@@ -0,0 +1,54 @@
+package org.stellar.reference.service.sep31
+
+import mu.KotlinLogging
+import org.stellar.reference.data.Config
+import org.stellar.reference.data.NotifyOffchainFundsSentRequest
+import org.stellar.reference.data.NotifyTransactionErrorRequest
+import org.stellar.reference.service.SepHelper
+
+private val log = KotlinLogging.logger {}
+
+class ReceiveService(cfg: Config) {
+  private val sepHelper = SepHelper(cfg)
+
+  suspend fun processReceive(transactionId: String) {
+    try {
+      val transaction = sepHelper.getTransaction(transactionId)
+      log.info { "Transaction found $transaction" }
+
+      // 1. Wait for stellar transaction
+      sepHelper.waitStellarTransaction(transactionId, "pending_receiver")
+
+      // 2. Submit a transfer (e.g. Bank transfer)
+      sendExternal(transactionId)
+
+      log.info { "Transaction completed: $transactionId" }
+    } catch (e: Exception) {
+      log.error(e) { "Error happened during processing transaction $transactionId" }
+
+      try {
+        // If some error happens during the job, set anchor transaction to error status
+        failTransaction(transactionId, e.message)
+      } catch (e: Exception) {
+        log.error(e) { "CRITICAL: failed to set transaction status to error" }
+      }
+    }
+  }
+
+  private suspend fun sendExternal(transactionId: String) {
+    sepHelper.rpcAction(
+      "notify_offchain_funds_sent",
+      NotifyOffchainFundsSentRequest(
+        transactionId = transactionId,
+        message = "external transfer sent"
+      )
+    )
+  }
+
+  private suspend fun failTransaction(transactionId: String, message: String?) {
+    sepHelper.rpcAction(
+      "notify_transaction_error",
+      NotifyTransactionErrorRequest(transactionId = transactionId, message = message)
+    )
+  }
+}
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/Sep31TestRoute.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/Sep31TestRoute.kt
new file mode 100644
index 0000000000..de5546356f
--- /dev/null
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep31/Sep31TestRoute.kt
@@ -0,0 +1,44 @@
+package org.stellar.reference.plugins
+
+import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.util.logging.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import mu.KotlinLogging
+import org.stellar.reference.ClientException
+import org.stellar.reference.data.ErrorResponse
+import org.stellar.reference.data.Success
+import org.stellar.reference.service.sep31.ReceiveService
+
+private val log = KotlinLogging.logger {}
+
+fun Route.testSep31(receiveService: ReceiveService) {
+
+  route("/sep31/transactions/{transactionId}/process") {
+    post {
+      try {
+        val transactionId =
+          call.parameters["transactionId"]
+            ?: throw ClientException("Missing transactionId parameter")
+
+        // Run receive processing asynchronously
+        CoroutineScope(Job()).launch { receiveService.processReceive(transactionId) }
+
+        call.respond(Success(transactionId))
+      } catch (e: ClientException) {
+        log.error(e)
+        call.respond(HttpStatusCode.BadRequest, ErrorResponse(e.message!!))
+      } catch (e: Exception) {
+        log.error(e)
+        call.respond(
+          HttpStatusCode.InternalServerError,
+          ErrorResponse("Error occurred: ${e.message}"),
+        )
+      }
+    }
+  }
+}
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Helper.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/service/SepHelper.kt
similarity index 98%
rename from kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Helper.kt
rename to kotlin-reference-server/src/main/kotlin/org/stellar/reference/service/SepHelper.kt
index d403e47cdb..86031f80ba 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/sep24/Sep24Helper.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/service/SepHelper.kt
@@ -1,4 +1,4 @@
-package org.stellar.reference.sep24
+package org.stellar.reference.service
 
 import com.google.gson.reflect.TypeToken
 import io.ktor.client.*
@@ -20,7 +20,7 @@ import org.stellar.reference.data.*
 import org.stellar.reference.data.Transaction
 import org.stellar.sdk.*
 
-class Sep24Helper(private val cfg: Config) {
+class SepHelper(private val cfg: Config) {
   private val log = KotlinLogging.logger {}
   private val gson = GsonUtils.getInstance()
 
diff --git a/kotlin-reference-server/src/main/resources/default-config.yaml b/kotlin-reference-server/src/main/resources/default-config.yaml
index 08112a1fad..a67411a316 100644
--- a/kotlin-reference-server/src/main/resources/default-config.yaml
+++ b/kotlin-reference-server/src/main/resources/default-config.yaml
@@ -12,6 +12,13 @@ app:
   distributionWallet: GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF
   distributionWalletMemo:
   distributionWalletMemoType:
+  # When true, enables test endpoints
+  enableTest: true
+  # Indicates, that custody integration is enabled
+  custodyEnabled: false
+  # Indicates, that RPC requests should be used instead of PATCH /transactions endpoint
+  rpcEnabled: true
+
 
 # These are secrets shared between Anchor and Platform that are used to safely communicate from `Platform->Anchor`
 # and `Anchor->Platform`, especially when they are in different clusters.
@@ -37,11 +44,5 @@ sep24:
   # Secret key used to send funds to user accounts.
   # Public key: GABCKCYPAGDDQMSCTMSBO7C2L34NU3XXCW7LR4VVSWCCXMAJY3B4YCZP
   secret: "SAJW2O2NH5QMMVWYAN352OEXS2RUY675A2HPK5HEG2FRR2NXPYA4OLYN"
-  # When true, enables test endpoints
-  enableTest: true
   # Encryption key for interactive JWT
   interactiveJwtKey: "secret_sep24_interactive_url_jwt_secret"
-  # Indicates, that custody integration is enabled
-  custodyEnabled: false
-  # Indicates, that RPC requests should be used instead of PATCH /transactions endpoint
-  rpcEnabled: true
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
index f0d6a0019b..602f0d1dbd 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
@@ -11,6 +11,7 @@
 import org.stellar.anchor.platform.event.EventProcessorManager;
 import org.stellar.anchor.sep24.MoreInfoUrlConstructor;
 import org.stellar.anchor.sep24.Sep24TransactionStore;
+import org.stellar.anchor.sep31.Sep31TransactionStore;
 
 @Configuration
 public class EventProcessorBeans {
@@ -24,6 +25,7 @@ EventProcessorManager eventProcessorManager(
       EventService eventService,
       AssetService assetService,
       Sep24TransactionStore sep24TransactionStore,
+      Sep31TransactionStore sep31TransactionStore,
       MoreInfoUrlConstructor moreInfoUrlConstructor) {
     return new EventProcessorManager(
         secretConfig,
@@ -33,6 +35,7 @@ EventProcessorManager eventProcessorManager(
         eventService,
         assetService,
         sep24TransactionStore,
+        sep31TransactionStore,
         moreInfoUrlConstructor);
   }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
index 2755c38cd6..baf70bb9e0 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/sep/SepBeans.java
@@ -93,8 +93,8 @@ Sep12Config sep12Config(CallbackApiConfig callbackApiConfig) {
 
   @Bean
   @ConfigurationProperties(prefix = "sep31")
-  Sep31Config sep31Config() {
-    return new PropertySep31Config();
+  Sep31Config sep31Config(CustodyConfig custodyConfig) {
+    return new PropertySep31Config(custodyConfig);
   }
 
   @Bean
diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep24Config.java b/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep24Config.java
index ace35a7ff3..f9f7b4dfc6 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep24Config.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep24Config.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.config;
 
+import static org.stellar.anchor.config.Sep24Config.DepositInfoGeneratorType.*;
 import static org.stellar.anchor.util.StringHelper.isEmpty;
 import static org.stellar.anchor.util.StringHelper.snakeToCamelCase;
 
@@ -85,6 +86,7 @@ public void validate(@NotNull Object target, @NotNull Errors errors) {
       validateInteractiveUrlConfig(errors);
       validateMoreInfoUrlConfig(errors);
       validateFeaturesConfig(errors);
+      validateDepositInfoGeneratorType(errors);
     }
   }
 
@@ -186,4 +188,21 @@ void validateFeaturesConfig(Errors errors) {
       }
     }
   }
+
+  void validateDepositInfoGeneratorType(Errors errors) {
+    if (custodyConfig.isCustodyIntegrationEnabled() && CUSTODY != depositInfoGeneratorType) {
+      errors.rejectValue(
+          "depositInfoGeneratorType",
+          "sep24-deposit-info-generator-type",
+          String.format(
+              "[%s] deposit info generator type is not supported when custody integration is enabled",
+              depositInfoGeneratorType.toString().toLowerCase()));
+    } else if (!custodyConfig.isCustodyIntegrationEnabled()
+        && CUSTODY == depositInfoGeneratorType) {
+      errors.rejectValue(
+          "depositInfoGeneratorType",
+          "sep24-deposit-info-generator-type",
+          "[custody] deposit info generator type is not supported when custody integration is disabled");
+    }
+  }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep31Config.java b/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep31Config.java
index 139af8db84..be1a17063a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep31Config.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep31Config.java
@@ -1,16 +1,52 @@
 package org.stellar.anchor.platform.config;
 
-import static org.stellar.anchor.config.Sep31Config.DepositInfoGeneratorType.SELF;
+import static org.stellar.anchor.config.Sep31Config.DepositInfoGeneratorType.CUSTODY;
 import static org.stellar.anchor.config.Sep31Config.PaymentType.STRICT_SEND;
 
 import lombok.Data;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+import org.stellar.anchor.config.CustodyConfig;
 import org.stellar.anchor.config.Sep31Config;
 
 @Data
-public class PropertySep31Config implements Sep31Config {
+public class PropertySep31Config implements Sep31Config, Validator {
   boolean enabled;
   PaymentType paymentType = STRICT_SEND;
-  DepositInfoGeneratorType depositInfoGeneratorType = SELF;
+  DepositInfoGeneratorType depositInfoGeneratorType;
+  CustodyConfig custodyConfig;
 
-  public PropertySep31Config() {}
+  public PropertySep31Config(CustodyConfig custodyConfig) {
+    this.custodyConfig = custodyConfig;
+  }
+
+  @Override
+  public boolean supports(@NotNull Class<?> clazz) {
+    return Sep31Config.class.isAssignableFrom(clazz);
+  }
+
+  @Override
+  public void validate(@NotNull Object target, @NotNull Errors errors) {
+    if (enabled) {
+      validateDepositInfoGeneratorType(errors);
+    }
+  }
+
+  void validateDepositInfoGeneratorType(Errors errors) {
+    if (custodyConfig.isCustodyIntegrationEnabled() && CUSTODY != depositInfoGeneratorType) {
+      errors.rejectValue(
+          "depositInfoGeneratorType",
+          "sep31-deposit-info-generator-type",
+          String.format(
+              "[%s] deposit info generator type is not supported when custody integration is enabled",
+              depositInfoGeneratorType.toString().toLowerCase()));
+    } else if (!custodyConfig.isCustodyIntegrationEnabled()
+        && CUSTODY == depositInfoGeneratorType) {
+      errors.rejectValue(
+          "depositInfoGeneratorType",
+          "sep31-deposit-info-generator-type",
+          "[custody] deposit info generator type is not supported when custody integration is disabled");
+    }
+  }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/CallbackApiEventHandler.java b/platform/src/main/java/org/stellar/anchor/platform/event/CallbackApiEventHandler.java
index 04f77765c1..df357f0d02 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/event/CallbackApiEventHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/event/CallbackApiEventHandler.java
@@ -1,7 +1,6 @@
 package org.stellar.anchor.platform.event;
 
-import static org.stellar.anchor.util.Log.debugF;
-import static org.stellar.anchor.util.Log.traceF;
+import static org.stellar.anchor.util.Log.*;
 
 import java.io.IOException;
 import org.stellar.anchor.api.callback.SendEventRequest;
@@ -28,6 +27,7 @@ boolean handleEvent(AnchorEvent event) throws IOException {
       callbackApiClient.sendEvent(SendEventRequest.from(event));
       return true;
     } catch (AnchorException e) {
+      errorEx("Failed to send event to callback API. Error code: {}", e);
       return false;
     }
   }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java b/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
index e28a814b2f..987ec9ceb6 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
@@ -2,6 +2,7 @@
 
 import static org.stellar.anchor.sep24.Sep24Helper.fromTxn;
 import static org.stellar.anchor.util.Log.debugF;
+import static org.stellar.anchor.util.Log.errorF;
 import static org.stellar.anchor.util.NetUtil.getDomainFromURL;
 import static org.stellar.anchor.util.OkHttpUtil.buildJsonRequestBody;
 import static org.stellar.anchor.util.StringHelper.json;
@@ -9,21 +10,28 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.Base64;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import org.stellar.anchor.api.event.AnchorEvent;
+import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.SepException;
+import org.stellar.anchor.api.platform.GetTransactionResponse;
 import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.config.SecretConfig;
 import org.stellar.anchor.platform.config.ClientsConfig.ClientConfig;
-import org.stellar.anchor.sep24.MoreInfoUrlConstructor;
-import org.stellar.anchor.sep24.Sep24Transaction;
-import org.stellar.anchor.sep24.Sep24TransactionStore;
+import org.stellar.anchor.platform.data.*;
+import org.stellar.anchor.sep24.*;
+import org.stellar.anchor.sep31.RefundPayment;
+import org.stellar.anchor.sep31.Sep31Refunds;
+import org.stellar.anchor.sep31.Sep31Transaction;
 import org.stellar.sdk.KeyPair;
 
 public class ClientStatusCallbackHandler extends EventHandler {
@@ -36,20 +44,17 @@ public class ClientStatusCallbackHandler extends EventHandler {
           .build();
   private final SecretConfig secretConfig;
   private final ClientConfig clientConfig;
-  private final Sep24TransactionStore sep24TransactionStore;
   private final AssetService assetService;
   private final MoreInfoUrlConstructor moreInfoUrlConstructor;
 
   public ClientStatusCallbackHandler(
       SecretConfig secretConfig,
       ClientConfig clientConfig,
-      Sep24TransactionStore sep24TransactionStore,
       AssetService assetService,
       MoreInfoUrlConstructor moreInfoUrlConstructor) {
     super();
     this.secretConfig = secretConfig;
     this.clientConfig = clientConfig;
-    this.sep24TransactionStore = sep24TransactionStore;
     this.assetService = assetService;
     this.moreInfoUrlConstructor = moreInfoUrlConstructor;
   }
@@ -63,6 +68,7 @@ boolean handleEvent(AnchorEvent event) throws IOException {
       debugF(
           "Sending event: {} to client status api: {}", json(event), clientConfig.getCallbackUrl());
       if (response.code() < 200 || response.code() >= 400) {
+        errorF("Failed to send event to client status API. Error code: {}", response.code());
         return false;
       }
     }
@@ -95,16 +101,113 @@ public static Request buildHttpRequest(KeyPair signer, String payload, String ur
   }
 
   private String getPayload(AnchorEvent event)
-      throws SepException, MalformedURLException, URISyntaxException {
+      throws AnchorException, MalformedURLException, URISyntaxException {
     switch (event.getTransaction().getSep()) {
       case SEP_24:
-        Sep24Transaction sep24Txn =
-            sep24TransactionStore.findByTransactionId(event.getTransaction().getId());
-        Sep24GetTransactionResponse txnResponse =
+        Sep24Transaction sep24Txn = fromSep24Txn(event.getTransaction());
+        Sep24GetTransactionResponse txn24Response =
             Sep24GetTransactionResponse.of(fromTxn(assetService, moreInfoUrlConstructor, sep24Txn));
-        return json(txnResponse);
+        return json(txn24Response);
+      case SEP_31:
+        Sep31Transaction sep31Txn = fromSep31Txn(event.getTransaction());
+        return json(sep31Txn.toSep31GetTransactionResponse());
       default:
-        throw new SepException("Only SEP-24 is supported");
+        throw new SepException("Only SEP-24 and SEP-31 are supported");
     }
   }
+
+  private Sep24Transaction fromSep24Txn(GetTransactionResponse txn) {
+    JdbcSep24Transaction sep24Txn = new JdbcSep24Transaction();
+    sep24Txn.setTransactionId(txn.getId());
+    sep24Txn.setKind(txn.getKind().kind);
+    sep24Txn.setStatus(txn.getStatus().getStatus());
+    if (txn.getAmountIn() != null) {
+      sep24Txn.setAmountIn(txn.getAmountIn().getAmount());
+      sep24Txn.setAmountInAsset(txn.getAmountIn().getAsset());
+    }
+    if (txn.getAmountOut() != null) {
+      sep24Txn.setAmountOut(txn.getAmountOut().getAmount());
+      sep24Txn.setAmountOutAsset(txn.getAmountOut().getAsset());
+    }
+    if (txn.getAmountFee() != null) {
+      sep24Txn.setAmountFee(txn.getAmountFee().getAmount());
+      sep24Txn.setAmountFeeAsset(txn.getAmountFee().getAsset());
+    }
+    sep24Txn.setStartedAt(txn.getStartedAt());
+    sep24Txn.setCompletedAt(txn.getCompletedAt());
+    sep24Txn.setExternalTransactionId(txn.getExternalTransactionId());
+    sep24Txn.setMessage(txn.getMessage());
+    sep24Txn.setFromAccount(txn.getSourceAccount());
+    sep24Txn.setToAccount(txn.getDestinationAccount());
+    sep24Txn.setMemo(txn.getMemo());
+    sep24Txn.setMemoType(txn.getMemoType());
+
+    if (txn.getRefunds() != null) {
+      List<Sep24RefundPayment> paymentList =
+          Arrays.stream(txn.getRefunds().getPayments())
+              .map(
+                  refundPayment -> {
+                    Sep24RefundPayment payment = new JdbcSep24RefundPayment();
+                    payment.setAmount(refundPayment.getAmount().getAmount());
+                    payment.setFee(refundPayment.getFee().getAmount());
+                    payment.setId(refundPayment.getId());
+
+                    return payment;
+                  })
+              .collect(Collectors.toList());
+      Sep24Refunds refunds = new JdbcSep24Refunds();
+      refunds.setAmountRefunded(txn.getRefunds().getAmountRefunded().getAmount());
+      refunds.setAmountFee(txn.getRefunds().getAmountFee().getAmount());
+      refunds.setRefundPayments(paymentList);
+      sep24Txn.setRefunds(refunds);
+    }
+
+    return sep24Txn;
+  }
+
+  private Sep31Transaction fromSep31Txn(GetTransactionResponse txn) {
+    JdbcSep31Transaction sep24Txn = new JdbcSep31Transaction();
+    sep24Txn.setId(txn.getId());
+    sep24Txn.setStatus(txn.getStatus().getStatus());
+    if (txn.getAmountIn() != null) {
+      sep24Txn.setAmountIn(txn.getAmountIn().getAmount());
+      sep24Txn.setAmountInAsset(txn.getAmountIn().getAsset());
+    }
+    if (txn.getAmountOut() != null) {
+      sep24Txn.setAmountOut(txn.getAmountOut().getAmount());
+      sep24Txn.setAmountOutAsset(txn.getAmountOut().getAsset());
+    }
+    if (txn.getAmountFee() != null) {
+      sep24Txn.setAmountFee(txn.getAmountFee().getAmount());
+      sep24Txn.setAmountFeeAsset(txn.getAmountFee().getAsset());
+    }
+    sep24Txn.setStartedAt(txn.getStartedAt());
+    sep24Txn.setCompletedAt(txn.getCompletedAt());
+    sep24Txn.setExternalTransactionId(txn.getExternalTransactionId());
+    sep24Txn.setRequiredInfoMessage(txn.getMessage());
+    sep24Txn.setStellarMemo(txn.getMemo());
+    sep24Txn.setStellarMemoType(txn.getMemoType());
+
+    if (txn.getRefunds() != null) {
+      List<RefundPayment> paymentList =
+          Arrays.stream(txn.getRefunds().getPayments())
+              .map(
+                  refundPayment -> {
+                    RefundPayment payment = new JdbcSep31RefundPayment();
+                    payment.setAmount(refundPayment.getAmount().getAmount());
+                    payment.setFee(refundPayment.getFee().getAmount());
+                    payment.setId(refundPayment.getId());
+
+                    return payment;
+                  })
+              .collect(Collectors.toList());
+      Sep31Refunds refunds = new JdbcSep31Refunds();
+      refunds.setAmountRefunded(txn.getRefunds().getAmountRefunded().getAmount());
+      refunds.setAmountFee(txn.getRefunds().getAmountFee().getAmount());
+      refunds.setRefundPayments(paymentList);
+      sep24Txn.setRefunds(refunds);
+    }
+
+    return sep24Txn;
+  }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java b/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
index 1aadddbe35..08aaf91e96 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
@@ -31,6 +31,7 @@
 import org.stellar.anchor.platform.utils.DaemonExecutors;
 import org.stellar.anchor.sep24.MoreInfoUrlConstructor;
 import org.stellar.anchor.sep24.Sep24TransactionStore;
+import org.stellar.anchor.sep31.Sep31TransactionStore;
 import org.stellar.anchor.util.ExponentialBackoffTimer;
 import org.stellar.anchor.util.Log;
 
@@ -45,6 +46,7 @@ public class EventProcessorManager {
   private final EventService eventService;
   private final AssetService assetService;
   private final Sep24TransactionStore sep24TransactionStore;
+  private final Sep31TransactionStore sep31TransactionStore;
   private final MoreInfoUrlConstructor moreInfoUrlConstructor;
 
   private final List<EventProcessor> processors = new ArrayList<>();
@@ -57,6 +59,7 @@ public EventProcessorManager(
       EventService eventService,
       AssetService assetService,
       Sep24TransactionStore sep24TransactionStore,
+      Sep31TransactionStore sep31TransactionStore,
       MoreInfoUrlConstructor moreInfoUrlConstructor) {
     this.secretConfig = secretConfig;
     this.eventProcessorConfig = eventProcessorConfig;
@@ -65,6 +68,7 @@ public EventProcessorManager(
     this.eventService = eventService;
     this.assetService = assetService;
     this.sep24TransactionStore = sep24TransactionStore;
+    this.sep31TransactionStore = sep31TransactionStore;
     this.moreInfoUrlConstructor = moreInfoUrlConstructor;
   }
 
@@ -110,11 +114,7 @@ public void start() {
                 processorName,
                 EventQueue.TRANSACTION,
                 new ClientStatusCallbackHandler(
-                    secretConfig,
-                    clientConfig,
-                    sep24TransactionStore,
-                    assetService,
-                    moreInfoUrlConstructor),
+                    secretConfig, clientConfig, assetService, moreInfoUrlConstructor),
                 eventService));
       }
     }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java b/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
index de66e45bdd..b071842b82 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
@@ -1,7 +1,6 @@
 package org.stellar.anchor.platform.service;
 
 import static org.stellar.anchor.api.event.AnchorEvent.Type.TRANSACTION_STATUS_CHANGED;
-import static org.stellar.anchor.api.sep.SepTransactionStatus.*;
 import static org.stellar.anchor.api.sep.SepTransactionStatus.ERROR;
 import static org.stellar.anchor.api.sep.SepTransactionStatus.EXPIRED;
 import static org.stellar.anchor.api.sep.SepTransactionStatus.PENDING_ANCHOR;
@@ -287,7 +286,7 @@ private GetTransactionResponse patchTransaction(PatchTransactionRequest patch)
         eventSession.publish(
             AnchorEvent.builder()
                 .id(UUID.randomUUID().toString())
-                .sep("24")
+                .sep("31")
                 .type(TRANSACTION_STATUS_CHANGED)
                 .transaction(TransactionHelper.toGetTransactionResponse(sep31Txn))
                 .build());
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep24ConfigTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep24ConfigTest.kt
index f5be50cd3a..9a9e1dc52d 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep24ConfigTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep24ConfigTest.kt
@@ -12,10 +12,9 @@ import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.validation.BindException
 import org.springframework.validation.Errors
 import org.stellar.anchor.config.CustodyConfig
-import org.stellar.anchor.config.CustodyConfig.CustodyType.FIREBLOCKS
-import org.stellar.anchor.config.CustodyConfig.CustodyType.NONE
 import org.stellar.anchor.config.SecretConfig
-import org.stellar.anchor.config.Sep24Config
+import org.stellar.anchor.config.Sep24Config.DepositInfoGeneratorType
+import org.stellar.anchor.config.Sep24Config.Features
 import org.stellar.anchor.platform.config.PropertySep24Config.InteractiveUrlConfig
 import org.stellar.anchor.platform.config.PropertySep24Config.MoreInfoUrlConfig
 
@@ -38,6 +37,7 @@ class Sep24ConfigTest {
     errors = BindException(config, "config")
     config.interactiveUrl = InteractiveUrlConfig("https://www.stellar.org", 600, listOf(""))
     config.moreInfoUrl = MoreInfoUrlConfig("https://www.stellar.org", 600, listOf(""))
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.SELF
   }
 
   @Test
@@ -46,6 +46,34 @@ class Sep24ConfigTest {
     assertFalse(errors.hasErrors())
   }
 
+  @Test
+  fun `test invalid deposit info generator type`() {
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
+    config.validate(config, errors)
+    assertEquals("sep24-deposit-info-generator-type", errors.allErrors[0].code)
+  }
+
+  @Test
+  fun `test valid sep24 configuration with custody integration`() {
+    every { custodyConfig.isCustodyIntegrationEnabled } returns true
+    config.features = Features()
+    config.features.accountCreation = false
+    config.features.claimableBalances = false
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
+    config.validate(config, errors)
+    assertFalse(errors.hasErrors())
+  }
+
+  @Test
+  fun `test invalid deposit info generator type with custody integration`() {
+    every { custodyConfig.isCustodyIntegrationEnabled } returns true
+    config.features = Features()
+    config.features.accountCreation = false
+    config.features.claimableBalances = false
+    config.validate(config, errors)
+    assertEquals("sep24-deposit-info-generator-type", errors.allErrors[0].code)
+  }
+
   @Test
   fun `test validation rejecting missing more_info url jwt secret`() {
     every { secretConfig.sep24MoreInfoUrlJwtSecret } returns null
@@ -98,9 +126,10 @@ class Sep24ConfigTest {
 
   @Test
   fun `test validate accountCreation = true and claimableBalances = true with custody integration`() {
-    config.features = Sep24Config.Features()
+    config.features = Features()
     config.features.accountCreation = true
     config.features.claimableBalances = true
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
     every { custodyConfig.isCustodyIntegrationEnabled } returns true
     config.validate(config, errors)
     assertEquals("sep24-features-account_creation-not-supported", errors.allErrors[0].code)
@@ -109,20 +138,20 @@ class Sep24ConfigTest {
 
   @Test
   fun `test validate accountCreation = false and claimableBalances = false with custody integration`() {
-    config.features = Sep24Config.Features()
+    config.features = Features()
     config.features.accountCreation = false
     config.features.claimableBalances = false
-    every { custodyConfig.type } returns FIREBLOCKS
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
+    every { custodyConfig.isCustodyIntegrationEnabled } returns true
     config.validate(config, errors)
     assertFalse(errors.hasErrors())
   }
 
   @Test
   fun `test validate accountCreation = true and claimableBalances = true with disabled custody integration`() {
-    config.features = Sep24Config.Features()
+    config.features = Features()
     config.features.accountCreation = true
     config.features.claimableBalances = true
-    every { custodyConfig.type } returns NONE
     config.validate(config, errors)
     assertFalse(errors.hasErrors())
   }
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep31ConfigTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep31ConfigTest.kt
new file mode 100644
index 0000000000..bbe046e9cf
--- /dev/null
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep31ConfigTest.kt
@@ -0,0 +1,57 @@
+package org.stellar.anchor.platform.config
+
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.validation.BindException
+import org.springframework.validation.Errors
+import org.stellar.anchor.config.CustodyConfig
+import org.stellar.anchor.config.Sep31Config.DepositInfoGeneratorType
+
+class Sep31ConfigTest {
+  lateinit var config: PropertySep31Config
+  lateinit var errors: Errors
+  lateinit var custodyConfig: CustodyConfig
+
+  @BeforeEach
+  fun setUp() {
+    custodyConfig = mockk()
+    every { custodyConfig.isCustodyIntegrationEnabled } returns false
+
+    config = PropertySep31Config(custodyConfig)
+    config.enabled = true
+    errors = BindException(config, "config")
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.SELF
+  }
+
+  @Test
+  fun `test valid sep24 configuration`() {
+    config.validate(config, errors)
+    assertFalse(errors.hasErrors())
+  }
+
+  @Test
+  fun `test invalid deposit info generator type`() {
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
+    config.validate(config, errors)
+    assertEquals("sep31-deposit-info-generator-type", errors.allErrors[0].code)
+  }
+
+  @Test
+  fun `test valid sep24 configuration with custody integration`() {
+    every { custodyConfig.isCustodyIntegrationEnabled } returns true
+    config.depositInfoGeneratorType = DepositInfoGeneratorType.CUSTODY
+    config.validate(config, errors)
+    assertFalse(errors.hasErrors())
+  }
+
+  @Test
+  fun `test invalid deposit info generator type with custody integration`() {
+    every { custodyConfig.isCustodyIntegrationEnabled } returns true
+    config.validate(config, errors)
+    assertEquals("sep31-deposit-info-generator-type", errors.allErrors[0].code)
+  }
+}
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
index d1961b3a60..b1d3b2fb0b 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
@@ -20,6 +20,7 @@ import org.stellar.anchor.sep24.MoreInfoUrlConstructor
 import org.stellar.anchor.sep24.Sep24Helper
 import org.stellar.anchor.sep24.Sep24Helper.fromTxn
 import org.stellar.anchor.sep24.Sep24TransactionStore
+import org.stellar.anchor.sep31.Sep31TransactionStore
 import org.stellar.anchor.util.StringHelper.json
 import org.stellar.sdk.KeyPair
 
@@ -32,6 +33,7 @@ class ClientStatusCallbackHandlerTest {
   private lateinit var event: AnchorEvent
 
   @MockK(relaxed = true) private lateinit var sep24TransactionStore: Sep24TransactionStore
+  @MockK(relaxed = true) private lateinit var sep31TransactionStore: Sep31TransactionStore
   @MockK(relaxed = true) private lateinit var assetService: AssetService
   @MockK(relaxed = true) lateinit var moreInfoUrlConstructor: MoreInfoUrlConstructor
 
@@ -43,6 +45,7 @@ class ClientStatusCallbackHandlerTest {
     clientConfig.callbackUrl = "https://callback.circle.com/api/v1/anchor/callback"
 
     sep24TransactionStore = mockk<Sep24TransactionStore>()
+    sep31TransactionStore = mockk<Sep31TransactionStore>()
     every { sep24TransactionStore.findByTransactionId(any()) } returns null
     mockkStatic(Sep24Helper::class)
     every { fromTxn(any(), any(), any()) } returns mockk<TransactionResponse>()
@@ -61,13 +64,7 @@ class ClientStatusCallbackHandlerTest {
     event.transaction.sep = PlatformTransactionData.Sep.SEP_24
 
     handler =
-      ClientStatusCallbackHandler(
-        secretConfig,
-        clientConfig,
-        sep24TransactionStore,
-        assetService,
-        moreInfoUrlConstructor
-      )
+      ClientStatusCallbackHandler(secretConfig, clientConfig, assetService, moreInfoUrlConstructor)
   }
 
   @Test
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/DoStellarRefundHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/DoStellarRefundHandlerTest.kt
index f52bcfce72..ceb425501e 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/DoStellarRefundHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/DoStellarRefundHandlerTest.kt
@@ -372,6 +372,8 @@ class DoStellarRefundHandlerTest {
     expectedResponse.amountOut = Amount("1", STELLAR_USDC)
     expectedResponse.amountFee = Amount("0.1", FIAT_USD)
     expectedResponse.updatedAt = sep24TxnCapture.captured.updatedAt
+    expectedResponse.refundMemo = MEMO
+    expectedResponse.refundMemoType = MEMO_TYPE
 
     JSONAssert.assertEquals(
       gson.toJson(expectedResponse),
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/service/PaymentOperationToEventListenerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/service/PaymentOperationToEventListenerTest.kt
index e40fd9f01b..51c0881e0e 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/service/PaymentOperationToEventListenerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/service/PaymentOperationToEventListenerTest.kt
@@ -84,6 +84,8 @@ class PaymentOperationToEventListenerTest {
     p.transactionHash = "1ad62e48724426be96cf2cdb65d5dacb8fac2e403e50bedb717bfc8eaf05af30"
     p.transactionMemo = "my_memo_2"
     p.assetType = "credit_alphanum4"
+    p.amount = "1"
+    p.assetName = "FOO:GBZ4HPSEHKEEJ6MOZBSVV2B3LE27EZLV6LJY55G47V7BGBODWUXQM364"
     p.sourceAccount = "GBT7YF22QEVUDUTBUIS2OWLTZMP7Z4J4ON6DCSHR3JXYTZRKCPXVV5J5"
     p.to = "GBZ4HPSEHKEEJ6MOZBSVV2B3LE27EZLV6LJY55G47V7BGBODWUXQM364"
     var slotMemo = slot<String>()
@@ -96,6 +98,8 @@ class PaymentOperationToEventListenerTest {
         capture(slotStatus)
       )
     } returns null
+    every { sep24TransactionStore.findOneByToAccountAndMemoAndStatus(any(), any(), any()) } returns
+      null
     paymentOperationToEventListener.onReceived(p)
     verify(exactly = 1) {
       sep31TransactionStore.findByStellarAccountIdAndMemoAndStatus(
diff --git a/service-runner/src/main/resources/profiles/default-custody-rpc/test.env b/service-runner/src/main/resources/profiles/default-custody-rpc/test.env
index 937004b2fd..335c9eb49f 100644
--- a/service-runner/src/main/resources/profiles/default-custody-rpc/test.env
+++ b/service-runner/src/main/resources/profiles/default-custody-rpc/test.env
@@ -13,4 +13,5 @@ run_all_servers=true
 app.enableTest=true
 app.custodyEnabled=true
 app.rpcEnabled=true
+wallet.hostname=wallet-server:8092
 sep24.interactiveJwtKey=secret_sep24_interactive_url_jwt_secret
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/default-custody/test.env b/service-runner/src/main/resources/profiles/default-custody/test.env
index 854fab7aca..b6e97947f5 100644
--- a/service-runner/src/main/resources/profiles/default-custody/test.env
+++ b/service-runner/src/main/resources/profiles/default-custody/test.env
@@ -13,4 +13,5 @@ run_all_servers=true
 app.enableTest=true
 app.custodyEnabled=true
 app.rpcEnabled=false
+wallet.hostname=wallet-server:8092
 sep24.interactiveJwtKey=secret_sep24_interactive_url_jwt_secret
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/default-rpc/test.env b/service-runner/src/main/resources/profiles/default-rpc/test.env
index 7f0b445037..fd9c27d146 100644
--- a/service-runner/src/main/resources/profiles/default-rpc/test.env
+++ b/service-runner/src/main/resources/profiles/default-rpc/test.env
@@ -13,4 +13,5 @@ run_all_servers=true
 app.enableTest=true
 app.custodyEnabled=false
 app.rpcEnabled=true
+wallet.hostname=wallet-server:8092
 sep24.interactiveJwtKey=secret_sep24_interactive_url_jwt_secret
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/default/test.env b/service-runner/src/main/resources/profiles/default/test.env
index 270b024b34..a72993310f 100644
--- a/service-runner/src/main/resources/profiles/default/test.env
+++ b/service-runner/src/main/resources/profiles/default/test.env
@@ -13,4 +13,5 @@ run_all_servers=true
 app.enableTest=true
 app.custodyEnabled=false
 app.rpcEnabled=false
+wallet.hostname=wallet-server:8092
 sep24.interactiveJwtKey=secret_sep24_interactive_url_jwt_secret
\ No newline at end of file
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
index b082787bbf..593787f5eb 100644
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
@@ -1,31 +1,33 @@
 package org.stellar.reference.wallet
 
+import com.google.gson.JsonObject
 import java.time.Duration
 import java.time.Instant
 import java.util.*
-import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
 import org.stellar.sdk.KeyPair
 
 class CallbackService {
-  private val receivedCallbacks: MutableList<Sep24GetTransactionResponse> = mutableListOf()
+  private val receivedCallbacks: MutableList<JsonObject> = mutableListOf()
 
-  fun processCallback(receivedCallback: Sep24GetTransactionResponse) {
+  fun processCallback(receivedCallback: JsonObject) {
     receivedCallbacks.add(receivedCallback)
   }
 
   // Get all events. This is for testing purpose.
   // If txnId is not null, the events are filtered.
-  fun getCallbacks(txnId: String?): List<Sep24GetTransactionResponse> {
+  fun getCallbacks(txnId: String?): List<JsonObject> {
     if (txnId != null) {
       // filter events with txnId
-      return receivedCallbacks.filter { it.transaction.id == txnId }
+      return receivedCallbacks.filter {
+        it.getAsJsonObject("transaction")?.get("id")?.asString == txnId
+      }
     }
     // return all events
     return receivedCallbacks
   }
 
   // Get the latest event received. This is for testing purpose
-  fun getLatestCallback(): Sep24GetTransactionResponse? {
+  fun getLatestCallback(): JsonObject? {
     return receivedCallbacks.lastOrNull()
   }
 
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt
index 7a67c3503f..d32c54e252 100644
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt
@@ -1,11 +1,11 @@
 package org.stellar.reference.wallet
 
+import com.google.gson.JsonObject
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.reference.wallet.CallbackService.Companion.verifySignature
 import org.stellar.sdk.KeyPair
@@ -29,7 +29,7 @@ fun Route.callback(config: Config, callbackEventService: CallbackService) {
         return@post
       }
 
-      val event = gson.fromJson(body, Sep24GetTransactionResponse::class.java)
+      val event: JsonObject = gson.fromJson(body, JsonObject::class.java)
       callbackEventService.processCallback(event)
       call.respond("POST /callback received")
     }
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
index c2a4524d30..d18c34eb02 100644
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
@@ -30,7 +30,7 @@ class WalletServerClient(val endpoint: Url = Url("http://localhost:8092")) {
     return gson.fromJson(response.body<String>(), SendEventResponse::class.java)
   }
 
-  suspend fun getCallbackHistory(txnId: String? = null): List<Sep24GetTransactionResponse> {
+  suspend fun <T> getCallbackHistory(txnId: String? = null, responseType: Class<T>): List<T> {
     val response =
       client.get {
         url {
@@ -45,7 +45,7 @@ class WalletServerClient(val endpoint: Url = Url("http://localhost:8092")) {
     // Parse the JSON string into a list of Person objects
     return gson.fromJson(
       response.body<String>(),
-      object : TypeToken<List<Sep24GetTransactionResponse>>() {}.type
+      TypeToken.getParameterized(List::class.java, responseType).type
     )
   }