chore(ui): evm to solana swap #461

ramenuncle · 2022-10-25T10:26:49Z

Add manual redeem method to SDK
Complete EVM => Solana swap on UI
Fix some UI bugs

Testing

evm_to_solana.mov

Checklist

Github project and label have been assigned
Tests have been added or are unnecessary
Docs have been updated or are unnecessary
Preview deployment works (visit the Cloudflare preview URL)
Manual testing in #product-testing completed or unnecessary
New i18n strings do not contain any security vulnerabilities (e.g. should not allow translator to update email/url)
When fetching new translations from external sources, do a sanity check (e.g. get people who speak the language to check, shove all new translations into Google translate)

cloudflare-workers-and-pages · 2022-10-25T10:30:55Z

Deploying with Cloudflare Pages

Latest commit:	`dd428fb`
Status:	✅ Deploy successful!
Preview URL:	https://5611cb7f.swim-ui.pages.dev
Branch Preview URL:	https://ui-evm-to-solana-swap.swim-ui.pages.dev

View logs

packages/solana/src/client.ts

packages/solana/src/getAccounts.ts

wormat

Nice work

wormat · 2022-10-25T11:08:50Z

packages/solana/src/client.ts

+      sourceChainConfig,
+    );
+    const setComputeUnitLimitIx = ComputeBudgetProgram.setComputeUnitLimit({
+      units: 900_000,


Has this been optimized?

Not sure, just copying from solana-contracts package

Could you check with Ricky what the best value for this is in each case?

packages/solana/src/client.ts

apps/ui/src/models/swim/interactionStateV2.ts

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

wormat · 2022-10-25T11:50:38Z

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

+        const crossChainInitiateTx = await evmClient.getTx(
+          crossChainInitiateResponse,
+        );
+        crossChainInitiateTxId = crossChainInitiateTx.id;
+        updateInteractionState(interaction.id, (draft) => {
+          if (
+            draft.interactionType !== InteractionType.SwapV2 ||
+            draft.swapType !== SwapType.CrossChainEvmToSolana
+          ) {
+            throw new Error("Interaction type mismatch");
+          }
+          draft.crossChainInitiateTxId = crossChainInitiateTx.id;
+        });
+      }
+      const crossChainInitiateTx = await evmClient.getTx(
+        crossChainInitiateTxId,
+      );


Could be DRYer.

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

apps/ui/src/models/swim/interactionStateV2.ts

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

packages/solana/src/client.ts

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

ramenuncle · 2022-10-26T09:35:21Z

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

+      const completeTransferTxGenerator =
+        solanaClient.generateCompleteSwimSwapTxs({
+          wallet: toWallet,
+          interactionId: interaction.id,
+          signedVaa: Buffer.from(signedVaa),
+          sourceChainConfig: fromChainConfig,
+          sourceWormholeChainId: ecosystems[fromEcosystem].wormholeChainId,
+          targetTokenNumber: tokenProject.tokenNumber,
+          minimumOutputAmount,
+        });
+      for await (const result of completeTransferTxGenerator) {
+        updateInteractionState(interaction.id, (draft) => {
+          if (
+            draft.interactionType !== InteractionType.SwapV2 ||
+            draft.swapType !== SwapType.CrossChainEvmToSolana
+          ) {
+            throw new Error("Interaction type mismatch");
+          }
+          switch (result.type) {
+            case SolanaTxType.SwimCreateSplTokenAccount: {
+              const mint = result.tx.original.meta?.preTokenBalances?.[0].mint;
+              if (!mint) {
+                throw new Error("Token account mint not found");
+              }
+              draft.requiredSplTokenAccounts[mint].txId = result.tx.id;
+              break;
+            }
+            case SolanaTxType.WormholeVerifySignatures:
+              draft.verifySignaturesTxIds.push(result.tx.id);
+              break;
+            case SolanaTxType.WormholePostVaa:
+              draft.postVaaOnSolanaTxId = result.tx.id;
+              draft.auxiliarySignerPublicKey =
+                auxiliarySigner.publicKey.toBase58();
+              break;
+            case SolanaTxType.SwimCompleteNativeWithPayload:
+              draft.completeNativeWithPayloadTxId = result.tx.id;
+              break;
+            case SolanaTxType.SwimProcessSwimPayload:
+              draft.processSwimPayloadTxId = result.tx.id;
+              break;
+          }
+        });
+      }


Moved all the SolanaTx to SDK

Looks great!

wormat

This is looking so good!

wormat · 2022-10-26T09:44:48Z

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

+          }
+          switch (result.type) {
+            case SolanaTxType.SwimCreateSplTokenAccount: {
+              const mint = result.tx.original.meta?.preTokenBalances?.[0].mint;


Fine for now but Ricky says we can create multiple accounts in one tx.

wormat · 2022-10-26T09:44:56Z

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts

+      const completeTransferTxGenerator =
+        solanaClient.generateCompleteSwimSwapTxs({
+          wallet: toWallet,
+          interactionId: interaction.id,
+          signedVaa: Buffer.from(signedVaa),
+          sourceChainConfig: fromChainConfig,
+          sourceWormholeChainId: ecosystems[fromEcosystem].wormholeChainId,
+          targetTokenNumber: tokenProject.tokenNumber,
+          minimumOutputAmount,
+        });
+      for await (const result of completeTransferTxGenerator) {
+        updateInteractionState(interaction.id, (draft) => {
+          if (
+            draft.interactionType !== InteractionType.SwapV2 ||
+            draft.swapType !== SwapType.CrossChainEvmToSolana
+          ) {
+            throw new Error("Interaction type mismatch");
+          }
+          switch (result.type) {
+            case SolanaTxType.SwimCreateSplTokenAccount: {
+              const mint = result.tx.original.meta?.preTokenBalances?.[0].mint;
+              if (!mint) {
+                throw new Error("Token account mint not found");
+              }
+              draft.requiredSplTokenAccounts[mint].txId = result.tx.id;
+              break;
+            }
+            case SolanaTxType.WormholeVerifySignatures:
+              draft.verifySignaturesTxIds.push(result.tx.id);
+              break;
+            case SolanaTxType.WormholePostVaa:
+              draft.postVaaOnSolanaTxId = result.tx.id;
+              draft.auxiliarySignerPublicKey =
+                auxiliarySigner.publicKey.toBase58();
+              break;
+            case SolanaTxType.SwimCompleteNativeWithPayload:
+              draft.completeNativeWithPayloadTxId = result.tx.id;
+              break;
+            case SolanaTxType.SwimProcessSwimPayload:
+              draft.processSwimPayloadTxId = result.tx.id;
+              break;
+          }
+        });
+      }


Looks great!

packages/solana/src/protocol.ts

packages/solana/src/client.ts

wormat

Nice, let's send to manual testing then I'll publish.

ramenuncle added the feature New feature or request label Oct 25, 2022

ramenuncle requested review from wormat and swimthor October 25, 2022 10:26

ramenuncle self-assigned this Oct 25, 2022

chore(ui): evm to solana swap

f9e37fb

ramenuncle force-pushed the ui/evm-to-solana-swap branch from 21ff312 to f9e37fb Compare October 25, 2022 10:30

ramenuncle marked this pull request as ready for review October 25, 2022 10:31

ramenuncle commented Oct 25, 2022

View reviewed changes

packages/solana/src/client.ts Outdated Show resolved Hide resolved

packages/solana/src/getAccounts.ts Show resolved Hide resolved

chore(ui): fix test

709bb34

wormat reviewed Oct 25, 2022

View reviewed changes

Merge remote-tracking branch 'origin/master' into ui/evm-to-solana-swap

ded6b6a

ramenuncle force-pushed the ui/evm-to-solana-swap branch from 3828add to fa7bfd2 Compare October 25, 2022 14:25

chore(ui): rename functions, DRYer

1c76651

ramenuncle force-pushed the ui/evm-to-solana-swap branch from fa7bfd2 to 1c76651 Compare October 25, 2022 14:31

chore(ui): combine to generateCompleteTransferTxs

3e12b07

ramenuncle requested a review from wormat October 25, 2022 16:11

wormat reviewed Oct 25, 2022

View reviewed changes

apps/ui/src/models/swim/interactionStateV2.ts Outdated Show resolved Hide resolved

apps/ui/src/hooks/interaction/useCrossChainEvmToSolanaSwapInteractionMutation.ts Outdated Show resolved Hide resolved

wormat reviewed Oct 25, 2022

View reviewed changes

chore(ui): address comment, fix nit

2b137da

ramenuncle force-pushed the ui/evm-to-solana-swap branch from af975cd to 22d5e54 Compare October 26, 2022 09:33

ramenuncle commented Oct 26, 2022

View reviewed changes

chore(ui): move postVaa to SDK

75a19f3

ramenuncle force-pushed the ui/evm-to-solana-swap branch from 22d5e54 to 75a19f3 Compare October 26, 2022 09:48

wormat reviewed Oct 26, 2022

View reviewed changes

chore(ui): compare ata address

dd428fb

wormat approved these changes Oct 26, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(ui): evm to solana swap #461

chore(ui): evm to solana swap #461

ramenuncle commented Oct 25, 2022 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 25, 2022 •

edited

Loading

wormat left a comment

wormat Oct 25, 2022

ramenuncle Oct 25, 2022

wormat Oct 25, 2022

wormat Oct 25, 2022

ramenuncle Oct 26, 2022

wormat Oct 26, 2022

wormat left a comment

wormat Oct 26, 2022

wormat Oct 26, 2022

wormat left a comment

chore(ui): evm to solana swap #461

Are you sure you want to change the base?

chore(ui): evm to solana swap #461

Conversation

ramenuncle commented Oct 25, 2022 • edited Loading

Testing

Checklist

cloudflare-workers-and-pages bot commented Oct 25, 2022 • edited Loading

Deploying with Cloudflare Pages

wormat left a 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

Choose a reason for hiding this comment

wormat left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wormat left a comment

Choose a reason for hiding this comment

ramenuncle commented Oct 25, 2022 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 25, 2022 •

edited

Loading