fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] #1102

sukhoviianastasia · 2024-12-02T14:12:48Z

Added deposit_details field on depositSchema from the backend

enum DepositDetails {
	Bitcoin { tx_id: H256, vout: u32 },
	Ethereum { tx_hashes: Vec<H256> },
	Polkadot { extrinsic_index: PolkadotExtrinsicIndex },
	Arbitrum { tx_hashes: Vec<H256> },
}

…sdk status

codecov-commenter · 2024-12-02T14:14:25Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.18%. Comparing base (cff3a22) to head (f2e6025).
Report is 9 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1102      +/-   ##
==========================================
- Coverage   87.21%   87.18%   -0.03%     
==========================================
  Files         100      100              
  Lines        1369     1366       -3     
  Branches      214      214              
==========================================
- Hits         1194     1191       -3     
  Misses        166      166              
  Partials        9        9

Flag	Coverage Δ
sdk	`96.93% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

packages/swap/src/event-handlers/common.ts

packages/shared/src/node-apis/redis.ts

acdibble · 2024-12-03T14:38:25Z

packages/shared/src/node-apis/redis.ts

+        const parsedDeposit = depositSchema.parse(deposit);  
+        const { deposit_details, deposit_chain_block_height } = parsedDeposit;  
+
+        const baseDeposit = {
+          amount: parsedDeposit.amount,
+          asset: parsedDeposit.asset,
+          deposit_chain_block_height: parsedDeposit.deposit_chain_block_height,
+        };


a little shorter:

Suggested change

const parsedDeposit = depositSchema.parse(deposit);

const { deposit_details, deposit_chain_block_height } = parsedDeposit;

const baseDeposit = {

amount: parsedDeposit.amount,

asset: parsedDeposit.asset,

deposit_chain_block_height: parsedDeposit.deposit_chain_block_height,

};

const { deposit_details, ...baseDeposit } = depositSchema.parse(deposit);

const { deposit_chain_block_height } = baseDeposit;

Not sure if i need to somehow movebaseDeposit to the depositSchema (or i need to remove baseDeposit )

oops, fixed it 🤦

acdibble · 2024-12-03T15:47:56Z

packages/shared/src/node-apis/__tests__/redis.test.ts

        },
      ]);
      expect(mock).toHaveBeenCalledWith('deposit:Ethereum:0x1234', 0, -1);
    });

+    it('returns the deposits if found - Polkadot', async () => {


acdibble · 2024-12-03T15:50:50Z

packages/shared/src/node-apis/redis.ts

@@ -12,14 +13,38 @@ const jsonString = string.transform((value) => JSON.parse(value));

 const chainAsset = uncheckedAssetAndChain.transform(({ asset }) => asset);

+const BitcoinDeposit = z.object({


these can be camelCase

Suggested change

const BitcoinDeposit = z.object({

const bitcoinDeposit = z.object({

Changed ☺️

niklasnatter · 2024-12-03T16:45:17Z

packages/shared/src/node-apis/redis.ts

+
+        if (!deposit_details) return { ...baseDeposit, tx_refs: [] };
+
+        switch (chain) {


could we maybe reuse the getDepositTxRef method here?

I've been trying to reuse that function but it didn't really work because the shape of the ingress egress tracker does not match the depositDetails types (bitcoinSchema160, bitcoinSchema170...). I'm going to go back to my previous commits

niklasnatter · 2024-12-03T16:48:13Z

packages/shared/src/node-apis/redis.ts

@@ -127,12 +152,36 @@ export default class RedisClient {
    return value ? broadcastParsers[chain].parse(JSON.parse(value)) : null;
  }

-  async getDeposits(chain: Chain, asset: Asset, address: string) {
+  async getDeposits(chain: Chain, asset: Asset, address: string): Promise<PendingDeposit[]> {


now that this method returns the tx ref information, we should return it from the status endpoint. to do that, we need to adjust the getPendingDeposit method

but would be fine for me to do that in a separate pr if you prefer that!

Will do in separate pr 👾

packages/shared/src/node-apis/__tests__/redis.test.ts

sukhoviianastasia · 2024-12-04T17:54:35Z

I'll try to refactor getDeposits soon

…waps [WEB-1643] (#1102) * fix(swap sdk): expose transaction ref from ingress egress tracker in sdk status * fix: clean * fix: clean * fix getDeposit func * fix types * add test and clean * fix swap files * fix imports * fix pipeline * camelcases

fix(swap sdk): expose transaction ref from ingress egress tracker in …

2405fb2

…sdk status

sukhoviianastasia requested a review from a team as a code owner December 2, 2024 14:12

sukhoviianastasia requested review from jerryafr and tinkaa01 December 2, 2024 14:12

sukhoviianastasia marked this pull request as draft December 2, 2024 14:12

sukhoviianastasia self-assigned this Dec 2, 2024

sukhoviianastasia added 4 commits December 2, 2024 15:26

fix: clean

b3079a8

fix: clean

3bfb9c5

fix getDeposit func

c45e2b1

fix types

573b1c5

sukhoviianastasia commented Dec 3, 2024

View reviewed changes

packages/swap/src/event-handlers/common.ts Show resolved Hide resolved

sukhoviianastasia commented Dec 3, 2024

View reviewed changes

packages/shared/src/node-apis/redis.ts Show resolved Hide resolved

acdibble reviewed Dec 3, 2024

View reviewed changes

sukhoviianastasia added 4 commits December 3, 2024 16:26

add test and clean

d9ae994

fix swap files

1910b1b

fix imports

ab90d63

fix pipeline

fa1b8cc

acdibble approved these changes Dec 3, 2024

View reviewed changes

sukhoviianastasia changed the title ~~fix(swap sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643]~~ fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] Dec 3, 2024

camelcases

f2e6025

sukhoviianastasia marked this pull request as ready for review December 3, 2024 15:58

niklasnatter reviewed Dec 3, 2024

View reviewed changes

sukhoviianastasia commented Dec 4, 2024

View reviewed changes

packages/shared/src/node-apis/__tests__/redis.test.ts Show resolved Hide resolved

sukhoviianastasia force-pushed the expose-tx-ref-ingress-egress branch from 2f668b3 to f2e6025 Compare December 5, 2024 10:13

niklasnatter approved these changes Dec 5, 2024

View reviewed changes

sukhoviianastasia merged commit d323cb4 into main Dec 5, 2024
42 checks passed

sukhoviianastasia deleted the expose-tx-ref-ingress-egress branch December 5, 2024 11:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] #1102

fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] #1102

sukhoviianastasia commented Dec 2, 2024 •

edited

Loading

codecov-commenter commented Dec 2, 2024 •

edited

Loading

acdibble Dec 3, 2024 •

edited

Loading

sukhoviianastasia Dec 3, 2024

acdibble Dec 3, 2024

acdibble Dec 3, 2024

acdibble Dec 3, 2024

sukhoviianastasia Dec 3, 2024

niklasnatter Dec 3, 2024

sukhoviianastasia Dec 5, 2024 •

edited

Loading

niklasnatter Dec 3, 2024

niklasnatter Dec 3, 2024

sukhoviianastasia Dec 5, 2024

sukhoviianastasia commented Dec 4, 2024

		@@ -12,14 +13,38 @@ const jsonString = string.transform((value) => JSON.parse(value));

		const chainAsset = uncheckedAssetAndChain.transform(({ asset }) => asset);

		const BitcoinDeposit = z.object({


		if (!deposit_details) return { ...baseDeposit, tx_refs: [] };

		switch (chain) {

fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] #1102

fix(sdk): expose transaction ref from ingress egress tracker in sdk swaps [WEB-1643] #1102

Conversation

sukhoviianastasia commented Dec 2, 2024 • edited Loading

codecov-commenter commented Dec 2, 2024 • edited Loading

Codecov Report

acdibble Dec 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sukhoviianastasia Dec 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sukhoviianastasia commented Dec 4, 2024

sukhoviianastasia commented Dec 2, 2024 •

edited

Loading

codecov-commenter commented Dec 2, 2024 •

edited

Loading

acdibble Dec 3, 2024 •

edited

Loading

sukhoviianastasia Dec 5, 2024 •

edited

Loading