Skip to content

Commit 994e6cf

Browse files
jeffyantajeffyanta
committed
Workers
1 parent f665fcf commit 994e6cf

28 files changed

Lines changed: 588 additions & 570 deletions

‎pkg/code/async/account/service.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ func (p *service) mustLoadAirdropper(ctx context.Context) {
6565
})
6666

6767
err := func() error {
68+
vmConfig, err := common.GetVmConfigForMint(ctx, p.data, common.CoreMintAccount)
69+
if err != nil {
70+
return err
71+
}
72+
6873
vaultRecord, err := p.data.GetKey(ctx, p.conf.airdropperOwnerPublicKey.Get(ctx))
6974
if err != nil {
7075
return err
@@ -75,7 +80,7 @@ func (p *service) mustLoadAirdropper(ctx context.Context) {
7580
return err
7681
}
7782

78-
timelockAccounts, err := ownerAccount.GetTimelockAccounts(common.CodeVmAccount, common.CoreMintAccount)
83+
timelockAccounts, err := ownerAccount.GetTimelockAccounts(vmConfig)
7984
if err != nil {
8085
return err
8186
}

‎pkg/code/async/account/testutil.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ func setup(t *testing.T) *testEnv {
5858
}
5959

6060
func (e *testEnv) generateRandomGiftCard(t *testing.T, creationTs time.Time) *testGiftCard {
61-
vm := testutil.NewRandomAccount(t)
6261
authority := testutil.NewRandomAccount(t)
6362

64-
timelockAccounts, err := authority.GetTimelockAccounts(vm, common.CoreMintAccount)
63+
vmConfig := testutil.NewRandomVmConfig(t, true)
64+
65+
timelockAccounts, err := authority.GetTimelockAccounts(vmConfig)
6566
require.NoError(t, err)
6667

6768
accountInfoRecord := &account.Record{
@@ -82,7 +83,7 @@ func (e *testEnv) generateRandomGiftCard(t *testing.T, creationTs time.Time) *te
8283
IntentId: testutil.NewRandomAccount(t).PublicKey().ToBase58(),
8384
IntentType: intent.SendPublicPayment,
8485

85-
MintAccount: common.CoreMintAccount.PublicKey().ToBase58(),
86+
MintAccount: vmConfig.Mint.PublicKey().ToBase58(),
8687

8788
InitiatorOwnerAccount: testutil.NewRandomAccount(t).PublicKey().ToBase58(),
8889

‎pkg/code/async/geyser/external_deposit.go‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ func fixMissingExternalDeposits(ctx context.Context, data code_data.Provider, vm
6565
}
6666

6767
func maybeInitiateExternalDepositIntoVm(ctx context.Context, data code_data.Provider, vmIndexerClient indexerpb.IndexerClient, userAuthority *common.Account) error {
68-
vmDepositAccounts, err := userAuthority.GetVmDepositAccounts(common.CodeVmAccount, common.CoreMintAccount)
68+
vmConfig, err := common.GetVmConfigForMint(ctx, data, common.CoreMintAccount)
69+
if err != nil {
70+
return err
71+
}
72+
73+
vmDepositAccounts, err := userAuthority.GetVmDepositAccounts(vmConfig)
6974
if err != nil {
7075
return errors.Wrap(err, "error getting vm deposit ata")
7176
}
@@ -84,7 +89,12 @@ func maybeInitiateExternalDepositIntoVm(ctx context.Context, data code_data.Prov
8489
}
8590

8691
func initiateExternalDepositIntoVm(ctx context.Context, data code_data.Provider, vmIndexerClient indexerpb.IndexerClient, userAuthority *common.Account, balance uint64) error {
87-
vmDepositAccounts, err := userAuthority.GetVmDepositAccounts(common.CodeVmAccount, common.CoreMintAccount)
92+
vmConfig, err := common.GetVmConfigForMint(ctx, data, common.CoreMintAccount)
93+
if err != nil {
94+
return err
95+
}
96+
97+
vmDepositAccounts, err := userAuthority.GetVmDepositAccounts(vmConfig)
8898
if err != nil {
8999
return errors.Wrap(err, "error getting vm deposit ata")
90100
}
@@ -150,7 +160,12 @@ func initiateExternalDepositIntoVm(ctx context.Context, data code_data.Provider,
150160
}
151161

152162
func findPotentialExternalDepositsIntoVm(ctx context.Context, data code_data.Provider, userAuthority *common.Account) ([]string, error) {
153-
vmDepositAta, err := userAuthority.ToVmDepositAssociatedTokenAccount(common.CodeVmAccount, common.CoreMintAccount)
163+
vmConfig, err := common.GetVmConfigForMint(ctx, data, common.CoreMintAccount)
164+
if err != nil {
165+
return nil, err
166+
}
167+
168+
vmDepositAta, err := userAuthority.ToVmDepositAta(vmConfig)
154169
if err != nil {
155170
return nil, errors.Wrap(err, "error getting vm deposit ata")
156171
}
@@ -204,7 +219,12 @@ func findPotentialExternalDepositsIntoVm(ctx context.Context, data code_data.Pro
204219
}
205220

206221
func processPotentialExternalDepositIntoVm(ctx context.Context, data code_data.Provider, integration Integration, signature string, userAuthority *common.Account) error {
207-
vmDepositAta, err := userAuthority.ToVmDepositAssociatedTokenAccount(common.CodeVmAccount, common.CoreMintAccount)
222+
vmConfig, err := common.GetVmConfigForMint(ctx, data, common.CoreMintAccount)
223+
if err != nil {
224+
return err
225+
}
226+
227+
vmDepositAta, err := userAuthority.ToVmDepositAta(vmConfig)
208228
if err != nil {
209229
return errors.Wrap(err, "error getting vm deposit ata")
210230
}

‎pkg/code/async/geyser/timelock.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ func getTimelockUnlockState(ctx context.Context, data code_data.Provider, timelo
5151
return nil, 0, err
5252
}
5353

54-
vmConfig, err := common.GetVmConfigForMint(mintAccount)
54+
vmConfig, err := common.GetVmConfigForMint(ctx, data, mintAccount)
5555
if err != nil {
5656
return nil, 0, err
5757
}
5858

59-
timelockAccounts, err := vaultOwnerAccount.GetTimelockAccounts(vmConfig.Vm, mintAccount)
59+
timelockAccounts, err := vaultOwnerAccount.GetTimelockAccounts(vmConfig)
6060
if err != nil {
6161
return nil, 0, err
6262
}

‎pkg/code/async/sequencer/config.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ const (
1919
MaxGlobalFailedFulfillmentsConfigEnvName = envConfigPrefix + "MAX_GLOBAL_FAILED_FULFILLMENTS"
2020
defaultMaxGlobalFailedFulfillments = 10
2121

22-
//FulfillmentBatchSizeConfigEnvName = envConfigPrefix + "WORKER_BATCH_SIZE"
23-
//defaultFulfillmentBatchSize = 100
22+
FulfillmentBatchSizeConfigEnvName = envConfigPrefix + "WORKER_BATCH_SIZE"
23+
defaultFulfillmentBatchSize = 100
2424

2525
EnableSubsidizerChecksConfigEnvName = envConfigPrefix + "ENABLE_SUBSIDIZER_CHECKS"
2626
defaultEnableSubsidizerChecks = true
2727
)
2828

2929
type conf struct {
30-
disableTransactionScheduling config.Bool
31-
disableTransactionSubmission config.Bool
32-
maxGlobalFailedFulfillments config.Uint64
33-
//fulfillmentBatchSize config.Uint64
30+
disableTransactionScheduling config.Bool
31+
disableTransactionSubmission config.Bool
32+
maxGlobalFailedFulfillments config.Uint64
33+
fulfillmentBatchSize config.Uint64
3434
enableSubsidizerChecks config.Bool
3535
enableCachedTransactionLookup config.Bool
3636
}
@@ -42,10 +42,10 @@ type ConfigProvider func() *conf
4242
func WithEnvConfigs() ConfigProvider {
4343
return func() *conf {
4444
return &conf{
45-
disableTransactionScheduling: env.NewBoolConfig(DisableTransactionSchedulingConfigEnvName, defaultDisableTransactionScheduling),
46-
disableTransactionSubmission: env.NewBoolConfig(DisableTransactionSubmissionConfigEnvName, defaultDisableTransactionSubmission),
47-
maxGlobalFailedFulfillments: env.NewUint64Config(MaxGlobalFailedFulfillmentsConfigEnvName, defaultMaxGlobalFailedFulfillments),
48-
//fulfillmentBatchSize: env.NewUint64Config(FulfillmentBatchSizeConfigEnvName, defaultFulfillmentBatchSize),
45+
disableTransactionScheduling: env.NewBoolConfig(DisableTransactionSchedulingConfigEnvName, defaultDisableTransactionScheduling),
46+
disableTransactionSubmission: env.NewBoolConfig(DisableTransactionSubmissionConfigEnvName, defaultDisableTransactionSubmission),
47+
maxGlobalFailedFulfillments: env.NewUint64Config(MaxGlobalFailedFulfillmentsConfigEnvName, defaultMaxGlobalFailedFulfillments),
48+
fulfillmentBatchSize: env.NewUint64Config(FulfillmentBatchSizeConfigEnvName, defaultFulfillmentBatchSize),
4949
enableSubsidizerChecks: env.NewBoolConfig(EnableSubsidizerChecksConfigEnvName, defaultEnableSubsidizerChecks),
5050
enableCachedTransactionLookup: wrapper.NewBoolConfig(memory.NewConfig(false), false),
5151
}
@@ -60,10 +60,10 @@ type testOverrides struct {
6060
func withManualTestOverrides(overrides *testOverrides) ConfigProvider {
6161
return func() *conf {
6262
return &conf{
63-
disableTransactionScheduling: wrapper.NewBoolConfig(memory.NewConfig(overrides.disableTransactionScheduling), defaultDisableTransactionScheduling),
64-
disableTransactionSubmission: wrapper.NewBoolConfig(memory.NewConfig(true), defaultDisableTransactionSubmission),
65-
maxGlobalFailedFulfillments: wrapper.NewUint64Config(memory.NewConfig(overrides.maxGlobalFailedFulfillments), defaultMaxGlobalFailedFulfillments),
66-
//fulfillmentBatchSize: wrapper.NewUint64Config(memory.NewConfig(defaultFulfillmentBatchSize), defaultFulfillmentBatchSize),
63+
disableTransactionScheduling: wrapper.NewBoolConfig(memory.NewConfig(overrides.disableTransactionScheduling), defaultDisableTransactionScheduling),
64+
disableTransactionSubmission: wrapper.NewBoolConfig(memory.NewConfig(true), defaultDisableTransactionSubmission),
65+
maxGlobalFailedFulfillments: wrapper.NewUint64Config(memory.NewConfig(overrides.maxGlobalFailedFulfillments), defaultMaxGlobalFailedFulfillments),
66+
fulfillmentBatchSize: wrapper.NewUint64Config(memory.NewConfig(defaultFulfillmentBatchSize), defaultFulfillmentBatchSize),
6767
enableSubsidizerChecks: wrapper.NewBoolConfig(memory.NewConfig(false), defaultEnableSubsidizerChecks),
6868
enableCachedTransactionLookup: wrapper.NewBoolConfig(memory.NewConfig(true), true),
6969
}

0 commit comments

Comments
 (0)