Add CLI management tool (WIP)

.env.example

@@ -0,0 +1,2 @@
+ANCHOR_PROVIDER_URL=
+ANCHOR_WALLET=

.gitignore

@@ -8,3 +8,6 @@ test-ledger
 
 devnet.json
 yarn-error.log
+
+.env*
+!.env.example

package.json

@@ -28,10 +28,13 @@
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^9.0.0",
     "@types/node": "^18",
+    "@types/readline-sync": "^1.4.8",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.42.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
+    "chalk": "^5.3.0",
+    "cli-table3": "^0.6.5",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard-with-typescript": "^23.0.0",
@@ -42,6 +45,7 @@
     "eslint-plugin-react": "^7.31.10",
     "mocha": "^10.2.0",
     "prettier": "^2.6.2",
+    "readline-sync": "^1.4.10",
     "ts-mocha": "^10.0.0",
     "typescript": "^4.3.5"
   }

packages/fund-sender/client/index.ts

@@ -373,6 +373,23 @@ export class FundSenderClient {
     return this;
   }
 
+  public async sendFromState(
+  ): Promise<FundSenderClient> {
+    if (!this.config) {
+      throw new Error("Client not initialized");
+    }
+
+    await this.program.methods
+      .sendFromState()
+      .accounts({
+        state: this.stateAddress,
+      })
+      .rpc()
+      .then(confirm(this.provider.connection));
+
+    return this
+  }
+
   /**
    * Sends specified amount of NFTs from input account to hold account.
    *

packages/fund-sender/scripts/getStateFromAddress.ts

@@ -0,0 +1,23 @@
+import { FundSenderClient } from "../client";
+import { logBalance } from "./lib/util";
+import {PublicKey} from "@solana/web3.js";
+
+// USAGE: yarn ts-node packages/fund-sender/getStateFromAddress.ts stateAddress
+const stateAddress = process.argv[2];
+
+(async () => {
+  const client = await FundSenderClient.fetch(new PublicKey(stateAddress));
+  const log = logBalance(client);
+
+  console.log("state address", stateAddress);
+  console.log("state account data", {
+    destinationName: client.config.destinationName,
+    updateAuthority: client.config.updateAuthority.toBase58(),
+    destinationAccount: client.config.destinationAccount.toBase58(),
+    certificateVault: client.config.certificateVault.toBase58(),
+    spendThreshold: client.config.spendThreshold.toNumber(),
+  });
+  console.log("input address", client.getInputAccount().toBase58());
+
+  await log("input token", client.getInputAccount());
+})().catch(console.error);

packages/fund-sender/scripts/registerState.ts

@@ -17,7 +17,7 @@ const sunriseTreasuryAddress = new PublicKey(
   process.env.TREASURY_ADDRESS ?? defaultSunriseTreasuryAddress
 );
 
-// USAGE: yarn ts-node packages/fund-sender/resgisterState.ts destinationName destinationAccount
+// USAGE: yarn ts-node packages/fund-sender/registerState.ts destinationName destinationAccount
 const destinationName = process.argv[2];
 const destinationAccount = new PublicKey(process.argv[3]);
 

packages/fund-sender/scripts/sendFromState.ts

@@ -0,0 +1,29 @@
+import { FundSenderClient } from "../client";
+import { PublicKey } from "@solana/web3.js";
+
+// mainnet Sunrise
+const defaultSunriseStateAddress =
+  "43m66crxGfXSJpmx5wXRoFuHubhHA1GCvtHgmHW6cM1P";
+const sunriseStateAddress = new PublicKey(
+  process.env.STATE_ADDRESS ?? defaultSunriseStateAddress
+);
+
+// USAGE: yarn ts-node packages/fund-sender/sendFromState.ts destinationName
+const destinationName = process.argv[2];
+
+(async () => {
+  const stateAddress = FundSenderClient.getStateAddressFromSunriseAddress(
+      sunriseStateAddress,
+      destinationName
+  );
+  const client = await FundSenderClient.fetch(stateAddress);
+
+  console.log("state address", stateAddress.toBase58());
+  console.log("input address", client.getInputAccount().toBase58());
+
+  const stateBalance = await client.provider.connection.getBalance(stateAddress);
+  console.log("state balance", stateBalance);
+
+  console.log("Sending fund...");
+  await client.sendFromState();
+})().catch(console.error);

packages/idl/fund_sender.json

@@ -100,6 +100,60 @@
         }
       ]
     },
+    {
+      "name": "send_from_state",
+      "discriminator": [
+        119,
+        32,
+        214,
+        129,
+        74,
+        57,
+        186,
+        185
+      ],
+      "accounts": [
+        {
+          "name": "state",
+          "writable": true
+        },
+        {
+          "name": "input_account",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  105,
+                  110,
+                  112,
+                  117,
+                  116,
+                  95,
+                  97,
+                  99,
+                  99,
+                  111,
+                  117,
+                  110,
+                  116
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "state"
+              }
+            ]
+          }
+        },
+        {
+          "name": "system_program",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "send_fund",
       "discriminator": [

packages/types/fund_sender.ts

@@ -106,6 +106,60 @@ export type FundSender = {
         }
       ]
     },
+    {
+      "name": "sendFromState",
+      "discriminator": [
+        119,
+        32,
+        214,
+        129,
+        74,
+        57,
+        186,
+        185
+      ],
+      "accounts": [
+        {
+          "name": "state",
+          "writable": true
+        },
+        {
+          "name": "inputAccount",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  105,
+                  110,
+                  112,
+                  117,
+                  116,
+                  95,
+                  97,
+                  99,
+                  99,
+                  111,
+                  117,
+                  110,
+                  116
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "state"
+              }
+            ]
+          }
+        },
+        {
+          "name": "systemProgram",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "sendFund",
       "discriminator": [

packages/yield-router/client/index.ts

@@ -95,7 +95,7 @@ export interface YieldRouterConfig {
   spendThreshold: BN;
 }
 
-type InitialisedClient = YieldRouterClient & {
+export type InitialisedClient = YieldRouterClient & {
   config: YieldRouterConfig;
 };
 

packages/yield-router/scripts/updateState.ts

@@ -16,6 +16,12 @@ const sunriseStateAddress = new PublicKey(
 );
 
 (async () => {
+  const stateAddress =
+      YieldRouterClient.getStateAddressFromSunriseAddress(sunriseStateAddress);
+  const client = await YieldRouterClient.fetch(stateAddress);
+
+  console.log("Updating yield router state:", stateAddress.toBase58());
+
   // Get new update authority
   let newUpdateAuthority: PublicKey | undefined;
 
@@ -84,10 +90,6 @@ const sunriseStateAddress = new PublicKey(
 
   rl.close();
 
-  const stateAddress =
-    YieldRouterClient.getStateAddressFromSunriseAddress(sunriseStateAddress);
-  const client = await YieldRouterClient.fetch(stateAddress);
-
   // Update output yield accounts and proportions
   if (sumProportions === 100 && answer.toLocaleLowerCase() === "y") {
     const state = await client.updateOutputYieldAccounts(

programs/fund-sender/src/lib.rs

@@ -41,6 +41,20 @@ pub mod fund_sender {
         Ok(())
     }
 
+    pub fn send_from_state(
+        ctx: Context<SendFromState>,
+    ) -> Result<()> {
+        let state = &ctx.accounts.state;
+        let amount = state.get_lamports();
+
+        if amount > 0 {
+            **state.to_account_info().try_borrow_mut_lamports()? -= amount;
+            **ctx.accounts.input_account.try_borrow_mut_lamports()? += amount;
+        }
+
+        Ok(())
+    }
+
     pub fn send_fund<'info>(
         ctx: Context<'_, '_, '_, 'info, SendFund<'info>>,
         amount: u64,

programs/fund-sender/src/utils/state.rs

@@ -95,6 +95,26 @@ pub struct SendFund<'info> {
     pub system_program: Program<'info, System>,
 }
 
+/// If someone sent funds to the state account, this instruction will send it to the input account
+#[derive(Accounts)]
+// #[instruction(sunrise_state: Pubkey, destination_name: String)]
+pub struct SendFromState<'info> {
+    #[account(
+        mut,
+        // seeds = [STATE, &destination_name.as_bytes(), sunrise_state.key().as_ref()],
+        // bump,
+    )]
+    pub state: Account<'info, State>,
+    #[account(
+        mut,
+        seeds = [INPUT_ACCOUNT, state.key().as_ref()],
+        bump = state.input_account_bump,
+    )]
+    /// CHECK: Must be correctly derived from the state
+    pub input_account: UncheckedAccount<'info>,
+    pub system_program: Program<'info, System>,
+}
+
 #[derive(Accounts)]
 pub struct StoreCertificates<'info> {
     // to send the received retired climate token to a hold account

scripts/manager.ts

@@ -0,0 +1,6 @@
+import {showData} from "./util";
+import {showMenu} from "./prompt";
+
+await showData();
+
+showMenu();

scripts/prompt.ts

@@ -0,0 +1,52 @@
+import chalk from 'chalk';
+import readlineSync from 'readline-sync';
+import {showData} from "./util";
+import {submenuRouteToRecipient} from "./submenu/routeToRecipient";
+import {submenuAllocateYield} from "./submenu/allocateYield";
+
+export const showMenu = async () => {
+    console.log(chalk.magentaBright('\nChoose an option:'));
+    console.log(chalk.cyanBright('1) Refresh'));
+    console.log(chalk.cyanBright('2) Allocate Yield'));
+    console.log(chalk.cyanBright('3) Route Funds to Recipient'));
+    console.log(chalk.cyanBright('4) Update Proportions'));
+    console.log(chalk.cyanBright('5) Add Recipient'));
+    console.log(chalk.cyanBright('6) Remove Recipient'));
+    console.log(chalk.cyanBright('7) Quit'));
+
+    const choice = readlineSync.keyIn(chalk.yellow('\nEnter your choice: '), { limit: '$<1-7>' });
+
+    switch (choice) {
+        case '1':
+            console.log(chalk.green('Refreshing...'));
+            await showData();
+            break;
+        case '2':
+            await submenuAllocateYield();
+            break;
+        case '3':
+            await submenuRouteToRecipient();
+            break;
+        case '4':
+            console.log(chalk.green('Updating proportions...'));
+            // Call your update proportions function here
+            break;
+        case '5':
+            console.log(chalk.green('Adding recipient...'));
+            // Call your add recipient function here
+            break;
+        case '6':
+            console.log(chalk.green('Removing recipient...'));
+            // Call your remove recipient function here
+            break;
+        case '7':
+            console.log(chalk.green('Exiting...'));
+            process.exit(0);
+            break;
+        default:
+            console.log(chalk.red('Invalid choice, please try again.'));
+            showMenu(); // Re-display menu for invalid input
+            break;
+    }
+    showMenu();
+};