rebase with milestone-2

package.json

@@ -54,8 +54,5 @@
       "prettier --write"
     ]
   },
-  "packageManager": "[email protected]",
-  "dependencies": {
-    "stellar-sdk": "^10.4.1"
-  }
+  "packageManager": "[email protected]"
 }

packages/common-stellar/package.json

@@ -17,7 +17,8 @@
     "@subql/types-stellar": "workspace:*",
     "js-yaml": "^4.1.0",
     "pino": "^6.13.3",
-    "reflect-metadata": "^0.1.13"
+    "reflect-metadata": "^0.1.13",
+    "stellar-sdk": "^10.4.1"
   },
   "peerDependencies": {
     "class-transformer": "*",

packages/common-stellar/src/project/models.ts

@@ -26,7 +26,7 @@ import {
 } from '@subql/types-stellar';
 import {plainToClass, Transform, Type} from 'class-transformer';
 import {IsArray, IsEnum, IsInt, IsOptional, IsString, IsObject, ValidateNested} from 'class-validator';
-import {Horizon, ServerApi} from 'stellar-sdk';
+import {Horizon} from 'stellar-sdk';
 import {SubqlStellarProcessorOptions} from './types';
 
 export class BlockFilter implements StellarBlockFilter {

packages/node/package.json

@@ -41,6 +41,7 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.2",
     "soroban-client": "^0.9.1",
+    "stellar-sdk": "^10.4.1",
     "yargs": "^16.2.0"
   },
   "peerDependencies": {

packages/node/src/stellar/api.stellar.ts

@@ -12,6 +12,7 @@ import {
   StellarOperation,
   StellarTransaction,
 } from '@subql/types-stellar';
+import { cloneDeep } from 'lodash';
 import { Server, ServerApi } from 'stellar-sdk';
 import { StellarBlockWrapped } from '../stellar/block.stellar';
 import SafeStellarProvider from './safe-api';
@@ -125,20 +126,12 @@ export class StellarApi implements ApiWrapper<StellarBlockWrapper> {
   ): Promise<StellarEffect[]> {
     const effects = (await this.api.effects().forOperation(operationId).call())
       .records;
-    const wrappedEffects: StellarEffect[] = [];
-
-    effects.forEach((effect) => {
-      const wrappedEffect: StellarEffect = {
-        ...effect,
-        ledger: null,
-        transaction: null,
-        operation: null,
-      };
-
-      wrappedEffects.push(wrappedEffect);
-    });
-
-    return wrappedEffects;
+    return effects.map((effect) => ({
+      ...effect,
+      ledger: null,
+      transaction: null,
+      operation: null,
+    }));
   }
 
   private async fetchOperationsForTransaction(
@@ -185,7 +178,7 @@ export class StellarApi implements ApiWrapper<StellarBlockWrapper> {
 
         const effects = (await this.fetchEffectsForOperation(op.id)).map(
           (effect) => {
-            effect.operation = JSON.parse(JSON.stringify(wrappedOp));
+            effect.operation = cloneDeep(wrappedOp);
             return effect;
           },
         );
@@ -229,9 +222,9 @@ export class StellarApi implements ApiWrapper<StellarBlockWrapper> {
         const operations = (
           await this.fetchOperationsForTransaction(tx.id, index + 1, sequence)
         ).map((op) => {
-          op.transaction = JSON.parse(JSON.stringify(wrappedTx));
+          op.transaction = cloneDeep(wrappedTx);
           op.effects = op.effects.map((effect) => {
-            effect.transaction = JSON.parse(JSON.stringify(wrappedTx));
+            effect.transaction = cloneDeep(wrappedTx);
             return effect;
           });
           op.events = op.events.map((event) => {
@@ -268,11 +261,11 @@ export class StellarApi implements ApiWrapper<StellarBlockWrapper> {
 
     const transactions = (await this.fetchTransactionsForLedger(sequence)).map(
       (tx) => {
-        tx.ledger = JSON.parse(JSON.stringify(wrappedLedger));
+        tx.ledger = cloneDeep(wrappedLedger);
         tx.operations = tx.operations.map((op) => {
-          op.ledger = JSON.parse(JSON.stringify(wrappedLedger));
+          op.ledger = cloneDeep(wrappedLedger);
           op.effects = op.effects.map((effect) => {
-            effect.ledger = JSON.parse(JSON.stringify(wrappedLedger));
+            effect.ledger = cloneDeep(wrappedLedger);
             return effect;
           });
           op.events = op.events.map((event) => {

packages/types/package.json

@@ -16,7 +16,8 @@
     "/dist"
   ],
   "dependencies": {
-    "soroban-client": "0.9.2"
+    "soroban-client": "0.9.2",
+    "stellar-sdk": "^10.4.1"
   },
   "stableVersion": "2.2.3-2"
 }

packages/types/src/stellar/interfaces.ts

@@ -34,7 +34,7 @@ export type StellarOperation<T extends Horizon.BaseOperationResponse = ServerApi
   events: SorobanEvent[];
 };
 
-export type StellarEffect<T extends BaseEffectRecord = ServerApi.EffectRecord> = T & {
+export type StellarEffect<T extends BaseEffectRecord = ServerApi.EffectRecord> = Omit<T, 'operation'> & {
   operation: StellarOperation;
   transaction: StellarTransaction;
   ledger: StellarBlock;