chore: cleanup cli directory structure (#80)

shapeshift · Jul 16, 2024 · c149033 · c149033
1 parent ef2c5d0
commit c149033
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 8 deletions.
diff --git a/scripts/hotWalletCli/MultiSig.md → cli/MultiSig.md b/scripts/hotWalletCli/MultiSig.md → cli/MultiSig.md
diff --git a/scripts/hotWalletCli/README.md → cli/README.md b/scripts/hotWalletCli/README.md → cli/README.md
diff --git a/scripts/hotWalletCli/generated/abi.ts → cli/generated/abi.ts b/scripts/hotWalletCli/generated/abi.ts → cli/generated/abi.ts
diff --git a/scripts/hotWalletCli/package.json → cli/package.json b/scripts/hotWalletCli/package.json → cli/package.json
@@ -1,16 +1,16 @@
 {
-  "name": "hot-wallet-cli",
+  "name": "rfox-cli",
   "version": "1.0.0",
   "type": "module",
-  "exports": "./index.js",
+  "exports": "./src/index.js",
   "engines": {
     "node": ">=18"
   },
   "license": "MIT",
   "scripts": {
     "clean": "rm -rf node_modules",
     "generate": "yarn wagmi generate",
-    "start": "tsx index.ts"
+    "start": "tsx src/index.ts"
   },
   "dependencies": {
     "@inquirer/core": "^8.2.2",

diff --git a/scripts/hotWalletCli/sample.env → cli/sample.env b/scripts/hotWalletCli/sample.env → cli/sample.env
diff --git a/scripts/hotWalletCli/client.ts → cli/src/client.ts b/scripts/hotWalletCli/client.ts → cli/src/client.ts
@@ -4,8 +4,8 @@ import BigNumber from 'bignumber.js'
 import ora, { Ora } from 'ora'
 import { Address, PublicClient, createPublicClient, getAddress, getContract, http } from 'viem'
 import { arbitrum } from 'viem/chains'
+import { stakingV1Abi } from '../generated/abi'
 import { RFOX_REWARD_RATE } from './constants'
-import { stakingV1Abi } from './generated/abi'
 import { error, info, warn } from './logging'
 import { RewardDistribution } from './types'
 

diff --git a/scripts/hotWalletCli/constants.ts → cli/src/constants.ts b/scripts/hotWalletCli/constants.ts → cli/src/constants.ts
diff --git a/scripts/hotWalletCli/file.ts → cli/src/file.ts b/scripts/hotWalletCli/file.ts → cli/src/file.ts
diff --git a/scripts/hotWalletCli/index.ts → cli/src/index.ts b/scripts/hotWalletCli/index.ts → cli/src/index.ts
@@ -4,13 +4,13 @@ import BigNumber from 'bignumber.js'
 import fs from 'node:fs'
 import path from 'node:path'
 import ora from 'ora'
-import { Epoch } from './types'
 import { Client } from './client'
 import { MONTHS, RFOX_DIR } from './constants'
 import { isEpochDistributionStarted } from './file'
 import { IPFS } from './ipfs'
 import { error, info, success, warn } from './logging'
 import { create, recoverKeystore } from './mnemonic'
+import { Epoch } from './types'
 import { Wallet } from './wallet'
 
 const processEpoch = async () => {

diff --git a/scripts/hotWalletCli/ipfs.ts → cli/src/ipfs.ts b/scripts/hotWalletCli/ipfs.ts → cli/src/ipfs.ts
diff --git a/scripts/hotWalletCli/logging.ts → cli/src/logging.ts b/scripts/hotWalletCli/logging.ts → cli/src/logging.ts
diff --git a/scripts/hotWalletCli/mnemonic.ts → cli/src/mnemonic.ts b/scripts/hotWalletCli/mnemonic.ts → cli/src/mnemonic.ts
diff --git a/scripts/hotWalletCli/types.ts → cli/src/types.ts b/scripts/hotWalletCli/types.ts → cli/src/types.ts
diff --git a/scripts/hotWalletCli/wallet.ts → cli/src/wallet.ts b/scripts/hotWalletCli/wallet.ts → cli/src/wallet.ts
@@ -159,7 +159,7 @@ export class Wallet {
     success(`Unsigned funding transaction created (${unsignedTxFile})`)
 
     info(
-      `Follow the steps for signing and broadcasting the funding transaction as detailed here: https://github.com/shapeshift/rFOX/blob/main/scripts/hotWalletCli/MultiSig.md`,
+      'Follow the steps for signing and broadcasting the funding transaction as detailed here: https://github.com/shapeshift/rFOX/blob/main/cli/MultiSig.md',
     )
 
     const spinner = ora('Waiting for hot wallet to be funded...').start()

diff --git a/scripts/hotWalletCli/tsconfig.json → cli/tsconfig.json b/scripts/hotWalletCli/tsconfig.json → cli/tsconfig.json
diff --git a/scripts/hotWalletCli/wagmi.config.ts → cli/wagmi.config.ts b/scripts/hotWalletCli/wagmi.config.ts → cli/wagmi.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from '@wagmi/cli'
 import { foundry, FoundryConfig } from '@wagmi/cli/plugins'
 
 const foundryConfig: FoundryConfig = {
-  project: '../../foundry',
+  project: '../foundry',
   artifacts: 'out',
   include: ['StakingV1.json'],
 }

diff --git a/scripts/hotWalletCli/yarn.lock → cli/yarn.lock b/scripts/hotWalletCli/yarn.lock → cli/yarn.lock
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "typescript": "^5.4.5"
   },
   "scripts": {
-    "build": "forge build --root foundry && cd scripts/hotWalletCli && yarn && yarn generate",
+    "build": "forge build --root foundry && cd cli && yarn && yarn generate",
     "lint:sol": "npx prettier --write --plugin=prettier-plugin-solidity foundry/src/**/*.sol foundry/test/**/*.t.sol"
   },
   "simple-git-hooks": {