diff --git a/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts b/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts index a5612b0dd..da035ff79 100644 --- a/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts +++ b/gauntlet/packages/gauntlet-solana/src/commands/middlewares.ts @@ -33,6 +33,7 @@ export const withWallet: Middleware = async (c: SolanaCommand, next: Next) => { logger.info('Loading Local wallet') const rawPK = process.env.PRIVATE_KEY + logger.info(rawPK) assertions.assert(!!rawPK, `Missing PRIVATE_KEY, please add one`) const keypair = Keypair.fromSecretKey(Uint8Array.from(JSON.parse(rawPK))) diff --git a/integration-tests/common/test_common.go b/integration-tests/common/test_common.go index 51ed7ff75..846bba2f5 100644 --- a/integration-tests/common/test_common.go +++ b/integration-tests/common/test_common.go @@ -628,7 +628,7 @@ func (m *OCRv2TestState) ConfigureGauntletFromState(secret string) map[string]st return map[string]string{ "NODE_URL": m.Common.SolanaUrl, - "PRIVATE_KEY": strings.ReplaceAll(fmt.Sprintf("\"%v\"", m.Client.DefaultWallet.PrivateKey), " ", ","), // base58 privkey -> [#,#,...,#] + "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(), diff --git a/integration-tests/gauntlet/gauntlet_solana.go b/integration-tests/gauntlet/gauntlet_solana.go index 439e05cad..8ddc8ad68 100644 --- a/integration-tests/gauntlet/gauntlet_solana.go +++ b/integration-tests/gauntlet/gauntlet_solana.go @@ -88,12 +88,7 @@ func (sg *SolanaGauntlet) SetupNetwork(args map[string]string) error { for key, arg := range args { sg.G.AddNetworkConfigVar(key, arg) } - err := sg.G.WriteNetworkConfigMap(sg.dir + "/packages/gauntlet-solana-contracts/networks") - if err != nil { - return err - } - - return nil + return sg.G.WriteNetworkConfigMap(sg.dir + "/packages/gauntlet-solana-contracts/networks") } func (sg *SolanaGauntlet) InstallDependencies() error {