From 709d7c0110d8366710b3ec6ba01d910f092da83a Mon Sep 17 00:00:00 2001 From: Vaibhav Sethia Date: Thu, 2 Jan 2025 01:24:52 +0530 Subject: [PATCH 1/7] feat: add solana token data request --- packages/app-solana/src/operations/signTxn/index.ts | 1 + packages/app-solana/src/operations/signTxn/types.ts | 3 +++ submodules/common | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/app-solana/src/operations/signTxn/index.ts b/packages/app-solana/src/operations/signTxn/index.ts index d861c59ce..7ccfb65de 100644 --- a/packages/app-solana/src/operations/signTxn/index.ts +++ b/packages/app-solana/src/operations/signTxn/index.ts @@ -63,6 +63,7 @@ export const signTxn = async ( walletId: params.walletId, derivationPath: params.derivationPath, transactionSize: txnBytes.length, + tokenData: params.tokenData, }, }); diff --git a/packages/app-solana/src/operations/signTxn/types.ts b/packages/app-solana/src/operations/signTxn/types.ts index c7f22ffac..677ee6784 100644 --- a/packages/app-solana/src/operations/signTxn/types.ts +++ b/packages/app-solana/src/operations/signTxn/types.ts @@ -1,3 +1,5 @@ +import { ISignTxnInitiateTokenData } from '../../proto/generated/types'; + export enum SignTxnEvent { INIT = 0, CONFIRM = 1, @@ -14,6 +16,7 @@ export interface ISignTxnParams { walletId: Uint8Array; derivationPath: number[]; txn: string; + tokenData?: ISignTxnInitiateTokenData; getLatestBlockHash?: (network?: string) => Promise; serializeTxn?: boolean; } diff --git a/submodules/common b/submodules/common index 19912e8d0..2d635d251 160000 --- a/submodules/common +++ b/submodules/common @@ -1 +1 @@ -Subproject commit 19912e8d052064c477d6b11ca2e26efa4c483bfe +Subproject commit 2d635d251d71aec29a5f8681cdc987f9cee88c04 From 19deedc6b07ac7667f68162e046e90a18deea6f0 Mon Sep 17 00:00:00 2001 From: Vaibhav Sethia Date: Thu, 2 Jan 2025 23:11:49 +0530 Subject: [PATCH 2/7] chore: ci fix --- packages/app-solana/src/operations/signTxn/index.ts | 5 ++++- packages/app-solana/tests/03.signTxn/__fixtures__/error.ts | 4 ++++ .../app-solana/tests/03.signTxn/__fixtures__/invalidData.ts | 4 ++++ packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/app-solana/src/operations/signTxn/index.ts b/packages/app-solana/src/operations/signTxn/index.ts index 7ccfb65de..380fabe65 100644 --- a/packages/app-solana/src/operations/signTxn/index.ts +++ b/packages/app-solana/src/operations/signTxn/index.ts @@ -63,7 +63,10 @@ export const signTxn = async ( walletId: params.walletId, derivationPath: params.derivationPath, transactionSize: txnBytes.length, - tokenData: params.tokenData, + tokenData: params.tokenData ?? { + mintAddress: new Uint8Array(), + recipientAddress: new Uint8Array(), + }, }, }); diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts index 96b27b3f3..1e46befde 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts @@ -29,6 +29,10 @@ const commonParams = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, + tokenData: { + mintAddress: new Uint8Array(), + recipientAddress: new Uint8Array(), + }, }, }, }), diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts index f64c29132..3e6846ac5 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts @@ -29,6 +29,10 @@ const commonParams = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, + tokenData: { + mintAddress: new Uint8Array(), + recipientAddress: new Uint8Array(), + }, }, }, }), diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts index 16e08cd7b..9e4b48ac8 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts @@ -27,6 +27,10 @@ const sendWithSerialize: ISignTxnTestCase = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, + tokenData: { + mintAddress: new Uint8Array(), + recipientAddress: new Uint8Array(), + }, }, }, }), From 78efc84d9b0dbdf8dee9dd45ad4192c5de1e2e0e Mon Sep 17 00:00:00 2001 From: Muzaffar Ahmad Bhat Date: Fri, 17 Jan 2025 17:12:35 +0530 Subject: [PATCH 3/7] fix: solana token data issue in case of normal transfer --- packages/app-solana/src/operations/signTxn/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/app-solana/src/operations/signTxn/index.ts b/packages/app-solana/src/operations/signTxn/index.ts index 380fabe65..7ccfb65de 100644 --- a/packages/app-solana/src/operations/signTxn/index.ts +++ b/packages/app-solana/src/operations/signTxn/index.ts @@ -63,10 +63,7 @@ export const signTxn = async ( walletId: params.walletId, derivationPath: params.derivationPath, transactionSize: txnBytes.length, - tokenData: params.tokenData ?? { - mintAddress: new Uint8Array(), - recipientAddress: new Uint8Array(), - }, + tokenData: params.tokenData, }, }); From c79d2a909ad7fb970de3f255b45363d98362e5d7 Mon Sep 17 00:00:00 2001 From: Muzaffar Ahmad Bhat Date: Fri, 17 Jan 2025 18:04:37 +0530 Subject: [PATCH 4/7] chore: updated common repo to main latest --- submodules/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/common b/submodules/common index 2d635d251..781eb49dc 160000 --- a/submodules/common +++ b/submodules/common @@ -1 +1 @@ -Subproject commit 2d635d251d71aec29a5f8681cdc987f9cee88c04 +Subproject commit 781eb49dc37185ca542d3ac790f1efdf7a1bd2c3 From aa4eb8d73eccc9f70f30f2be1d30d5c66f8a8f9f Mon Sep 17 00:00:00 2001 From: Muzaffar Ahmad Bhat Date: Mon, 20 Jan 2025 13:39:02 +0530 Subject: [PATCH 5/7] chore: updated common submodule --- submodules/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/common b/submodules/common index 781eb49dc..4b5ee9d84 160000 --- a/submodules/common +++ b/submodules/common @@ -1 +1 @@ -Subproject commit 781eb49dc37185ca542d3ac790f1efdf7a1bd2c3 +Subproject commit 4b5ee9d840b5eb512b38c03167c06fc65d81041c From c966cde4ae14063870a19e7629050564bc3df158 Mon Sep 17 00:00:00 2001 From: Muzaffar Ahmad Bhat Date: Mon, 20 Jan 2025 13:42:05 +0530 Subject: [PATCH 6/7] chore: added changeset --- .changeset/witty-berries-shop.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/witty-berries-shop.md diff --git a/.changeset/witty-berries-shop.md b/.changeset/witty-berries-shop.md new file mode 100644 index 000000000..25777bfc8 --- /dev/null +++ b/.changeset/witty-berries-shop.md @@ -0,0 +1,5 @@ +--- +"@cypherock/sdk-app-solana": minor +--- + +Added solana token support From 4d02824a824f568847e3b4298d581174e864b4d7 Mon Sep 17 00:00:00 2001 From: Muzaffar Ahmad Bhat Date: Mon, 20 Jan 2025 14:00:00 +0530 Subject: [PATCH 7/7] fix: tests --- packages/app-solana/tests/03.signTxn/__fixtures__/error.ts | 5 +---- .../app-solana/tests/03.signTxn/__fixtures__/invalidData.ts | 5 +---- packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts index 1e46befde..b2b0b8d14 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/error.ts @@ -29,10 +29,7 @@ const commonParams = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, - tokenData: { - mintAddress: new Uint8Array(), - recipientAddress: new Uint8Array(), - }, + tokenData: undefined, }, }, }), diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts index 3e6846ac5..fd5363ffd 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/invalidData.ts @@ -29,10 +29,7 @@ const commonParams = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, - tokenData: { - mintAddress: new Uint8Array(), - recipientAddress: new Uint8Array(), - }, + tokenData: undefined, }, }, }), diff --git a/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts b/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts index 9e4b48ac8..8837bfa5c 100644 --- a/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts +++ b/packages/app-solana/tests/03.signTxn/__fixtures__/valid.ts @@ -27,10 +27,7 @@ const sendWithSerialize: ISignTxnTestCase = { ]), derivationPath: [0x80000000 + 44, 0x80000000 + 501, 0x80000000], transactionSize: 150, - tokenData: { - mintAddress: new Uint8Array(), - recipientAddress: new Uint8Array(), - }, + tokenData: undefined, }, }, }),