Skip to content

guard race condition with sync.Once for solana forwarder changesets #21860

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

Draft
Unheilbar wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

guard race condition with sync.Once for solana forwarder changesets #21860

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
17 changes: 11 additions & 6 deletions deployment/cre/forwarder/solana/sequence/operation/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package operation
import (
"errors"
"fmt"
"sync"

"github.com/Masterminds/semver/v3"
"github.com/gagliardetto/solana-go"
Expand All @@ -24,6 +25,14 @@ import (

var Version1_0_0 = semver.MustParse("1.0.0")

var setForwarderProgramIDOnce sync.Once

func ensureForwarderProgramID(id solana.PublicKey) {
setForwarderProgramIDOnce.Do(func() {
ks_forwarder.SetProgramID(id)
})
}

var (
DeployForwarderOp = operations.NewOperation(
"deploy-forwarder-op",
Expand Down Expand Up @@ -98,9 +107,7 @@ type (

func initForwarder(b operations.Bundle, deps Deps, in InitForwarderInput) (InitForwarderOutput, error) {
var out InitForwarderOutput
if ks_forwarder.ProgramID.IsZero() {
ks_forwarder.SetProgramID(in.ProgramID)
}
ensureForwarderProgramID(in.ProgramID)

stateKey, err := solana.NewRandomPrivateKey()
if err != nil {
Expand Down Expand Up @@ -180,9 +187,7 @@ func configureForwarder(b operations.Bundle, deps Deps, in ConfigureForwarderInp
var out ConfigureForwarderOutput

var instructions *ks_forwarder.Instruction
if ks_forwarder.ProgramID.IsZero() {
ks_forwarder.SetProgramID(in.ProgramID)
}
ensureForwarderProgramID(in.ProgramID)

configPDA := solana.MustPublicKeyFromBase58(in.ConfigPDA)

Expand Down
17 changes: 11 additions & 6 deletions deployment/keystone/changeset/solana/sequence/operation/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package operation
import (
"errors"
"fmt"
"sync"

"github.com/Masterminds/semver/v3"
"github.com/gagliardetto/solana-go"
Expand All @@ -24,6 +25,14 @@ import (

var Version1_0_0 = semver.MustParse("1.0.0")

var setForwarderProgramIDOnce sync.Once

func ensureForwarderProgramID(id solana.PublicKey) {
setForwarderProgramIDOnce.Do(func() {
ks_forwarder.SetProgramID(id)
})
}

var (
DeployForwarderOp = operations.NewOperation(
"deploy-forwarder-op",
Expand Down Expand Up @@ -98,9 +107,7 @@ type (

func initForwarder(b operations.Bundle, deps Deps, in InitForwarderInput) (InitForwarderOutput, error) {
var out InitForwarderOutput
if ks_forwarder.ProgramID.IsZero() {
ks_forwarder.SetProgramID(in.ProgramID)
}
ensureForwarderProgramID(in.ProgramID)

stateKey, err := solana.NewRandomPrivateKey()
if err != nil {
Expand Down Expand Up @@ -180,9 +187,7 @@ func configureForwarder(b operations.Bundle, deps Deps, in ConfigureForwarderInp
var out ConfigureForwarderOutput

var instructions *ks_forwarder.Instruction
if ks_forwarder.ProgramID.IsZero() {
ks_forwarder.SetProgramID(in.ProgramID)
}
ensureForwarderProgramID(in.ProgramID)

configPDA := solana.MustPublicKeyFromBase58(in.ConfigPDA)

Expand Down
Loading