Skip to content

Commit

Permalink
proper format for privkey
Browse files Browse the repository at this point in the history
  • Loading branch information
@aalu1418
aalu1418 committed Apr 1, 2024
1 parent 592ed66 commit 40a9d34
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion integration-tests/common/test_common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ func (m *OCRv2TestState) ConfigureGauntletFromState(secret string) map[string]st

return map[string]string{
"NODE_URL": m.Common.SolanaUrl,
"PRIVATE_KEY": m.Client.DefaultWallet.PrivateKey.String(),
"PRIVATE_KEY": strings.ReplaceAll(fmt.Sprintf("\"%v\"", m.Client.DefaultWallet.PrivateKey), " ", ","), // base58 privkey -> [#,#,...,#]
"PROGRAM_ID_OCR2": m.Client.ProgramWallets["ocr2-keypair.json"].PublicKey().String(),
"PROGRAM_ID_ACCESS_CONTROLLER": m.Client.ProgramWallets["access_controller-keypair.json"].PublicKey().String(),
"PROGRAM_ID_STORE": m.Client.ProgramWallets["store-keypair.json"].PublicKey().String(),
Expand Down
52 changes: 26 additions & 26 deletions integration-tests/gauntlet/gauntlet_solana.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ func (sg *SolanaGauntlet) SetupNetwork(args map[string]string) error {

func (sg *SolanaGauntlet) InstallDependencies() error {
sg.G.Command = "yarn"
_, err := sg.G.ExecCommand([]string{"install"}, *sg.options)
logs, err := sg.G.ExecCommand([]string{"install"}, *sg.options)
if err != nil {
return err
return fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.G.Command = "gauntlet"
return nil
Expand All @@ -119,9 +119,9 @@ func (sg *SolanaGauntlet) InitializeAccessController() (string, error) {
}

func (sg *SolanaGauntlet) InitializeStore(billingController string) (string, error) {
_, err := sg.G.ExecCommand([]string{"store:initialize", fmt.Sprintf("--accessController=%s", billingController)}, *sg.options)
logs, err := sg.G.ExecCommand([]string{"store:initialize", fmt.Sprintf("--accessController=%s", billingController)}, *sg.options)
if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -135,9 +135,9 @@ func (sg *SolanaGauntlet) StoreCreateFeed(length int, feedConfig *utils.StoreFee
if err != nil {
return "", err
}
_, err = sg.G.ExecCommand([]string{"store:create_feed", fmt.Sprintf("--length=%d", length), fmt.Sprintf("--input=%v", string(config))}, *sg.options)
logs, err := sg.G.ExecCommand([]string{"store:create_feed", fmt.Sprintf("--length=%d", length), fmt.Sprintf("--input=%v", string(config))}, *sg.options)
if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -148,9 +148,9 @@ func (sg *SolanaGauntlet) StoreCreateFeed(length int, feedConfig *utils.StoreFee
}

func (sg *SolanaGauntlet) StoreSetValidatorConfig(feedAddress string, threshold int) (string, error) {
_, err := sg.G.ExecCommand([]string{"store:set_validator_config", fmt.Sprintf("--feed=%s", feedAddress), fmt.Sprintf("--threshold=%d", threshold)}, *sg.options)
logs, err := sg.G.ExecCommand([]string{"store:set_validator_config", fmt.Sprintf("--feed=%s", feedAddress), fmt.Sprintf("--threshold=%d", threshold)}, *sg.options)
if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand Down Expand Up @@ -185,7 +185,7 @@ func (sg *SolanaGauntlet) StoreSetWriter(storeConfig *utils.StoreWriterConfig, o
if err != nil {
return "", err
}
_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"store:set_writer",
fmt.Sprintf("--input=%v", string(config)),
ocrAddress,
Expand All @@ -194,7 +194,7 @@ func (sg *SolanaGauntlet) StoreSetWriter(storeConfig *utils.StoreWriterConfig, o
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -209,7 +209,7 @@ func (sg *SolanaGauntlet) OCR2SetBilling(ocr2BillingConfig *utils.OCR2BillingCon
if err != nil {
return "", err
}
_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:set_billing",
fmt.Sprintf("--input=%v", string(config)),
ocrAddress,
Expand All @@ -218,7 +218,7 @@ func (sg *SolanaGauntlet) OCR2SetBilling(ocr2BillingConfig *utils.OCR2BillingCon
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -229,15 +229,15 @@ func (sg *SolanaGauntlet) OCR2SetBilling(ocr2BillingConfig *utils.OCR2BillingCon
}

func (sg *SolanaGauntlet) OCR2CreateProposal(version int) (string, error) {
_, err := sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:create_proposal",
fmt.Sprintf("--version=%d", version),
},
*sg.options,
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -253,7 +253,7 @@ func (sg *SolanaGauntlet) ProposeOnChainConfig(proposalId string, onChainConfig
return "", err
}

_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:propose_config",
fmt.Sprintf("--proposalId=%s", proposalId),
fmt.Sprintf("--input=%v", string(config)),
Expand All @@ -263,7 +263,7 @@ func (sg *SolanaGauntlet) ProposeOnChainConfig(proposalId string, onChainConfig
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -279,7 +279,7 @@ func (sg *SolanaGauntlet) ProposeOffChainConfig(proposalId string, offChainConfi
return "", err
}

_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:propose_offchain_config",
fmt.Sprintf("--proposalId=%s", proposalId),
fmt.Sprintf("--input=%v", string(config)),
Expand All @@ -289,7 +289,7 @@ func (sg *SolanaGauntlet) ProposeOffChainConfig(proposalId string, offChainConfi
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -305,7 +305,7 @@ func (sg *SolanaGauntlet) ProposePayees(proposalId string, payeesConfig utils.Pa
return "", err
}

_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:propose_payees",
fmt.Sprintf("--proposalId=%s", proposalId),
fmt.Sprintf("--input=%v", string(config)),
Expand All @@ -315,7 +315,7 @@ func (sg *SolanaGauntlet) ProposePayees(proposalId string, payeesConfig utils.Pa
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -326,15 +326,15 @@ func (sg *SolanaGauntlet) ProposePayees(proposalId string, payeesConfig utils.Pa
}

func (sg *SolanaGauntlet) FinalizeProposal(proposalId string) (string, error) {
_, err := sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:finalize_proposal",
fmt.Sprintf("--proposalId=%s", proposalId),
},
*sg.options,
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -350,7 +350,7 @@ func (sg *SolanaGauntlet) AcceptProposal(proposalId string, secret string, propo
return "", err
}

_, err = sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:accept_proposal",
fmt.Sprintf("--proposalId=%s", proposalId),
fmt.Sprintf("--secret=%s", secret),
Expand All @@ -361,7 +361,7 @@ func (sg *SolanaGauntlet) AcceptProposal(proposalId string, secret string, propo
)

if err != nil {
return "", err
return "", fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand All @@ -373,15 +373,15 @@ func (sg *SolanaGauntlet) AcceptProposal(proposalId string, secret string, propo

// FetchTransmissions returns the last 10 transmissions
func (sg *SolanaGauntlet) FetchTransmissions(ocrState string) ([]utils.Transmission, error) {
_, err := sg.G.ExecCommand([]string{
logs, err := sg.G.ExecCommand([]string{
"ocr2:inspect:responses",
ocrState,
},
*sg.options,
)

if err != nil {
return nil, err
return nil, fmt.Errorf("err: %w, logs: %s", err, logs)
}
sg.gr, err = sg.FetchGauntletJsonOutput()
if err != nil {
Expand Down

0 comments on commit 40a9d34

Please sign in to comment.