Change gauntlet to network-component-protocol structure, adjust go paths

smartcontractkit · Jun 17, 2022 · 3eb6c27 · 3eb6c27
1 parent fb1502f
commit 3eb6c27
Show file tree

Hide file tree

Showing 88 changed files with 121 additions and 114 deletions.
diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
@@ -19,8 +19,8 @@ jobs:
       - name: Install Solana CLI
         run: ./scripts/install-solana-ci.sh
       - name: Build
-        run: go build -v ./pkg/...
+        run: go build -v ./relayer/pkg/...
       - name: Test
-        run: go test ./pkg/... -v
+        run: go test ./relayer/pkg/... -v
       - name: Test with the race detector enabled
-        run: go test ./pkg/... -v -race -count=10
+        run: go test ./relayer/pkg/... -v -race -count=10
diff --git a/.github/workflows/release/solana-gauntlet-cli.yml b/.github/workflows/release/solana-gauntlet-cli.yml
@@ -3,7 +3,7 @@ name: Solana Gauntlet CLI Release
 on:
   push:
     tags:
-      - "@chainlink/solana-gauntlet-cli@[0-9]+.[0-9]+.[0-9]"
+      - "@chainlink/solana-gauntlet-contracts@[0-9]+.[0-9]+.[0-9]"
 
 jobs:
   solana-gauntlet-cli-release:
@@ -39,7 +39,7 @@ jobs:
           nix develop -c yarn bundle
       # Store gauntlet-cli version
       - name: Set Env Variables
-        run: echo "SOLANA_GAUNTLET_CLI=$(npm info @chainlink/gauntlet-solana-contracts version)" >> $GITHUB_ENV
+        run: echo "SOLANA_GAUNTLET_CLI=$(npm info @chainlink/solana-gauntlet-contracts version)" >> $GITHUB_ENV
       # Upload gauntlet binary to gauntlet-cli release
       - name: Upload Gauntlet Binary
         uses: svenstaro/upload-release-action@v2
@@ -48,5 +48,5 @@ jobs:
           file: gauntlet/bin/gauntlet-*
           file_glob: true
           tag: |
-            @chainlink/gauntlet-solana-contracts@${{ env.solana_GAUNTLET_CLI }}
+            @chainlink/solana-gauntlet-contracts@${{ env.solana_GAUNTLET_CLI }}
           overwrite: false
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 .vscode/
 
 # ignore relay build
-pkg/bin
+relayer/pkg/bin
 
 v1/target
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,9 @@ Chainlink-Solana contains a number of projects, all individually versioned and r
 - [@chainlink/solana-relayer](/relayer/)
 - [@chainlink/solana-ops](/ops/)
 - [@chainlink/solana-integration-tests](/tests/)
-- [@chainlink/gauntlet-solana](/gauntlet/packages/gauntlet-solana/)
+- [@chainlink/solana-gauntlet](/gauntlet/packages/gauntlet-solana/)
 - [@chainlink/gauntlet-serum-multisig](/gauntlet/packages/gauntlet-serum-multisig/)
-- [@chainlink/gauntlet-solana-contracts](/gauntlet/packages/gauntlet-solana-contracts/)
+- [@chainlink/solana-gauntlet-contracts](/gauntlet/packages/gauntlet-solana-contracts/)
 - [@chainlink/solana-sdk](/ts/)
 - [@chainlink/solana-contracts](/contracts/)
 

diff --git a/Makefile b/Makefile
@@ -71,8 +71,8 @@ build_local: build_js build_contracts_local cp_gauntlet_idl
 build_staging: build_js build_contracts_staging cp_gauntlet_idl
 
 test_relay_unit:
-	go build -v ./pkg/...
-	go test -v ./pkg/...
+	go build -v ./relayer/pkg/...
+	go test -v ./relayer/pkg/...
 
 test_smoke:
 	SELECTED_NETWORKS=solana NETWORK_SETTINGS=$(shell pwd)/tests/e2e/networks.yaml ginkgo tests/e2e/smoke

diff --git a/cmd/monitoring/main.go b/cmd/monitoring/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
 	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
 
