New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Swap js integration #320

Open

m30m wants to merge 9 commits into main from swap-js-integration

Collaborator

m30m commented Jan 10, 2025

No description provided.

m30m added 3 commits

January 9, 2025 19:32


          feat: initial js sdk for swap


          Merge branch 'main' into swap-js-integration

6f06542


          cleanup

d7eee0a

m30m commented

View reviewed changes

Tiltfile Outdated

    
                  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",

Collaborator Author

m30m Jan 10, 2025

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

Contributor

anihamde Jan 10, 2025

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

.pre-commit-config.yaml Outdated

@@ @@ -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"]

Collaborator Author

m30m Jan 10, 2025

fix local pre-commit

Contributor

danimhr Jan 10, 2025

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

Contributor

anihamde Jan 10, 2025

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

Contributor

guibescos Jan 10, 2025

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

sdk/js/src/const.ts Outdated

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

Collaborator Author

m30m Jan 10, 2025

add todo to change later

Contributor

anihamde Jan 10, 2025

merge main and get rid of

sdk/js/src/svm.ts

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

Collaborator Author

m30m Jan 10, 2025

get from server

danimhr reviewed

View reviewed changes

Contributor

danimhr left a comment

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

.pre-commit-config.yaml Outdated

@@ @@ -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"]

Contributor

danimhr Jan 10, 2025

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

auction-server/api-types/src/opportunity.rs Show resolved Hide resolved

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

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

Contributor

danimhr Jan 10, 2025

We should use this address for creating the permission key

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

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

Contributor

danimhr Jan 10, 2025

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.

Contributor

anihamde Jan 10, 2025

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)

auction-server/src/auction/service/verification.rs Show resolved Hide resolved

auction-server/src/opportunity/api.rs Show resolved Hide resolved

anihamde reviewed

View reviewed changes

Tiltfile Outdated

    
                  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",

Contributor

anihamde Jan 10, 2025

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

auction-server/src/auction/service/verification.rs Show resolved Hide resolved

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

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

Contributor

anihamde Jan 10, 2025

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

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

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

Contributor

anihamde Jan 10, 2025

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)

sdk/js/src/const.ts Outdated

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

Contributor

anihamde Jan 10, 2025

merge main and get rid of

sdk/js/src/svm.ts Outdated Show resolved Hide resolved

sdk/js/src/svm.ts Outdated Show resolved Hide resolved

sdk/js/src/svm.ts Outdated

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

Contributor

anihamde Jan 10, 2025

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

sdk/js/src/svm.ts

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

Contributor

anihamde Jan 10, 2025

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

tilt-scripts/svm/test_swap.py

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

Contributor

anihamde Jan 10, 2025

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 reviewed

View reviewed changes

sdk/js/src/examples/simpleSearcherLimo.ts Show resolved Hide resolved

sdk/js/src/svm.ts

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

Contributor

danimhr Jan 10, 2025

it should be either mintInput or mintOutput

sdk/js/src/svm.ts Outdated Show resolved Hide resolved

sdk/js/src/svm.ts Outdated Show resolved Hide resolved

sdk/js/src/svm.ts

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

Contributor

danimhr Jan 10, 2025

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

sdk/js/src/svm.ts

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

Contributor

danimhr Jan 10, 2025

same

sdk/js/src/svm.ts

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

Contributor

danimhr Jan 10, 2025

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

m30m added 6 commits

January 10, 2025 09:57


          Merge branch 'main' into swap-js-integration


          Merge branch 'main' into swap-js-integration

b074cbf


          test

221015b

a65ae6c


          test

30f5f0e


          fix pre-commit 1

8a587d8

m30m force-pushed the swap-js-integration branch from 3589fc3 to 8a587d8 Compare

January 15, 2025 14:32

m30m commented

View reviewed changes

auction-server/src/auction/entities/bid.rs

+              #[derive(Clone, Debug)]
+              pub struct BidChainDataSwapCreateSvm {
+                  pub transaction:    VersionedTransaction,
+                  pub opportunity_id: Uuid,

Collaborator Author

m30m Jan 15, 2025

switch to opportunity id

danimhr reviewed

View reviewed changes

auction-server/src/opportunity/service/get_opportunities.rs

		impl<T: ChainType> Service<T> {
		pub async fn get_opportunity_by_id(

Contributor

danimhr Jan 15, 2025

better name here is get_live_opportunity_by_id

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet