feat: Swap js integration #320

m30m · 2025-01-10T01:06:01Z

No description provided.

m30m · 2025-01-10T01:07:07Z

Tiltfile

    serve_dir="sdk/python",
    resource_deps=["svm-initialize-programs", "auction-server"],
 )

 local_resource(
    "svm-searcher-js",
-    serve_cmd="pnpm run testing-searcher-limo --endpoint-express-relay http://127.0.0.1:9000 --chain-id development-solana --private-key-json-file ../../keypairs/searcher_py.json --endpoint-svm http://127.0.0.1:8899 --bid 10000000 --fill-rate 4 --bid-margin 100 --with-latency",
+    serve_cmd="pnpm run testing-searcher-limo --endpoint-express-relay http://127.0.0.1:9000 --chain-id development-solana --private-key-json-file ../../keypairs/searcher_js.json --endpoint-svm http://127.0.0.1:8899 --bid 1000 --fill-rate 4 --bid-margin 100",


mint more tokens to everyone and revert bid number to the higher value

any reason you are setting lower bid number here? if the bid isn't high enough, you may not be paying for the rent of the fee receiver if it doesn't already have the funds for rent exemption. i think it's fine here bc we airdrop, but worth checking and figuring out the possible scenarios

m30m · 2025-01-10T01:07:18Z

.pre-commit-config.yaml

@@ -25,14 +25,14 @@ repos:
        language: "rust"
        entry: cargo +nightly-2024-12-03 fmt --manifest-path ./Cargo.toml --all -- --config-path rustfmt.toml
        pass_filenames: false
-        types_or: ["rust", "cargo", "cargo-lock"]


fix local pre-commit

I had the same issue. Maybe if you upgrade the pre-commit to 4.0.1 or later, it works.

same here, this issue popped up for me out of the blue yesterday. updating pre commit resolved it

yes you should run this hook when Cargo.toml or Cargo.lock get updated

m30m · 2025-01-10T01:08:07Z

sdk/js/src/const.ts

  },
  solana: {
    expressRelayProgram: new PublicKey(
      "PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou"
    ),
+    walletRouter: new PublicKey("3hv8L8UeBbyM3M25dF3h2C5p8yA4FptD7FFZu4Z1jCMn"),


add todo to change later

merge main and get rid of

m30m · 2025-01-10T01:08:44Z

sdk/js/src/svm.ts

+  const expressRelayMetadata = getExpressRelayMetadataPda(chainId);
+  const svmConstants = SVM_CONSTANTS[chainId];
+
+  const tokenProgramInput = TOKEN_PROGRAM_ID;


get from server

danimhr

I reviewed the server parts. You may need to merge with main. There is a bunch of other changes merged recently.

danimhr · 2025-01-10T08:57:32Z

.pre-commit-config.yaml

@@ -25,14 +25,14 @@ repos:
        language: "rust"
        entry: cargo +nightly-2024-12-03 fmt --manifest-path ./Cargo.toml --all -- --config-path rustfmt.toml
        pass_filenames: false
-        types_or: ["rust", "cargo", "cargo-lock"]


I had the same issue. Maybe if you upgrade the pre-commit to 4.0.1 or later, it works.

danimhr · 2025-01-10T09:01:54Z

auction-server/api-types/src/opportunity.rs

    SwapKamino,
-    #[serde(rename = "limo")]
-    #[strum(serialize = "limo")]


strum and serde are doing diff stuff. Are you sure it's safe to remove the strum?

I think strum here will affect the Display which is used in the tracing.
So after this change it might be with a capital letter in the tracing?

danimhr · 2025-01-10T09:11:14Z

auction-server/src/auction/service/verification.rs

+                        e
+                    ))
+                })?;
+                let expected_router_fee_receiver_ta = Pubkey::find_program_address(


We should use this address for creating the permission key

danimhr · 2025-01-10T09:28:42Z

auction-server/src/auction/service/verification.rs

-                    //         ))
-                    //     },
-                    // )?,
+                    router: self.config.chain_config.wallet_program_router_account,


if we use the router_fee_receiver_ta to create the permission key, we don't need to do these checks. actually the permission key will be invalid if the receiver_ta account does not match with what we expect.

this is a good point, we should probably include the router in the permission_key construction in get_quote_permission_key. that's an easy fix, we can mark it as a TODO (or you can add it here after merging main)

danimhr · 2025-01-10T09:32:00Z

auction-server/src/auction/service/verification.rs

@@ -714,7 +753,13 @@ impl Service<Svm> {
                )
            }
            SubmitType::ByServer => {
-                self.all_signatures_exists(&message_bytes, accounts, &signatures, &[])
+                self.relayer_signer_exists(accounts, &signatures)?;


Does the relayer exist at this point?

danimhr · 2025-01-10T09:34:44Z

auction-server/src/opportunity/api.rs

    State(store): State<Arc<StoreNew>>,
    Json(params): Json<QuoteCreate>,
 ) -> Result<Json<Quote>, RestError> {
-    let program = get_program(&auth)?;


I think it's better to make it permissioned at the beginnig

anihamde · 2025-01-10T10:40:08Z

Tiltfile

    serve_dir="sdk/python",
    resource_deps=["svm-initialize-programs", "auction-server"],
 )

 local_resource(
    "svm-searcher-js",
-    serve_cmd="pnpm run testing-searcher-limo --endpoint-express-relay http://127.0.0.1:9000 --chain-id development-solana --private-key-json-file ../../keypairs/searcher_py.json --endpoint-svm http://127.0.0.1:8899 --bid 10000000 --fill-rate 4 --bid-margin 100 --with-latency",
+    serve_cmd="pnpm run testing-searcher-limo --endpoint-express-relay http://127.0.0.1:9000 --chain-id development-solana --private-key-json-file ../../keypairs/searcher_js.json --endpoint-svm http://127.0.0.1:8899 --bid 1000 --fill-rate 4 --bid-margin 100",


any reason you are setting lower bid number here? if the bid isn't high enough, you may not be paying for the rent of the fee receiver if it doesn't already have the funds for rent exemption. i think it's fine here bc we airdrop, but worth checking and figuring out the possible scenarios

anihamde · 2025-01-10T10:43:19Z

auction-server/src/auction/service/verification.rs

@@ -616,23 +601,71 @@ impl Service<Svm> {
                        },
                    ),
                };
