Skip to content

Swap RPC implementation #40

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

Merged
merged 13 commits into from
Jan 22, 2024
Merged

Swap RPC implementation #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6655e27
Initial Swap RPC implementation
jeffyanta Jan 17, 2024
6c39a26
Merge branch 'main' into swap-rpc
jeffyanta Jan 18, 2024
2a2859e
Fix swap payer being the swap subsidizer
jeffyanta Jan 18, 2024
559960e
Minor renames
jeffyanta Jan 18, 2024
2ac94e8
Fix user account in pre swap ixn
jeffyanta Jan 19, 2024
7da9cd0
Implement WaitForBlockchainStatus
jeffyanta Jan 19, 2024
867804a
Support umlimited swaps and add balance checks
jeffyanta Jan 19, 2024
cdaba58
Pull in v1.8.3 APIs
jeffyanta Jan 19, 2024
16cd095
Add comments
jeffyanta Jan 19, 2024
b8dfd0c
Swap authority should be excluded from pre swap remaining account list
jeffyanta Jan 19, 2024
6ffa6a3
Cleanup timeouts through configs
jeffyanta Jan 19, 2024
461442d
Improve swap validation
jeffyanta Jan 22, 2024
cee941e
Add a swap antispam guard
jeffyanta Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor renames
  • Loading branch information
@jeffyanta
jeffyanta committed Jan 18, 2024
commit 559960e8638dd495decc8e9d1eeb371da4889030
12 changes: 6 additions & 6 deletions pkg/code/server/grpc/transaction/v2/swap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ func (s *transactionServer) Swap(streamer transactionpb.Transaction_SwapServer)
}
txn.SetBlockhash(blockhash)

computeUnitLimit, _ := compute_budget.ParseSetComputeUnitLimitIxnData(jupiterSwapIxns.ComputeBudgetInstructions[0].Data)
computeUnitPrice, _ := compute_budget.ParseSetComputeUnitPriceIxnData(jupiterSwapIxns.ComputeBudgetInstructions[1].Data)
computeUnitLimit, _ := compute_budget.DecompileSetComputeUnitLimitIxnData(jupiterSwapIxns.ComputeBudgetInstructions[0].Data)
computeUnitPrice, _ := compute_budget.DecompileSetComputeUnitPriceIxnData(jupiterSwapIxns.ComputeBudgetInstructions[1].Data)

var protoSwapIxnAccounts []*commonpb.InstructionAccount
for _, ixnAccount := range jupiterSwapIxns.SwapInstruction.Accounts {
Expand Down Expand Up @@ -329,11 +329,11 @@ func (s *transactionServer) validateJupiterIxns(ixns *jupiter.SwapInstructions)
return errors.New("invalid ComputeBudget instruction accounts")
}

if _, err := compute_budget.ParseSetComputeUnitLimitIxnData(ixns.ComputeBudgetInstructions[0].Data); err != nil {
if _, err := compute_budget.DecompileSetComputeUnitLimitIxnData(ixns.ComputeBudgetInstructions[0].Data); err != nil {
return errors.Wrap(err, "invalid ComputeBudget::SetComputeUnitLimit instruction data")
}

if _, err := compute_budget.ParseSetComputeUnitPriceIxnData(ixns.ComputeBudgetInstructions[1].Data); err != nil {
if _, err := compute_budget.DecompileSetComputeUnitPriceIxnData(ixns.ComputeBudgetInstructions[1].Data); err != nil {
return errors.Wrap(err, "invalid ComputeBudget::SetComputeUnitPrice instruction data")
}

Expand All @@ -358,12 +358,12 @@ func (s *transactionServer) mustLoadSwapSubsidizer(ctx context.Context) {
return err
}

ownerAccount, err := common.NewAccountFromPrivateKeyString(vaultRecord.PrivateKey)
authorityAccount, err := common.NewAccountFromPrivateKeyString(vaultRecord.PrivateKey)
if err != nil {
return err
}

s.swapSubsidizer = ownerAccount
s.swapSubsidizer = authorityAccount
return nil
}()
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/computebudget/program.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func SetComputeUnitPrice(computeUnitPrice uint64) solana.Instruction {
)
}

func ParseSetComputeUnitLimitIxnData(data []byte) (uint32, error) {
func DecompileSetComputeUnitLimitIxnData(data []byte) (uint32, error) {
if len(data) != 5 {
return 0, errors.New("invalid length")
}
Expand All @@ -52,7 +52,7 @@ func ParseSetComputeUnitLimitIxnData(data []byte) (uint32, error) {
return binary.LittleEndian.Uint32(data[1:]), nil
}

func ParseSetComputeUnitPriceIxnData(data []byte) (uint64, error) {
func DecompileSetComputeUnitPriceIxnData(data []byte) (uint64, error) {
if len(data) != 9 {
return 0, errors.New("invalid length")
}
Expand Down