Skip to content

StatefulSwap now waits for VTA reservation #54

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
jeffyanta merged 1 commit into from
Jan 18, 2026
+20 −10
Merged

StatefulSwap now waits for VTA reservation #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ocp/rpc/transaction/swap_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (h *CurrencyCreatorBuySwapHandler) MakeInstructions(ctx context.Context) ([
return nil, err
}

h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault)
h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -282,7 +282,7 @@ func (h *CurrencyCreatorSellSwapHandler) MakeInstructions(ctx context.Context) (
return nil, err
}

h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault)
h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -454,7 +454,7 @@ func (h *CurrencyCreatorBuySellSwapHandler) MakeInstructions(ctx context.Context
return nil, err
}

h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault)
h.memoryAccount, h.memoryIndex, err = vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationTimelockAccounts.Vault, true)
if err != nil {
return nil, err
}
Expand Down
14 changes: 12 additions & 2 deletions ocp/vm/virtual_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,18 @@ func GetVirtualTimelockAccountStateInMemory(ctx context.Context, vmIndexerClient
return &state, memory, uint16(protoMemory.Index), nil
}

func GetVirtualTimelockAccountLocationInMemory(ctx context.Context, data ocp_data.Provider, vault *common.Account) (*common.Account, uint16, error) {
memoryAddress, index, err := data.GetVmMemoryLocationByAddress(ctx, vault.PublicKey().ToBase58())
func GetVirtualTimelockAccountLocationInMemory(ctx context.Context, data ocp_data.Provider, vault *common.Account, waitForReservation bool) (*common.Account, uint16, error) {
var memoryAddress string
var index uint16
var err error
for range 20 {
memoryAddress, index, err = data.GetVmMemoryLocationByAddress(ctx, vault.PublicKey().ToBase58())
if err == nil || !waitForReservation {
break
}

time.Sleep(time.Second / 4)
}
if err != nil {
return nil, 0, err
}
Expand Down
2 changes: 1 addition & 1 deletion ocp/worker/geyser/external_deposit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func initiateExternalDepositIntoVm(ctx context.Context, data ocp_data.Provider,
return errors.Wrap(err, "error ensuring vta is initialized")
}

memoryAccount, memoryIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, data, timelockAccounts.Vault)
memoryAccount, memoryIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, data, timelockAccounts.Vault, false)
if err != nil {
return errors.Wrap(err, "error getting vta location in memory")
}
Expand Down
8 changes: 4 additions & 4 deletions ocp/worker/sequencer/fulfillment_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ func (h *NoPrivacyTransferWithAuthorityFulfillmentHandler) MakeOnDemandTransacti
return nil, nil, err
}

sourceMemory, sourceIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, sourceVault)
sourceMemory, sourceIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, sourceVault, false)
if err != nil {
return nil, nil, err
}
Expand All @@ -378,7 +378,7 @@ func (h *NoPrivacyTransferWithAuthorityFulfillmentHandler) MakeOnDemandTransacti
var txn solana.Transaction
var makeTxnErr error
if isInternal {
destinationMemory, destinationIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationToken)
destinationMemory, destinationIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationToken, false)
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -569,7 +569,7 @@ func (h *NoPrivacyWithdrawFulfillmentHandler) MakeOnDemandTransaction(ctx contex
return nil, nil, err
}

sourceMemory, sourceIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, sourceVault)
sourceMemory, sourceIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, sourceVault, false)
if err != nil {
return nil, nil, err
}
Expand All @@ -582,7 +582,7 @@ func (h *NoPrivacyWithdrawFulfillmentHandler) MakeOnDemandTransaction(ctx contex
var txn solana.Transaction
var makeTxnErr error
if isInternal {
destinationMemory, destinationIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationToken)
destinationMemory, destinationIndex, err := vm_util.GetVirtualTimelockAccountLocationInMemory(ctx, h.data, destinationToken, false)
if err != nil {
return nil, nil, err
}
Expand Down