-	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring"
+	"github.com/smartcontractkit/chainlink-solana/relayer/pkg/monitoring"
 )
 
 func main() {

diff --git a/docs/gauntlet/gauntlet-setup.md b/docs/gauntlet/gauntlet-setup.md
@@ -1,4 +1,4 @@
-# Gauntlet Solana
+# Solana Gauntlet
 
 Install node version with asdf. Which can be done by running this from the base of the chainlink-solana repository:
 

diff --git a/gauntlet/README.md b/gauntlet/README.md
@@ -1,3 +1,3 @@
-# Gauntlet Solana
+# Solana Gauntlet
 
 For more information, see the [Chainlink Solana Documentation](./docs/gauntlet).
diff --git a/gauntlet/jest.config.js b/gauntlet/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   rootDir: '.',
   projects: [
     {
-      displayName: 'gauntlet-solana',
+      displayName: 'solana-gauntlet',
       preset: 'ts-jest',
       testEnvironment: 'node',
       testMatch: ['<rootDir>/packages/gauntlet-solana/**/*.test.ts'],
@@ -13,7 +13,7 @@ module.exports = {
       },
     },
     {
-      displayName: 'gauntlet-solana-contracts',
+      displayName: 'solana-gauntlet-contracts',
       preset: 'ts-jest',
       testEnvironment: 'node',
       testMatch: ['<rootDir>/packages/gauntlet-solana-contracts/**/*.test.ts'],

diff --git a/gauntlet/package.json b/gauntlet/package.json
@@ -2,7 +2,7 @@
   "name": "gauntlet",
   "private": true,
   "version": "0.0.1",
-  "description": "Gauntlet Solana",
+  "description": "Solana Gauntlet",
   "workspaces": [
     "packages/*"
   ],

diff --git a/gauntlet/packages/gauntlet-serum-multisig/package.json b/gauntlet/packages/gauntlet-serum-multisig/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@chainlink/gauntlet-core": "0.1.2",
-    "@chainlink/gauntlet-solana": "*",
+    "@chainlink/solana-gauntlet": "*",
     "@project-serum/anchor": "^0.23.0",
     "@solana/web3.js": "^1.31.0"
   }

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/create.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/create.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/solana-gauntlet'
 import { PublicKey, SYSVAR_RENT_PUBKEY, Keypair } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/inspect.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/inspect.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/multisig.ts
@@ -1,4 +1,4 @@
-import { SolanaCommand, utils } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, utils } from '@chainlink/solana-gauntlet'
 import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils'
 import { PublicKey, Keypair, TransactionInstruction, SystemProgram, AccountMeta } from '@solana/web3.js'
 import { Idl, Program } from '@project-serum/anchor'

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/setOwners.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/setOwners.ts
@@ -1,4 +1,4 @@
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { Result } from '@chainlink/gauntlet-core'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/commands/setThreshold.ts b/gauntlet/packages/gauntlet-serum-multisig/src/commands/setThreshold.ts
@@ -1,4 +1,4 @@
-import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { Result } from '@chainlink/gauntlet-core'
 import { BN, logger } from '@chainlink/gauntlet-core/dist/utils'

diff --git a/gauntlet/packages/gauntlet-serum-multisig/src/lib/contracts.ts b/gauntlet/packages/gauntlet-serum-multisig/src/lib/contracts.ts
@@ -1,4 +1,4 @@
-import { contracts } from '@chainlink/gauntlet-solana'
+import { contracts } from '@chainlink/solana-gauntlet'
 import { join } from 'path'
 
 export enum CONTRACT_LIST {

diff --git a/gauntlet/packages/gauntlet-solana-contracts/README.md b/gauntlet/packages/gauntlet-solana-contracts/README.md
@@ -1,4 +1,4 @@
-# gauntlet-solana
+# solana-gauntlet
 
 ### Prepare
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/package.json b/gauntlet/packages/gauntlet-solana-contracts/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@chainlink/gauntlet-solana-contracts",
+  "name": "@chainlink/solana-gauntlet-contracts",
   "version": "0.0.1",
-  "description": "Gauntlet Solana Contracts",
+  "description": "Solana Gauntlet Contracts",
   "keywords": [
     "typescript",
     "cli"
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@chainlink/gauntlet-core": "0.1.2",
-    "@chainlink/gauntlet-solana": "*",
+    "@chainlink/solana-gauntlet": "*",
     "@chainlink/gauntlet-serum-multisig": "*",
     "@ethersproject/keccak256": "^5.5.0",
     "@solana/spl-token": "^0.1.8",

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/close.ts
@@ -1,5 +1,5 @@
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand } from '@chainlink/gauntlet-solana'
+import { SolanaCommand } from '@chainlink/solana-gauntlet'
 import { PublicKey, TransactionInstruction, AccountMeta } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/index.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/index.ts
@@ -1,6 +1,6 @@
 import { ICommand, Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse, contracts } from '@chainlink/solana-gauntlet'
 import { CONTRACT_LIST, getDeploymentContract } from '../../lib/contracts'
 
 enum SOLANA_OPERATIONS {

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/upgrade.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/abstract/upgrade.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse, utils } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse, utils } from '@chainlink/solana-gauntlet'
 import {
   AccountMeta,
   PublicKey,

diff --git a/...t/packages/gauntlet-solana-contracts/src/commands/contracts/accessController/addAccess.ts b/...t/packages/gauntlet-solana-contracts/src/commands/contracts/accessController/addAccess.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 

diff --git a/.../packages/gauntlet-solana-contracts/src/commands/contracts/accessController/initialize.ts b/.../packages/gauntlet-solana-contracts/src/commands/contracts/accessController/initialize.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { Keypair, SystemProgram, SYSVAR_RENT_PUBKEY } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/accessController/read.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/accessController/read.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/fund.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/fund.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/initialize.flow.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/initialize.flow.ts
@@ -1,5 +1,5 @@
 import { FlowCommand } from '@chainlink/gauntlet-core'
-import { TransactionResponse, waitExecute } from '@chainlink/gauntlet-solana'
+import { TransactionResponse, waitExecute } from '@chainlink/solana-gauntlet'
 import { CONTRACT_LIST } from '../../../lib/contracts'
 import { makeAbstractCommand } from '../../abstract'
 import Initialize from './initialize'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/initialize.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/initialize.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { Keypair, PublicKey, TransactionInstruction, SystemProgram, SYSVAR_RENT_PUBKEY } from '@solana/web3.js'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/...tlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/inspection/inspect.ts b/...tlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/inspection/inspect.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { inspection, BN, logger } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { Keypair, PublicKey, SystemProgram } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../../lib/contracts'
 import { deserializeConfig } from '../../../../lib/encoding'

diff --git a/...ages/gauntlet-solana-contracts/src/commands/contracts/ocr2/inspection/inspectResponses.ts b/...ages/gauntlet-solana-contracts/src/commands/contracts/ocr2/inspection/inspectResponses.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../../lib/contracts'
 import { inspection, logger } from '@chainlink/gauntlet-core/dist/utils'

diff --git a/...packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts b/...packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/acceptProposal.ts
@@ -1,7 +1,7 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { createHash } from 'crypto'
 import { logger, prompt, BN } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { utils } from '@project-serum/anchor'

diff --git a/...packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/createProposal.ts b/...packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/createProposal.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey, Keypair, SystemProgram } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../../lib/contracts'
 

diff --git a/...ckages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/finalizeProposal.ts b/...ckages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposal/finalizeProposal.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposeConfig.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposeConfig.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, BN, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { ORACLES_MAX_LENGTH } from '../../../lib/constants'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/...t/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposeOffchainConfig.ts b/...t/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposeOffchainConfig.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt, time, BN, longs } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey, TransactionInstruction } from '@solana/web3.js'
 import { MAX_TRANSACTION_BYTES, ORACLES_MAX_LENGTH } from '../../../lib/constants'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposePayees.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/proposePayees.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/read.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/read.ts
