Skip to content

Commit 2e55a30

Browse files
author
mike dupont
committed
comment out hard coded plugins for now
1 parent caae5e8 commit 2e55a30

File tree

2 files changed

+133
-126
lines changed

2 files changed

+133
-126
lines changed

‎agent/src/index.ts

+131-126
Original file line numberDiff line numberDiff line change
@@ -124,39 +124,39 @@ import {
124124
ICacheManager,
125125
} from "@elizaos/core";
126126
import { RedisClient } from "@elizaos/adapter-redis";
127-
import { zgPlugin } from "@elizaos/plugin-0g";
128-
import { bootstrapPlugin } from "@elizaos/plugin-bootstrap";
129-
import createGoatPlugin from "@elizaos/plugin-goat";
127+
//import { zgPlugin } from "@elizaos/plugin-0g";
128+
//import { bootstrapPlugin } from "@elizaos/plugin-bootstrap";
129+
//import createGoatPlugin from "@elizaos/plugin-goat";
130130
// import { intifacePlugin } from "@elizaos/plugin-intiface";
131131
import { DirectClient } from "@elizaos/client-direct";
132-
import { aptosPlugin } from "@elizaos/plugin-aptos";
133-
import {
134-
advancedTradePlugin,
135-
coinbaseCommercePlugin,
136-
coinbaseMassPaymentsPlugin,
137-
tokenContractPlugin,
138-
tradePlugin,
139-
webhookPlugin,
140-
} from "@elizaos/plugin-coinbase";
141-
import { confluxPlugin } from "@elizaos/plugin-conflux";
142-
import { evmPlugin } from "@elizaos/plugin-evm";
143-
import { storyPlugin } from "@elizaos/plugin-story";
144-
import { flowPlugin } from "@elizaos/plugin-flow";
145-
import { fuelPlugin } from "@elizaos/plugin-fuel";
146-
import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
147-
import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
148-
import { multiversxPlugin } from "@elizaos/plugin-multiversx";
149-
import { nearPlugin } from "@elizaos/plugin-near";
150-
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
132+
// import { aptosPlugin } from "@elizaos/plugin-aptos";
133+
// import {
134+
// advancedTradePlugin,
135+
// coinbaseCommercePlugin,
136+
// coinbaseMassPaymentsPlugin,
137+
// tokenContractPlugin,
138+
// tradePlugin,
139+
// webhookPlugin,
140+
// } from "@elizaos/plugin-coinbase";
141+
//import { confluxPlugin } from "@elizaos/plugin-conflux";
142+
//import { evmPlugin } from "@elizaos/plugin-evm";
143+
//import { storyPlugin } from "@elizaos/plugin-story";
144+
//import { flowPlugin } from "@elizaos/plugin-flow";
145+
//import { fuelPlugin } from "@elizaos/plugin-fuel";
146+
//import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
147+
//import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
148+
//import { multiversxPlugin } from "@elizaos/plugin-multiversx";
149+
//import { nearPlugin } from "@elizaos/plugin-near";
150+
//import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
151151
import { createNodePlugin } from "@elizaos/plugin-node";
152-
import { solanaPlugin } from "@elizaos/plugin-solana";
153-
import { suiPlugin } from "@elizaos/plugin-sui";
154-
import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
155-
import { tonPlugin } from "@elizaos/plugin-ton";
156-
import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
157-
import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
158-
import { abstractPlugin } from "@elizaos/plugin-abstract";
159-
import { avalanchePlugin } from "@elizaos/plugin-avalanche";
152+
//import { solanaPlugin } from "@elizaos/plugin-solana";
153+
//import { suiPlugin } from "@elizaos/plugin-sui";
154+
//import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
155+
//import { tonPlugin } from "@elizaos/plugin-ton";
156+
//import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
157+
//import { cronosZkEVMPlugin } from "@elizaos/plugin-cronoszkevm";
158+
//import { abstractPlugin } from "@elizaos/plugin-abstract";
159+
//import { avalanchePlugin } from "@elizaos/plugin-avalanche";
160160
import Database from "better-sqlite3";
161161
import fs from "fs";
162162
import path from "path";
@@ -587,8 +587,13 @@ export async function initializeClients(
587587
}
588588

