Merge pull request #2049 from elizaOS/revert-2039-fix/tee-derive-key

Revert "fix: Update Key Derive in TEE"
elizaOS · Jan 9, 2025 · 4cefcba · 4cefcba
2 parents 941b8d1 + e6b5bbe
commit 4cefcba
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 354 deletions.
diff --git a/docs/docs/advanced/eliza-in-tee.md b/docs/docs/advanced/eliza-in-tee.md
@@ -57,22 +57,16 @@ Example usage:
 const provider = new DeriveKeyProvider(teeMode);
 // For Solana
 const { keypair, attestation } = await provider.deriveEd25519Keypair(
+    "/",
     secretSalt,
-    "solana",
     agentId,
 );
 // For EVM
 const { keypair, attestation } = await provider.deriveEcdsaKeypair(
+    "/",
     secretSalt,
-    "evm",
     agentId,
 );
-
-// For raw key derivation
-const rawKey = await provider.deriveRawKey(
-    secretSalt,
-    "raw",
-);
 ```
 
 ---

diff --git a/packages/plugin-evm/src/providers/wallet.ts b/packages/plugin-evm/src/providers/wallet.ts
@@ -292,8 +292,8 @@ export const initWalletProvider = async (runtime: IAgentRuntime) => {
 
         const deriveKeyProvider = new DeriveKeyProvider(teeMode);
         const deriveKeyResult = await deriveKeyProvider.deriveEcdsaKeypair(
+            "/",
             walletSecretSalt,
-            "evm",
             runtime.agentId
         );
         return new WalletProvider(

diff --git a/packages/plugin-solana/src/keypairUtils.ts b/packages/plugin-solana/src/keypairUtils.ts
@@ -30,8 +30,8 @@ export async function getWalletKey(
 
         const deriveKeyProvider = new DeriveKeyProvider(teeMode);
         const deriveKeyResult = await deriveKeyProvider.deriveEd25519Keypair(
+            "/",
             walletSecretSalt,
-            "solana",
             runtime.agentId
         );
 

diff --git a/packages/plugin-tee/package.json b/packages/plugin-tee/package.json
@@ -32,8 +32,7 @@
     "scripts": {
         "build": "tsup --format esm --dts",
         "dev": "tsup --format esm --dts --watch",
-        "lint": "eslint --fix  --cache .",
-        "test": "vitest run"
+        "lint": "eslint --fix  --cache ."
     },
     "peerDependencies": {
         "whatwg-url": "7.1.0"

diff --git a/packages/plugin-tee/src/providers/deriveKeyProvider.ts b/packages/plugin-tee/src/providers/deriveKeyProvider.ts
@@ -72,12 +72,6 @@ class DeriveKeyProvider {
         return quote;
     }
 
-    /**
-     * Derives a raw key from the given path and subject.
-     * @param path - The path to derive the key from. This is used to derive the key from the root of trust.
-     * @param subject - The subject to derive the key from. This is used for the certificate chain.
-     * @returns The derived key.
-     */
     async rawDeriveKey(
         path: string,
         subject: string
@@ -100,13 +94,6 @@ class DeriveKeyProvider {
         }
     }
 
-    /**
-     * Derives an Ed25519 keypair from the given path and subject.
-     * @param path - The path to derive the key from. This is used to derive the key from the root of trust.
-     * @param subject - The subject to derive the key from. This is used for the certificate chain.
-     * @param agentId - The agent ID to generate an attestation for.
-     * @returns An object containing the derived keypair and attestation.
-     */
     async deriveEd25519Keypair(
         path: string,
         subject: string,
@@ -143,13 +130,6 @@ class DeriveKeyProvider {
         }
     }
 
-    /**
-     * Derives an ECDSA keypair from the given path and subject.
-     * @param path - The path to derive the key from. This is used to derive the key from the root of trust.
-     * @param subject - The subject to derive the key from. This is used for the certificate chain.
-     * @param agentId - The agent ID to generate an attestation for. This is used for the certificate chain.
-     * @returns An object containing the derived keypair and attestation.
-     */
     async deriveEcdsaKeypair(
         path: string,
         subject: string,
@@ -204,13 +184,13 @@ const deriveKeyProvider: Provider = {
                 const secretSalt =
                     runtime.getSetting("WALLET_SECRET_SALT") || "secret_salt";
                 const solanaKeypair = await provider.deriveEd25519Keypair(
+                    "/",
                     secretSalt,
-                    "solana",
                     agentId
                 );
                 const evmKeypair = await provider.deriveEcdsaKeypair(
+                    "/",
                     secretSalt,
-                    "evm",
                     agentId
                 );
                 return JSON.stringify({

diff --git a/packages/plugin-tee/src/providers/walletProvider.ts b/packages/plugin-tee/src/providers/walletProvider.ts
@@ -299,8 +299,8 @@ const walletProvider: Provider = {
                     keypair: Keypair;
                     attestation: RemoteAttestationQuote;
                 } = await deriveKeyProvider.deriveEd25519Keypair(
+                    "/",
                     runtime.getSetting("WALLET_SECRET_SALT"),
-                    "solana",
                     agentId
                 );
                 publicKey = derivedKeyPair.keypair.publicKey;

diff --git a/packages/plugin-tee/src/tests/deriveKey.test.ts b/packages/plugin-tee/src/tests/deriveKey.test.ts
diff --git a/packages/plugin-tee/src/tests/remoteAttestation.test.ts b/packages/plugin-tee/src/tests/remoteAttestation.test.ts