From 990549210e3c56c7059f5b43264203384dc30041 Mon Sep 17 00:00:00 2001
From: mirunagherman <miruna@interledger.foundation>
Date: Mon, 5 Oct 2026 15:14:32 +0300
Subject: [PATCH 1/3] chore: create wallet address with v2 endpoint

---
 .../backend/src/rafiki/rafiki-client.ts       | 31 +++++++++++++++++++
 .../backend/src/walletAddress/service.ts      | 15 ++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/packages/wallet/backend/src/rafiki/rafiki-client.ts b/packages/wallet/backend/src/rafiki/rafiki-client.ts
index 277c8ae45..21b401fa7 100644
--- a/packages/wallet/backend/src/rafiki/rafiki-client.ts
+++ b/packages/wallet/backend/src/rafiki/rafiki-client.ts
@@ -269,6 +269,37 @@ export class RafikiClient implements IRafikiClient {
     return response.payment as OutgoingPayment
   }
 
+  public async createRhyzaWalletAddress(
+    address: string,
+    assetCode: string,
+    publicName: string,
+    isActive: boolean
+  ) {
+    const response = await fetch(`${process.env.RHYZA_ADMIN_API_URL}/wallet-addresses`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        address,
+        assetCode,
+        publicName,
+        isActive
+      })
+    })
+
+    if (response.status === 201) {
+      return await response.json() as {id: string, address: string}
+    }
+
+    if (response.status === 409) {
+      throw new Error()
+    }
+
+    throw new Error(`Failed to create wallet address: ${response.statusText}`)
+    
+  }
+
   public async createRafikiWalletAddress(
     publicName: string,
     assetId: string,
diff --git a/packages/wallet/backend/src/walletAddress/service.ts b/packages/wallet/backend/src/walletAddress/service.ts
index db66ab960..795db52bf 100644
--- a/packages/wallet/backend/src/walletAddress/service.ts
+++ b/packages/wallet/backend/src/walletAddress/service.ts
@@ -118,19 +118,20 @@ export class WalletAddressService implements IWalletAddressService {
         )
       }
     } else {
-      const assetId = account.assetId
-      const rafikiWalletAddress =
-        await this.rafikiClient.createRafikiWalletAddress(
+      const assetCode = account.assetCode
+      const rhyzaWalletAddress =
+        await this.rafikiClient.createRhyzaWalletAddress(
+          url,
+          assetCode,
           args.publicName,
-          assetId,
-          url
+          true
         )
 
       walletAddress = await WalletAddress.query().insert({
-        url: rafikiWalletAddress.address,
+        url: rhyzaWalletAddress.address,
         publicName: args.publicName,
         accountId: args.accountId,
-        id: rafikiWalletAddress.id,
+        id: rhyzaWalletAddress.id,
         isCard: args.isCard
       })
 

From fcca670c43502fca6b2342acfd7c91bdfbfb261f Mon Sep 17 00:00:00 2001
From: mirunagherman <miruna@interledger.foundation>
Date: Mon, 5 Oct 2026 15:18:00 +0300
Subject: [PATCH 2/3] style: fix formatting issues

---
 .../backend/src/rafiki/rafiki-client.ts       | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/wallet/backend/src/rafiki/rafiki-client.ts b/packages/wallet/backend/src/rafiki/rafiki-client.ts
index 21b401fa7..99b5ce5a8 100644
--- a/packages/wallet/backend/src/rafiki/rafiki-client.ts
+++ b/packages/wallet/backend/src/rafiki/rafiki-client.ts
@@ -275,21 +275,24 @@ export class RafikiClient implements IRafikiClient {
     publicName: string,
     isActive: boolean
   ) {
-    const response = await fetch(`${process.env.RHYZA_ADMIN_API_URL}/wallet-addresses`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        address,
-        assetCode,
-        publicName,
-        isActive
-      })
-    })
+    const response = await fetch(
+      `${process.env.RHYZA_ADMIN_API_URL}/wallet-addresses`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          address,
+          assetCode,
+          publicName,
+          isActive
+        })
+      }
+    )
 
     if (response.status === 201) {
-      return await response.json() as {id: string, address: string}
+      return (await response.json()) as { id: string; address: string }
     }
 
     if (response.status === 409) {
@@ -297,7 +300,6 @@ export class RafikiClient implements IRafikiClient {
     }
 
     throw new Error(`Failed to create wallet address: ${response.statusText}`)
-    
   }
 
   public async createRafikiWalletAddress(

From 96aaab5b09f07e4baa636939c81c57568870d95f Mon Sep 17 00:00:00 2001
From: mirunagherman <miruna@interledger.foundation>
Date: Mon, 5 Oct 2026 15:26:52 +0300
Subject: [PATCH 3/3] chore: add missing createRhyzaWalletAddress mock

---
 packages/wallet/backend/tests/walletAddress/service.test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/wallet/backend/tests/walletAddress/service.test.ts b/packages/wallet/backend/tests/walletAddress/service.test.ts
index 92fd8fd1e..edf53aa4f 100644
--- a/packages/wallet/backend/tests/walletAddress/service.test.ts
+++ b/packages/wallet/backend/tests/walletAddress/service.test.ts
@@ -79,6 +79,10 @@ describe('Wallet Address Service', () => {
           id: faker.string.uuid(),
           address: faker.internet.url()
         }),
+        createRhyzaWalletAddress: () => ({
+          id: faker.string.uuid(),
+          address: faker.internet.url()
+        }),
         createRafikiWalletAddressKey: () => ({
           id: faker.string.uuid()
         }),