JUP-setup jupiter program to swap solana tokens and added functionali… #41
Conversation
…ty to deserialize transactions
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
f196779 to
2d4f179
Compare
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
be84338 to
df7f9b7
Compare
|
|
||
| public static String swapToken(RpcClient rpcClient, Account account, URI quoteUri) { | ||
| JsonNode quote = getJupiterQuote(quoteUri); | ||
| return swapToken(rpcClient, account, quote); |
There was a problem hiding this comment.
That is actually calling a different method. I have changed the local variable name to be not confusing.
|
Could someone to fix thesse conflicts, a lot of ppl are waiting for this feature. |
I will take a look today and fix this. |
|
Ok. I have fixed the merge conflict. Please let me know if this looks good. For now, I have not added tests but will add them in coming days. |
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
2330b29 to
7336bd4
Compare
…oves the previous fixed merge conflict
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
7336bd4 to
6daac37
Compare
|
Ok, I messed up in my previous commit and removed the commit that actually fixed the conflict. Now, it is fixed and have fixed the conflict. |
|
Waiting for the feedback or approval. Thanks! |
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
493387b to
5877830
Compare
…dn't throw an error.
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
5877830 to
c388174
Compare
Done. |
|
Hey guys, any movement here? |
|
@slaverda waiting for the approval so can be merged |
|
@slaverda conflict has been resolved and you can start using it, but you will have to pull the changes from my branch and build it yourself. |
… based on assets config
…t before sending api call
|
@i-contemplator Hi there, are there any blockers on this? The PR seems to be approved, so I was wondering if you’ve had a chance to finalize and merge it. Thanks! |
Hey, sorry. I fixed the conflict earlier and was waiting on the merge as I don't have perms to merge. Between then and now, there is another merge conflict that occurred. Let me get it done now. |
i-contemplator
force-pushed
the
JUP-swap-functionality
branch
from
72a7ad4 to
bff7f38
Compare
|
@skynetcap @xbodnar i have fixed the merge conflict. Please let me know if it is good and feel free to merge it. |
…ty to deserialize transactions