@@ -1,7 +1,7 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { Proto } from '@chainlink/gauntlet-core/dist/crypto'
 import { BN } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBilling.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { utils } from '@project-serum/anchor'

diff --git a/...kages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBillingAccessController.ts b/...kages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setBillingAccessController.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 

diff --git a/...ges/gauntlet-solana-contracts/src/commands/contracts/ocr2/setRequesterAccessController.ts b/...ges/gauntlet-solana-contracts/src/commands/contracts/ocr2/setRequesterAccessController.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setup.dev.flow.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/setup.dev.flow.ts
@@ -1,5 +1,5 @@
 import { FlowCommand } from '@chainlink/gauntlet-core'
-import { TransactionResponse, waitExecute } from '@chainlink/gauntlet-solana'
+import { TransactionResponse, waitExecute } from '@chainlink/solana-gauntlet'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'
 import { CONTRACT_ENV_NAMES, CONTRACT_LIST, getDeploymentContract } from '../../../lib/contracts'
 import { makeAbstractCommand } from '../../abstract'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/transmit.dev.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/transmit.dev.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { parseIdlErrors, ProgramError, utils } from '@project-serum/anchor'
 import { Keypair, PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { createHash } from 'crypto'

diff --git a/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/withdrawFunds.ts b/gauntlet/packages/gauntlet-solana-contracts/src/commands/contracts/ocr2/withdrawFunds.ts
@@ -1,5 +1,5 @@
 import { Result } from '@chainlink/gauntlet-core'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { utils } from '@project-serum/anchor'

diff --git a/...et/packages/gauntlet-solana-contracts/src/commands/contracts/ownership/acceptOwnership.ts b/...et/packages/gauntlet-solana-contracts/src/commands/contracts/ownership/acceptOwnership.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 import { GetOwnership } from './inspectOwnership'

diff --git a/...t/packages/gauntlet-solana-contracts/src/commands/contracts/ownership/inspectOwnership.ts b/...t/packages/gauntlet-solana-contracts/src/commands/contracts/ownership/inspectOwnership.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { Idl, Program } from '@project-serum/anchor'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'

diff --git a/.../packages/gauntlet-solana-contracts/src/commands/contracts/ownership/transferOwnership.ts b/.../packages/gauntlet-solana-contracts/src/commands/contracts/ownership/transferOwnership.ts
@@ -1,6 +1,6 @@
 import { Result } from '@chainlink/gauntlet-core'
 import { logger, prompt } from '@chainlink/gauntlet-core/dist/utils'
-import { SolanaCommand, TransactionResponse } from '@chainlink/gauntlet-solana'
+import { SolanaCommand, TransactionResponse } from '@chainlink/solana-gauntlet'
 import { PublicKey } from '@solana/web3.js'
 import { CONTRACT_LIST, getContract } from '../../../lib/contracts'
 import { GetOwnership } from './inspectOwnership'