Skip to content

Commit a4bf4c7

Browse files
authored
Merge pull request elizaOS#589 from ai16z/shaw/fix-zerog
fix: Shaw/fix zerog
2 parents c6a3bf9 + 8442d09 commit a4bf4c7

29 files changed

+12284
-23
lines changed

.env.example

+17
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,20 @@ COINBASE_PRIVATE_KEY= # from coinbase developer portal
9898
# if not configured it will be generated and written to runtime.character.settings.secrets.COINBASE_GENERATED_WALLET_ID and runtime.character.settings.secrets.COINBASE_GENERATED_WALLET_HEX_SEED
9999
COINBASE_GENERATED_WALLET_ID= # not your address but the wallet id from generating a wallet through the plugin
100100
COINBASE_GENERATED_WALLET_HEX_SEED= # not your address but the wallet hex seed from generating a wallet through the plugin and calling export
101+
102+
# Conflux Configuration
103+
CONFLUX_CORE_PRIVATE_KEY=
104+
CONFLUX_CORE_SPACE_RPC_URL=
105+
CONFLUX_ESPACE_PRIVATE_KEY=
106+
CONFLUX_ESPACE_RPC_URL=
107+
CONFLUX_MEME_CONTRACT_ADDRESS=
108+
109+
#ZeroG
110+
ZEROG_INDEXER_RPC=
111+
ZEROG_EVM_RPC=
112+
ZEROG_PRIVATE_KEY=
113+
ZEROG_FLOW_ADDRESS=
114+
115+
# Coinbase Commerce
116+
COINBASE_COMMERCE_KEY=
117+

agent/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
"@ai16z/client-twitter": "workspace:*",
2222
"@ai16z/eliza": "workspace:*",
2323
"@ai16z/plugin-bootstrap": "workspace:*",
24+
"@ai16z/plugin-conflux": "workspace:*",
2425
"@ai16z/plugin-image-generation": "workspace:*",
2526
"@ai16z/plugin-node": "workspace:*",
2627
"@ai16z/plugin-solana": "workspace:*",
28+
"@ai16z/plugin-0g": "workspace:*",
2729
"@ai16z/plugin-starknet": "workspace:*",
2830
"@ai16z/plugin-coinbase": "workspace:*",
2931
"readline": "1.3.0",

agent/src/index.ts

+14-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import {
2323
validateCharacterConfig,
2424
} from "@ai16z/eliza";
2525
import { bootstrapPlugin } from "@ai16z/plugin-bootstrap";
26+
import { confluxPlugin } from "@ai16z/plugin-conflux";
2627
import { solanaPlugin } from "@ai16z/plugin-solana";
28+
import { zgPlugin } from "@ai16z/plugin-0g";
2729
import { nodePlugin } from "@ai16z/plugin-node";
2830
import {
2931
coinbaseCommercePlugin,
@@ -233,6 +235,10 @@ export async function initializeClients(
233235
return clients;
234236
}
235237

238+
function getSecret(character: Character, secret: string) {
239+
return character.settings.secrets?.[secret] || process.env[secret];
240+
}
241+
236242
export function createAgent(
237243
character: Character,
238244
db: IDatabaseAdapter,
@@ -252,16 +258,17 @@ export function createAgent(
252258
character,
253259
plugins: [
254260
bootstrapPlugin,
261+
getSecret(character, "CONFLUX_CORE_PRIVATE_KEY")
262+
? confluxPlugin
263+
: null,
255264
nodePlugin,
256-
character.settings.secrets?.WALLET_PUBLIC_KEY ? solanaPlugin : null,
257-
character.settings.secrets?.COINBASE_COMMERCE_KEY ||
258-
process.env.COINBASE_COMMERCE_KEY
265+
getSecret(character, "WALLET_PUBLIC_KEY") ? solanaPlugin : null,
266+
getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
267+
getSecret(character, "COINBASE_COMMERCE_KEY")
259268
? coinbaseCommercePlugin
260269
: null,
261-
(character.settings.secrets?.COINBASE_API_KEY ||
262-
process.env.COINBASE_API_KEY) &&
263-
(character.settings.secrets?.COINBASE_PRIVATE_KEY ||
264-
process.env.COINBASE_PRIVATE_KEY)
270+
getSecret(character, "COINBASE_API_KEY") &&
271+
getSecret(character, "COINBASE_PRIVATE_KEY")
265272
? coinbaseMassPaymentsPlugin
266273
: null,
267274
].filter(Boolean),

0 commit comments

Comments
 (0)