+                let mint_fee = match swap_data.fee_token {


i think some of this server stuff may be unnecessary once you pull main? pushed some updates recently

anihamde · 2025-01-10T10:46:26Z

auction-server/src/auction/service/verification.rs

+                        e
+                    ))
+                })?;
+                let expected_router_fee_receiver_ta = Pubkey::find_program_address(


i think the whole point of making the router fee receiver ta generic as opposed to constraining it to be the ATA was so that routers could provide arbitrary token accounts

also the wallet_program_router_account is no longer in the config

anihamde · 2025-01-10T10:49:53Z

auction-server/src/auction/service/verification.rs

-                    //         ))
-                    //     },
-                    // )?,
+                    router: self.config.chain_config.wallet_program_router_account,


this is a good point, we should probably include the router in the permission_key construction in get_quote_permission_key. that's an easy fix, we can mark it as a TODO (or you can add it here after merging main)

anihamde · 2025-01-10T10:53:03Z

sdk/js/src/const.ts

  },
  solana: {
    expressRelayProgram: new PublicKey(
      "PytERJFhAKuNNuaiXkApLfWzwNwSNDACpigT3LwQfou"
    ),
+    walletRouter: new PublicKey("3hv8L8UeBbyM3M25dF3h2C5p8yA4FptD7FFZu4Z1jCMn"),


merge main and get rid of

anihamde · 2025-01-10T11:19:26Z

sdk/js/src/svm.ts

+  return getAssociatedTokenAddressSync(
+    tokenMintAddress,
+    owner,
+    true,


makes sense why you defined this, but maybe a comment noting that this allows off-curve owners?

anihamde · 2025-01-10T11:21:06Z

sdk/js/src/svm.ts

+  tokenProgram: PublicKey
+): [PublicKey, TransactionInstruction] {
+  const ataAddress = getAssociatedTokenAddress(owner, mint, tokenProgram);
+  const createUserTokenAccountIx = createAssociatedTokenAccountInstruction(


why not just use this helper?

anihamde · 2025-01-10T11:23:16Z

sdk/js/src/svm.ts

+        : bidAmount,
+    referralFeeBps: new anchor.BN(0),
+    deadline,
+    feeToken: { input: {} },


you can get this from the server. right now, the server is always returning input

anihamde · 2025-01-10T11:25:04Z

sdk/js/src/svm.ts

+      ),
+      tokenProgramOutput,
+      mintOutput,
+      routerFeeReceiverTa: getAssociatedTokenAddress(


this is not necessarily the ATA. the router account here will be the token account that the referrer wants the SPL fee token to be sent to, so you can just use that

anihamde · 2025-01-10T11:28:25Z

tilt-scripts/svm/test_swap.py

@@ -0,0 +1,95 @@
+import argparse


i think it would be easier (and better) to start writing the tilt scripts in JS? i think you could probably write this whole script more flexibly (using SDK methods rather than writing endpoints and payloads manually) in JS

danimhr · 2025-01-10T10:46:40Z

sdk/js/src/examples/simpleSearcherLimo.ts

@@ -133,6 +136,53 @@ export class SimpleSearcherLimo {
    return bid;
  }

+  /**


Update this comment

danimhr · 2025-01-10T10:54:34Z

sdk/js/src/svm.ts

+      ? swapOpportunity.tokens.outputToken.token
+      : swapOpportunity.tokens.outputToken;
+  const trader = swapOpportunity.userWalletAddress;
+  const mintFee = mintInput;


it should be either mintInput or mintOutput

danimhr · 2025-01-10T10:55:32Z

sdk/js/src/svm.ts

+      swapOpportunity.tokens.type === "output_specified"
+        ? new anchor.BN(swapOpportunity.tokens.outputToken.amount)
+        : bidAmount,
+    referralFeeBps: new anchor.BN(0),


This should come from server + we need to add it in the permission key on the server side

danimhr · 2025-01-10T10:56:27Z

sdk/js/src/svm.ts

+        : bidAmount,
+    referralFeeBps: new anchor.BN(0),
+    deadline,
+    feeToken: { input: {} },


it should be constructed based on the swap token type

danimhr · 2025-01-10T10:57:15Z

sdk/js/src/svm.ts

+      expressRelayMetadata,
+      searcher,
+      trader: swapOpportunity.userWalletAddress,
+      searcherInputTa: getAssociatedTokenAddress(


Maybe it's better to make it optional variable?
If not exist set to getAssociatedTokenAddress otherwise, use the input variable

danimhr · 2025-01-10T10:57:21Z

sdk/js/src/svm.ts

+        mintInput,
+        tokenProgramInput
+      ),
+      searcherOutputTa: getAssociatedTokenAddress(


danimhr · 2025-01-10T11:00:20Z

sdk/js/src/svm.ts

+      ),
+      tokenProgramOutput,
+      mintOutput,
+      routerFeeReceiverTa: getAssociatedTokenAddress(


Maybe it's better to make it Ata inside the program?

m30m added 3 commits January 9, 2025 19:32

feat: initial js sdk for swap

4326882

Merge branch 'main' into swap-js-integration

6f06542

cleanup

d7eee0a

m30m commented Jan 10, 2025

View reviewed changes

danimhr reviewed Jan 10, 2025

View reviewed changes

anihamde reviewed Jan 10, 2025

View reviewed changes

danimhr reviewed Jan 10, 2025

View reviewed changes

feat: Swap js integration #320

Are you sure you want to change the base?

feat: Swap js integration #320

Conversation

m30m commented Jan 10, 2025

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danimhr 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

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

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

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