feat(rpc): add fundAddress() method for funding accounts and

yripper · yripper · commit f3c8071d768f · 2026-01-16T19:08:52.000-03:00
contracts

- Add fundAddress() that supports both G... and C... addresses
- Returns GetSuccessfulTransactionResponse for consistent return type
- Mark requestAirdrop() as deprecated
- Add unit tests for fundAddress()
diff --git a/src/rpc/api.ts b/src/rpc/api.ts
@@ -48,14 +48,6 @@ export namespace Api {
     protocolVersion: string;
   }
 
-  /**
-   * Result returned when funding a contract address via friendbot.
-   */
-  export interface ContractFundingResult {
-    contractId: string;
-    hash: string;
-  }
-
   /** @see https://developers.stellar.org/docs/data/rpc/api-reference/methods/getLatestLedger */
   export interface GetLatestLedgerResponse {
     id: string;
diff --git a/src/rpc/server.ts b/src/rpc/server.ts
@@ -1194,52 +1194,40 @@ export class RpcServer {
   }
 
   /**
-   * Fund a new account or contract using the network's Friendbot faucet, if any.
+   * Fund a new account using the network's Friendbot faucet, if any.
    *
    * @param {string | Account} address The address or account instance that we
-   *    want to create and fund with Friendbot. Supports both G... (account) and
-   *    C... (contract) addresses.
+   *    want to create and fund with Friendbot
    * @param {string} [friendbotUrl] Optionally, an explicit address for
    *    friendbot (by default: this calls the Soroban RPC
    *    {@link module:rpc.Server#getNetwork | getNetwork} method to try to
    *    discover this network's Friendbot url).
-   * @returns {Promise<Account | Api.ContractFundingResult>} An {@link Account}
-   *    object for the created account (G... addresses), or a
-   *    {@link Api.ContractFundingResult} for contract addresses (C...). For
-   *    existing accounts, returns the account with populated sequence number
-   *    (note that accounts will not be "topped off" if they already exist).
+   * @returns {Promise<Account>} An {@link Account} object for the created
+   *    account, or the existing account if it's already funded with the
+   *    populated sequence number (note that the account will not be "topped
+   *    off" if it already exists)
    * @throws {Error} If Friendbot is not configured on this network or request failure
    *
    * @see {@link https://developers.stellar.org/docs/learn/fundamentals/networks#friendbot | Friendbot docs}
    * @see {@link module:Friendbot.Api.Response}
    *
-   * @example
-   * // Funding an account (G... address)
-   * server
-   *    .requestAirdrop("GBZC6Y2Y7Q3ZQ2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4")
-   *    .then((result) => {
-   *      if (result instanceof Account) {
-   *        console.log("accountCreated:", result.accountId());
-   *      }
-   *    });
+   * @deprecated Use {@link Server.fundAddress} instead, which supports both
+   *    account (G...) and contract (C...) addresses.
    *
    * @example
-   * // Funding a contract (C... address)
    * server
-   *    .requestAirdrop("CBZC6Y2Y7Q3ZQ2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4")
-   *    .then((result) => {
-   *      if ('contractId' in result) {
-   *        console.log("contractFunded:", result.contractId, "hash:", result.hash);
-   *      }
+   *    .requestAirdrop("GBZC6Y2Y7Q3ZQ2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4QZJ2XZ3Z5YXZ6Z7Z2Y4")
+   *    .then((accountCreated) => {
+   *      console.log("accountCreated:", accountCreated);
+   *    }).catch((error) => {
+   *      console.error("error:", error);
    *    });
    */
   public async requestAirdrop(
     address: string | Pick<Account, "accountId">,
     friendbotUrl?: string,
-  ): Promise<Account | Api.ContractFundingResult> {
+  ): Promise<Account> {
     const account = typeof address === "string" ? address : address.accountId();
-    const isContract = StrKey.isValidContract(account);
-
     friendbotUrl = friendbotUrl || (await this.getNetwork()).friendbotUrl;
     if (!friendbotUrl) {
       throw new Error("No friendbot URL configured for current network");
@@ -1250,14 +1238,6 @@ export class RpcServer {
         `${friendbotUrl}?addr=${encodeURIComponent(account)}`,
       );
 
-      // Contract addresses don't create accounts - they receive funds via SAC transfer
-      if (isContract) {
-        return {
-          contractId: account,
-          hash: response.data.hash,
-        };
-      }
-
       let meta: xdr.TransactionMeta;
       if (!response.data.result_meta_xdr) {
         const txMeta = await this.getTransaction(response.data.hash);
@@ -1285,6 +1265,57 @@ export class RpcServer {
     }
   }
 
+  /**
+   * Fund an address using the network's Friendbot faucet, if any.
+   *
+   * This method supports both account (G...) and contract (C...) addresses.
+   *
+   * @param {string} address The address to fund. Can be either a Stellar
+   *    account (G...) or contract (C...) address.
+   * @param {string} [friendbotUrl] Optionally, an explicit Friendbot URL
+   *    (by default: this calls the Soroban RPC
+   *    {@link module:rpc.Server#getNetwork | getNetwork} method to try to
+   *    discover this network's Friendbot url).
+   * @returns {Promise<Api.GetSuccessfulTransactionResponse>} The transaction
+   *    response from the Friendbot funding transaction.
+   * @throws {Error} If Friendbot is not configured on this network or the
+   *    funding transaction fails.
+   *
+   * @see {@link https://developers.stellar.org/docs/learn/fundamentals/networks#friendbot | Friendbot docs}
+   *
+   * @example
+   * // Funding an account (G... address)
+   * const tx = await server.fundAddress("GBZC6Y2Y7...");
+   * console.log("Funded! Hash:", tx.txHash);
+   * // If you need the Account object:
+   * const account = await server.getAccount("GBZC6Y2Y7...");
+   *
+   * @example
+   * // Funding a contract (C... address)
+   * const tx = await server.fundAddress("CBZC6Y2Y7...");
+   * console.log("Contract funded! Hash:", tx.txHash);
+   */
+  public async fundAddress(
+    address: string,
+    friendbotUrl?: string,
+  ): Promise<Api.GetSuccessfulTransactionResponse> {
+    friendbotUrl = friendbotUrl || (await this.getNetwork()).friendbotUrl;
+    if (!friendbotUrl) {
+      throw new Error("No friendbot URL configured for current network");
+    }
+
+    const response = await this.httpClient.post<FriendbotApi.Response>(
+      `${friendbotUrl}?addr=${encodeURIComponent(address)}`,
+    );
+
+    const txResponse = await this.getTransaction(response.data.hash);
+    if (txResponse.status !== Api.GetTransactionStatus.SUCCESS) {
+      throw new Error(`Funding address ${address} failed`);
+    }
+
+    return txResponse;
+  }
+
   /**
    * Provides an analysis of the recent fee stats for regular and smart
    * contract operations.
diff --git a/test/unit/server/soroban/request_airdrop.test.ts b/test/unit/server/soroban/request_airdrop.test.ts
@@ -370,14 +370,89 @@ describe("Server#requestAirdrop", () => {
     expect(mockPost).toHaveBeenCalledTimes(3);
   });
 
-  it("returns ContractFundingResult for contract addresses (C...)", async () => {
+});
+
+describe("Server#fundAddress", () => {
+  let server: any;
+  let mockPost: any;
+
+  // Valid XDR for transaction meta (from get_transaction.test.ts)
+  const metaV4Xdr =
+    "AAAAAgAAAAIAAAADAtL5awAAAAAAAAAAS0CFMhOtWUKJWerx66zxkxORaiH6/3RUq7L8zspD5RoAAAAAAcm9QAKVkpMAAHpMAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAwAAAAAC0vi5AAAAAGTB02oAAAAAAAAAAQLS+WsAAAAAAAAAAEtAhTITrVlCiVnq8eus8ZMTkWoh+v90VKuy/M7KQ+UaAAAAAAHJvUAClZKTAAB6TQAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAMAAAAAAtL5awAAAABkwdd1AAAAAAAAAAEAAAAGAAAAAwLS+VQAAAACAAAAAG4cwu71zHNXx3jHCzRGOIthcnfwRgfN2f/AoHFLLMclAAAAAEySDkgAAAAAAAAAAkJVU0lORVNTAAAAAAAAAAC3JfDeo9vreItKNPoe74EkFIqWybeUQNFvLvURhHtskAAAAAAeQtHTL5f6TAAAXH0AAAAAAAAAAAAAAAAAAAABAtL5awAAAAIAAAAAbhzC7vXMc1fHeMcLNEY4i2Fyd/BGB83Z/8CgcUssxyUAAAAATJIOSAAAAAAAAAACQlVTSU5FU1MAAAAAAAAAALcl8N6j2+t4i0o0+h7vgSQUipbJt5RA0W8u9RGEe2yQAAAAAB5C0dNHf4CAAACLCQAAAAAAAAAAAAAAAAAAAAMC0vlUAAAAAQAAAABuHMLu9cxzV8d4xws0RjiLYXJ38EYHzdn/wKBxSyzHJQAAAAJCVVNJTkVTUwAAAAAAAAAAtyXw3qPb63iLSjT6Hu+BJBSKlsm3lEDRby71EYR7bJAAAAAAAABAL3//////////AAAAAQAAAAEAE3H3TnhnuQAAAAAAAAAAAAAAAAAAAAAAAAABAtL5awAAAAEAAAAAbhzC7vXMc1fHeMcLNEY4i2Fyd/BGB83Z/8CgcUssxyUAAAACQlVTSU5FU1MAAAAAAAAAALcl8N6j2+t4i0o0+h7vgSQUipbJt5RA0W8u9RGEe2yQAAAAAAAAQC9//////////wAAAAEAAAABABNx9J6Z4RkAAAAAAAAAAAAAAAAAAAAAAAAAAwLS+WsAAAAAAAAAAG4cwu71zHNXx3jHCzRGOIthcnfwRgfN2f/AoHFLLMclAAAAH37+zXQCXdRTAAASZAAAApIAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAEAAABbBXKIigAAABhZWyiOAAAAAgAAAAAAAAAAAAAAAAAAAAMAAAAAAtL0awAAAABkwbqrAAAAAAAAAAEC0vlrAAAAAAAAAABuHMLu9cxzV8d4xws0RjiLYXJ38EYHzdn/wKBxSyzHJQAAAB9+/s10Al3UUwAAEmQAAAKSAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAABAAAAWwVyiIoAAAAYWVsojgAAAAIAAAAAAAAAAAAAAAAAAAADAAAAAALS9GsAAAAAZMG6qwAAAAAAAAAA";
+
+  const successTxResponse = (hash: string) => ({
+    data: {
+      id: 1,
+      result: {
+        status: "SUCCESS",
+        txHash: hash,
+        latestLedger: 100,
+        latestLedgerCloseTime: 12345,
+        oldestLedger: 50,
+        oldestLedgerCloseTime: 500,
+        ledger: 12345,
+        createdAt: 123456789010,
+        applicationOrder: 2,
+        feeBump: false,
+        envelopeXdr:
+          "AAAAAgAAAAAT/LQZdYz0FcQ4Xwyg8IM17rkUx3pPCCWLu+SowQ/T+gBLB24poiQa9iwAngAAAAEAAAAAAAAAAAAAAABkwdeeAAAAAAAAAAEAAAABAAAAAC/9E8hDhnktyufVBS5tqA734Yz5XrLX2XNgBgH/YEkiAAAADQAAAAAAAAAAAAA1/gAAAAAv/RPIQ4Z5Lcrn1QUubagO9+GM+V6y19lzYAYB/2BJIgAAAAAAAAAAAAA1/gAAAAQAAAACU0lMVkVSAAAAAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAAAVNHWAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AAAACUEFMTEFESVVNAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAAAlNJTFZFUgAAAAAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAAAAAAAACwQ/T+gAAAEA+ztVEKWlqHXNnqy6FXJeHr7TltHzZE6YZm5yZfzPIfLaqpp+5cyKotVkj3d89uZCQNsKsZI48uoyERLne+VwL/2BJIgAAAEA7323gPSaezVSa7Vi0J4PqsnklDH1oHLqNBLwi5EWo5W7ohLGObRVQZ0K0+ufnm4hcm9J4Cuj64gEtpjq5j5cM",
+        resultXdr:
+          "AAAAAAAAAGQAAAAAAAAAAQAAAAAAAAANAAAAAAAAAAUAAAACZ4W6fmN63uhVqYRcHET+D2NEtJvhCIYflFh9GqtY+AwAAAACU0lMVkVSAAAAAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAYW0toL2gAAAAAAAAAAAAANf4AAAACcgyAkXD5kObNTeRYciLh7R6ES/zzKp0n+cIK3Y6TjBkAAAABU0dYAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAGlGnIJrXAAAAAlNJTFZFUgAAAAAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAGFtLaC9oAAAAApmc7UgUBInrDvij8HMSridx2n1w3I8TVEn4sLr1LSpmAAAAAlBBTExBRElVTQAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAIUz88EqYAAAAAVNHWAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABpRpyCa1wAAAAKYUsaaCZ233xB1p+lG7YksShJWfrjsmItbokiR3ifa0gAAAAJTSUxWRVIAAAAAAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABv52PPa5wAAAAJQQUxMQURJVU0AAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AACFM/PBKmAAAAAJnhbp+Y3re6FWphFwcRP4PY0S0m+EIhh+UWH0aq1j4DAAAAAAAAAAAAAA9pAAAAAJTSUxWRVIAAAAAAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABv52PPa5wAAAAAv/RPIQ4Z5Lcrn1QUubagO9+GM+V6y19lzYAYB/2BJIgAAAAAAAAAAAAA9pAAAAAA=",
+        resultMetaXdr: metaV4Xdr,
+        events: {
+          contractEventsXdr: [],
+          transactionEventsXdr: [],
+        },
+      },
+    },
+  });
+
+  beforeEach(() => {
+    server = new Server(serverUrl);
+    mockPost = vi.spyOn(server.httpClient, "post");
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("funds an account address (G...) and returns transaction response", async () => {
+    const friendbotUrl = "https://friendbot.stellar.org";
+    const accountId =
+      "GBZXN7PIRZGNMHGA7MUUUF4GWPY5AYPV6LY4UV2GL6VJGIQRXFDNMADI";
+    const hash = "ae9f315c048d87a5f853bc15bf284a2c3c89eb0e1cb38c10409b77a877b830a8";
+
+    const networkResult = {
+      friendbotUrl,
+      passphrase: Networks.FUTURENET,
+      protocolVersion: 20,
+    };
+    const networkResponse = { data: { result: networkResult } };
+
+    const friendbotResponse = {
+      status: 200,
+      data: { hash },
+    };
+
+    mockPost
+      .mockResolvedValueOnce(networkResponse) // getNetwork call
+      .mockResolvedValueOnce(friendbotResponse) // friendbot call
+      .mockResolvedValueOnce(successTxResponse(hash)); // getTransaction call
+
+    const result = await server.fundAddress(accountId);
+
+    expect(result.status).toBe("SUCCESS");
+    expect(result.txHash).toBe(hash);
+    expect(mockPost).toHaveBeenCalledWith(`${friendbotUrl}?addr=${accountId}`);
+    expect(mockPost).toHaveBeenCalledTimes(3);
+  });
+
+  it("funds a contract address (C...) and returns transaction response", async () => {
     const friendbotUrl = "https://friendbot.stellar.org";
-    // Valid contract address (C...)
     const contractId = StellarSdk.StrKey.encodeContract(
       Buffer.from("0".repeat(64), "hex"),
     );
-    const hash =
-      "ae9f315c048d87a5f853bc15bf284a2c3c89eb0e1cb38c10409b77a877b830a8";
+    const hash = "ae9f315c048d87a5f853bc15bf284a2c3c89eb0e1cb38c10409b77a877b830a8";
 
     const networkResult = {
       friendbotUrl,
@@ -386,55 +461,119 @@ describe("Server#requestAirdrop", () => {
     };
     const networkResponse = { data: { result: networkResult } };
 
-    // Mock the friendbot call - contract funding returns hash but no account creation
     const friendbotResponse = {
       status: 200,
-      data: {
-        hash,
-        result_meta_xdr: "someXdr", // Doesn't matter - should not be parsed for contracts
-      },
+      data: { hash },
     };
 
     mockPost
       .mockResolvedValueOnce(networkResponse) // getNetwork call
-      .mockResolvedValueOnce(friendbotResponse); // friendbot call
+      .mockResolvedValueOnce(friendbotResponse) // friendbot call
+      .mockResolvedValueOnce(successTxResponse(hash)); // getTransaction call
 
-    const result = await server.requestAirdrop(contractId);
+    const result = await server.fundAddress(contractId);
 
-    // Should return ContractFundingResult, not Account
-    expect(result).not.toBeInstanceOf(StellarSdk.Account);
-    expect(result).toHaveProperty("contractId", contractId);
-    expect(result).toHaveProperty("hash", hash);
-    expect(mockPost).toHaveBeenCalledWith(serverUrl, {
-      jsonrpc: "2.0",
-      id: 1,
-      method: "getNetwork",
-      params: null,
-    });
+    expect(result.status).toBe("SUCCESS");
+    expect(result.txHash).toBe(hash);
     expect(mockPost).toHaveBeenCalledWith(`${friendbotUrl}?addr=${contractId}`);
-    expect(mockPost).toHaveBeenCalledTimes(2);
+    expect(mockPost).toHaveBeenCalledTimes(3);
   });
 
-  it("does not throw 'No account created' for contract addresses", async () => {
+  it("uses custom friendbot URL when provided", async () => {
     const customFriendbotUrl = "https://custom-friendbot.example.com";
-    const contractId = StellarSdk.StrKey.encodeContract(
-      Buffer.from("1".repeat(64), "hex"),
+    const accountId =
+      "GBZXN7PIRZGNMHGA7MUUUF4GWPY5AYPV6LY4UV2GL6VJGIQRXFDNMADI";
+    const hash = "somehash123";
+
+    const friendbotResponse = {
+      status: 200,
+      data: { hash },
+    };
+
+    mockPost
+      .mockResolvedValueOnce(friendbotResponse) // friendbot call
+      .mockResolvedValueOnce(successTxResponse(hash)); // getTransaction call
+
+    const result = await server.fundAddress(accountId, customFriendbotUrl);
+
+    expect(result.status).toBe("SUCCESS");
+    // Should not call getNetwork when custom URL provided
+    expect(mockPost).not.toHaveBeenCalledWith(
+      expect.anything(),
+      expect.objectContaining({ method: "getNetwork" }),
+    );
+    expect(mockPost).toHaveBeenCalledWith(
+      `${customFriendbotUrl}?addr=${accountId}`,
     );
+    expect(mockPost).toHaveBeenCalledTimes(2);
+  });
+
+  it("throws error when no friendbot URL is configured", async () => {
+    const accountId =
+      "GBZXN7PIRZGNMHGA7MUUUF4GWPY5AYPV6LY4UV2GL6VJGIQRXFDNMADI";
+
+    const networkResult = {
+      friendbotUrl: undefined,
+      passphrase: Networks.FUTURENET,
+      protocolVersion: 20,
+    };
+    const networkResponse = { data: { result: networkResult } };
+
+    mockPost.mockResolvedValueOnce(networkResponse);
+
+    await expect(server.fundAddress(accountId)).rejects.toThrow(
+      "No friendbot URL configured",
+    );
+  });
+
+  it("throws error when funding fails", async () => {
+    const friendbotUrl = "https://friendbot.stellar.org";
+    const accountId =
+      "GBZXN7PIRZGNMHGA7MUUUF4GWPY5AYPV6LY4UV2GL6VJGIQRXFDNMADI";
     const hash = "somehash123";
 
+    const networkResult = {
+      friendbotUrl,
+      passphrase: Networks.FUTURENET,
+      protocolVersion: 20,
+    };
+    const networkResponse = { data: { result: networkResult } };
+
     const friendbotResponse = {
       status: 200,
       data: { hash },
     };
 
-    mockPost.mockResolvedValueOnce(friendbotResponse);
+    const failedTxResponse = {
+      data: {
+        id: 1,
+        result: {
+          status: "FAILED",
+          txHash: hash,
+          latestLedger: 100,
+          latestLedgerCloseTime: 12345,
+          oldestLedger: 50,
+          oldestLedgerCloseTime: 500,
+          ledger: 12345,
+          createdAt: 123456789010,
+          applicationOrder: 2,
+          feeBump: false,
+          envelopeXdr:
+            "AAAAAgAAAAAT/LQZdYz0FcQ4Xwyg8IM17rkUx3pPCCWLu+SowQ/T+gBLB24poiQa9iwAngAAAAEAAAAAAAAAAAAAAABkwdeeAAAAAAAAAAEAAAABAAAAAC/9E8hDhnktyufVBS5tqA734Yz5XrLX2XNgBgH/YEkiAAAADQAAAAAAAAAAAAA1/gAAAAAv/RPIQ4Z5Lcrn1QUubagO9+GM+V6y19lzYAYB/2BJIgAAAAAAAAAAAAA1/gAAAAQAAAACU0lMVkVSAAAAAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAAAVNHWAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AAAACUEFMTEFESVVNAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAAAlNJTFZFUgAAAAAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAAAAAAAACwQ/T+gAAAEA+ztVEKWlqHXNnqy6FXJeHr7TltHzZE6YZm5yZfzPIfLaqpp+5cyKotVkj3d89uZCQNsKsZI48uoyERLne+VwL/2BJIgAAAEA7323gPSaezVSa7Vi0J4PqsnklDH1oHLqNBLwi5EWo5W7ohLGObRVQZ0K0+ufnm4hcm9J4Cuj64gEtpjq5j5cM",
+          resultXdr:
+            "AAAAAAAAAGQAAAAAAAAAAQAAAAAAAAANAAAAAAAAAAUAAAACZ4W6fmN63uhVqYRcHET+D2NEtJvhCIYflFh9GqtY+AwAAAACU0lMVkVSAAAAAAAAAAAAAFDutWuu6S6UPJBrotNSgfmXa27M++63OT7TYn1qjgy+AAAYW0toL2gAAAAAAAAAAAAANf4AAAACcgyAkXD5kObNTeRYciLh7R6ES/zzKp0n+cIK3Y6TjBkAAAABU0dYAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAGlGnIJrXAAAAAlNJTFZFUgAAAAAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAGFtLaC9oAAAAApmc7UgUBInrDvij8HMSridx2n1w3I8TVEn4sLr1LSpmAAAAAlBBTExBRElVTQAAAAAAAABQ7rVrrukulDyQa6LTUoH5l2tuzPvutzk+02J9ao4MvgAAIUz88EqYAAAAAVNHWAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABpRpyCa1wAAAAKYUsaaCZ233xB1p+lG7YksShJWfrjsmItbokiR3ifa0gAAAAJTSUxWRVIAAAAAAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABv52PPa5wAAAAJQQUxMQURJVU0AAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AACFM/PBKmAAAAAJnhbp+Y3re6FWphFwcRP4PY0S0m+EIhh+UWH0aq1j4DAAAAAAAAAAAAAA9pAAAAAJTSUxWRVIAAAAAAAAAAAAAUO61a67pLpQ8kGui01KB+Zdrbsz77rc5PtNifWqODL4AABv52PPa5wAAAAAv/RPIQ4Z5Lcrn1QUubagO9+GM+V6y19lzYAYB/2BJIgAAAAAAAAAAAAA9pAAAAAA=",
+          resultMetaXdr: metaV4Xdr,
+        },
+      },
+    };
 
-    // Should NOT throw "No account created in transaction"
-    const result = await server.requestAirdrop(contractId, customFriendbotUrl);
+    mockPost
+      .mockResolvedValueOnce(networkResponse)
+      .mockResolvedValueOnce(friendbotResponse)
+      .mockResolvedValueOnce(failedTxResponse);
 
-    expect(result).toEqual({
-      contractId,
-      hash,
-    });
+    await expect(server.fundAddress(accountId)).rejects.toThrow(
+      `Funding address ${accountId} failed`,
+    );
   });
 });
