Use it only if friendbot is actually failing

stellar · Nov 14, 2024 · 5cc207b · 5cc207b
1 parent 6dc5f91
commit 5cc207b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/rpc/server.ts b/src/rpc/server.ts
@@ -977,14 +977,18 @@ export class RpcServer {
         `${friendbotUrl}?addr=${encodeURIComponent(account)}`
       );
 
-      const txMeta = await this.getTransaction(response.data.hash)
-      if (txMeta.status !== Api.GetTransactionStatus.SUCCESS) {
-        throw new Error(`Funding account ${address} failed`);
+      let meta: xdr.TransactionMeta;
+      if (!response.data.result_meta_xdr) {
+        const txMeta = await this.getTransaction(response.data.hash)
+        if (txMeta.status !== Api.GetTransactionStatus.SUCCESS) {
+          throw new Error(`Funding account ${address} failed`);
+        }
+        meta = txMeta.resultMetaXdr;
+      } else {
+        meta = xdr.TransactionMeta.fromXDR(response.data.result_meta_xdr, 'base64');
       }
 
-      const sequence = findCreatedAccountSequenceInTransactionMeta(
-        txMeta.resultMetaXdr
-      );
+      const sequence = findCreatedAccountSequenceInTransactionMeta(meta);
       return new Account(account, sequence);
     } catch (error: any) {
       if (error.response?.status === 400) {