589589
function getSecret(character: Character, secret: string) {
590-
return tracer.withActiveSpan('getSecret', () => {
591-
return character.settings?.secrets?.[secret] || process.env[secret];
590+
return tracer.startActiveSpan("getSecret", (span:Span) => {
591+
span.setAttribute('secret', secret);
592+
span.setAttribute('character', character);
593+
const ret = character.settings?.secrets?.[secret] || process.env[secret];
594+
595+
span.end()
596+
return ret;
592597
});
593598
}
594599

@@ -610,23 +615,23 @@ export async function createAgent(
610615

611616
nodePlugin ??= createNodePlugin();
612617

613-
const teeMode = getSecret(character, "TEE_MODE") || "OFF";
614-
const walletSecretSalt = getSecret(character, "WALLET_SECRET_SALT");
618+
// const teeMode = getSecret(character, "TEE_MODE") || "OFF";
619+
// const walletSecretSalt = getSecret(character, "WALLET_SECRET_SALT");
615620

616621
// Validate TEE configuration
617-
if (teeMode !== TEEMode.OFF && !walletSecretSalt) {
618-
elizaLogger.error(
619-
"WALLET_SECRET_SALT required when TEE_MODE is enabled"
620-
);
621-
throw new Error("Invalid TEE configuration");
622-
}
623-
624-
let goatPlugin: any | undefined;
625-
if (getSecret(character, "EVM_PROVIDER_URL")) {
626-
goatPlugin = await createGoatPlugin((secret) =>
627-
getSecret(character, secret)
628-
);
629-
}
622+
// if (teeMode !== TEEMode.OFF && !walletSecretSalt) {
623+
// elizaLogger.error(
624+
// "WALLET_SECRET_SALT required when TEE_MODE is enabled"
625+
// );
626+
// throw new Error("Invalid TEE configuration");
627+
// }
628+
629+
// let goatPlugin: any | undefined;
630+
// if (getSecret(character, "EVM_PROVIDER_URL")) {
631+
// goatPlugin = await createGoatPlugin((secret) =>
632+
// getSecret(character, secret)
633+
// );
634+
// }
630635

631636
return new AgentRuntime({
632637
databaseAdapter: db,
@@ -636,86 +641,86 @@ export async function createAgent(
636641
character,
637642
// character.plugins are handled when clients are added
638643
plugins: [
639-
bootstrapPlugin,
640-
getSecret(character, "CONFLUX_CORE_PRIVATE_KEY")
641-
? confluxPlugin
642-
: null,
644+
//bootstrapPlugin,
645+
// getSecret(character, "CONFLUX_CORE_PRIVATE_KEY")
646+
// ? confluxPlugin
647+
// : null,
643648
nodePlugin,
644-
getSecret(character, "SOLANA_PUBLIC_KEY") ||
645-
(getSecret(character, "WALLET_PUBLIC_KEY") &&
646-
!getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
647-
? solanaPlugin
648-
: null,
649-
(getSecret(character, "NEAR_ADDRESS") ||
650-
getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
651-
getSecret(character, "NEAR_WALLET_SECRET_KEY")
652-
? nearPlugin
653-
: null,
654-
getSecret(character, "EVM_PUBLIC_KEY") ||
655-
(getSecret(character, "WALLET_PUBLIC_KEY") &&
656-
getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
657-
? evmPlugin
658-
: null,
659-
(getSecret(character, "SOLANA_PUBLIC_KEY") ||
660-
(getSecret(character, "WALLET_PUBLIC_KEY") &&
661-
!getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith(
662-
"0x"
663-
))) &&
664-
getSecret(character, "SOLANA_ADMIN_PUBLIC_KEY") &&
665-
getSecret(character, "SOLANA_PRIVATE_KEY") &&
666-
getSecret(character, "SOLANA_ADMIN_PRIVATE_KEY")
667-
? nftGenerationPlugin
668-
: null,
669-
getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
670-
getSecret(character, "COINBASE_COMMERCE_KEY")
671-
? coinbaseCommercePlugin
672-
: null,
673-
getSecret(character, "FAL_API_KEY") ||
674-
getSecret(character, "OPENAI_API_KEY") ||
675-
getSecret(character, "VENICE_API_KEY") ||
676-
getSecret(character, "HEURIST_API_KEY") ||
677-
getSecret(character, "LIVEPEER_GATEWAY_URL")
678-
? imageGenerationPlugin
679-
: null,
680-
getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
681-
...(getSecret(character, "COINBASE_API_KEY") &&
682-
getSecret(character, "COINBASE_PRIVATE_KEY")
683-
? [
684-
coinbaseMassPaymentsPlugin,
685-
tradePlugin,
686-
tokenContractPlugin,
687-
advancedTradePlugin,
688-
]
689-
: []),
690-
...(teeMode !== TEEMode.OFF && walletSecretSalt
691-
? [teePlugin, solanaPlugin]
692-
: []),
693-
getSecret(character, "COINBASE_API_KEY") &&
694-
getSecret(character, "COINBASE_PRIVATE_KEY") &&
695-
getSecret(character, "COINBASE_NOTIFICATION_URI")
696-
? webhookPlugin
697-
: null,
698-
getSecret(character, "EVM_PROVIDER_URL") ? goatPlugin : null,
699-
getSecret(character, "ABSTRACT_PRIVATE_KEY")
700-
? abstractPlugin
701-
: null,
702-
getSecret(character, "FLOW_ADDRESS") &&
703-
getSecret(character, "FLOW_PRIVATE_KEY")
704-
? flowPlugin
705-
: null,
706-
getSecret(character, "APTOS_PRIVATE_KEY") ? aptosPlugin : null,
707-
getSecret(character, "MVX_PRIVATE_KEY") ? multiversxPlugin : null,
708-
getSecret(character, "ZKSYNC_PRIVATE_KEY") ? zksyncEraPlugin : null,
709-
getSecret(character, "CRONOSZKEVM_PRIVATE_KEY")
710-
? cronosZkEVMPlugin
711-
: null,
712-
getSecret(character, "TON_PRIVATE_KEY") ? tonPlugin : null,
713-
getSecret(character, "SUI_PRIVATE_KEY") ? suiPlugin : null,
714-
getSecret(character, "STORY_PRIVATE_KEY") ? storyPlugin : null,
715-
getSecret(character, "FUEL_PRIVATE_KEY") ? fuelPlugin : null,
716-
getSecret(character, "AVALANCHE_PRIVATE_KEY")
717-
? avalanchePlugin
718-
: null,
649+
// getSecret(character, "SOLANA_PUBLIC_KEY") ||
650+
// (getSecret(character, "WALLET_PUBLIC_KEY") &&
651+
// !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
652+
// ? solanaPlugin
653+
// : null,
654+
// (getSecret(character, "NEAR_ADDRESS") ||
655+
// getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
656+
// getSecret(character, "NEAR_WALLET_SECRET_KEY")
657+
// ? nearPlugin
658+
// : null,
659+
// getSecret(character, "EVM_PUBLIC_KEY") ||
660+
// (getSecret(character, "WALLET_PUBLIC_KEY") &&
661+
// getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
662+
// ? evmPlugin
663+
// : null,
664+
// (getSecret(character, "SOLANA_PUBLIC_KEY") ||
665+
// (getSecret(character, "WALLET_PUBLIC_KEY") &&
666+
// !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith(
667+
// "0x"
668+
// ))) &&
669+
// getSecret(character, "SOLANA_ADMIN_PUBLIC_KEY") &&
670+
// getSecret(character, "SOLANA_PRIVATE_KEY") &&
671+
// getSecret(character, "SOLANA_ADMIN_PRIVATE_KEY")
672+
// ? nftGenerationPlugin
673+
// : null,
674+
// getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
675+
// getSecret(character, "COINBASE_COMMERCE_KEY")
676+
// ? coinbaseCommercePlugin
677+
// : null,
678+
// getSecret(character, "FAL_API_KEY") ||
679+
// getSecret(character, "OPENAI_API_KEY") ||
680+
// getSecret(character, "VENICE_API_KEY") ||
681+
// getSecret(character, "HEURIST_API_KEY") ||
682+
// getSecret(character, "LIVEPEER_GATEWAY_URL")
683+
// ? imageGenerationPlugin
684+
// : null,
685+
// getSecret(character, "FAL_API_KEY") ? ThreeDGenerationPlugin : null,
686+
// ...(getSecret(character, "COINBASE_API_KEY") &&
687+
// getSecret(character, "COINBASE_PRIVATE_KEY")
688+
// ? [
689+
// coinbaseMassPaymentsPlugin,
690+
// tradePlugin,
691+
// tokenContractPlugin,
692+
// advancedTradePlugin,
693+
// ]
694+
// : []),
695+
// ...(teeMode !== TEEMode.OFF && walletSecretSalt
696+
// ? [teePlugin, solanaPlugin]
697+
// : []),
698+
// getSecret(character, "COINBASE_API_KEY") &&
699+
// getSecret(character, "COINBASE_PRIVATE_KEY") &&
700+
// getSecret(character, "COINBASE_NOTIFICATION_URI")
701+
// ? webhookPlugin
702+
// : null,
703+
// getSecret(character, "EVM_PROVIDER_URL") ? goatPlugin : null,
704+
// getSecret(character, "ABSTRACT_PRIVATE_KEY")
705+
// ? abstractPlugin
706+
// : null,
707+
// getSecret(character, "FLOW_ADDRESS") &&
708+
// getSecret(character, "FLOW_PRIVATE_KEY")
709+
// ? flowPlugin
710+
// : null,
711+
// getSecret(character, "APTOS_PRIVATE_KEY") ? aptosPlugin : null,
712+
// getSecret(character, "MVX_PRIVATE_KEY") ? multiversxPlugin : null,
713+
// getSecret(character, "ZKSYNC_PRIVATE_KEY") ? zksyncEraPlugin : null,
714+
// getSecret(character, "CRONOSZKEVM_PRIVATE_KEY")
715+
// ? cronosZkEVMPlugin
716+
// : null,
717+
// getSecret(character, "TON_PRIVATE_KEY") ? tonPlugin : null,
718+
// getSecret(character, "SUI_PRIVATE_KEY") ? suiPlugin : null,
719+
// getSecret(character, "STORY_PRIVATE_KEY") ? storyPlugin : null,
720+
// getSecret(character, "FUEL_PRIVATE_KEY") ? fuelPlugin : null,
721+
// getSecret(character, "AVALANCHE_PRIVATE_KEY")
722+
// ? avalanchePlugin
723+
// : null,
719724
].filter(Boolean),
720725
providers: [],
721726
actions: [],

‎pnpm-workspace.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
packages:
2+
- "!packages/plugin-solana"
3+
- "!packages/plugin-bootstrap"
24
- "docs"
35
- "packages/*"
46
- "client"

0 commit comments

Comments
 (0)