add ethers, decrypt keystore into wallet in test

Author: eureka-cpu

package.json

@@ -24,6 +24,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@types/node": "^22.15.32",
+    "ethers": "^6.15.0",
     "tslog": "^4.9.3",
     "viem": "^2.31.3"
   },

pnpm-lock.yaml

@@ -8,6 +8,7 @@ import {
   Logger
 } from "tslog"
 import xdg from "xdg-portable"
+import { Wallet, utils } from "ethers"
 import {
   createClient,
   type GolemBaseClient,
@@ -28,7 +29,13 @@ const log = new Logger<ILogObj>({
   minLevel: 3,
 })
 
-const keyBytes = fs.readFileSync(xdg.config() + '/golembase/private.key');
+// Path to a golembase wallet
+const walletPath = path.join(xdg.config(), 'golembase', 'wallet.json');
+// The password that the test wallet was encrypted with
+const walletTestPassword = "password";
+
+const keystore = fs.readFileSync(walletPath);
+const wallet = Wallet.fromEncryptedJsonSync(keystore, walletTestPassword);
 
 let entitiesOwnedCount = 0
 let entityKey: Hex = "0x"
@@ -37,7 +44,7 @@ let client: GolemBaseClient
 
 describe("the golem-base client", () => {
   it("can be created", async () => {
-    const key: AccountData = new Tagged("privatekey", keyBytes)
+    const key: AccountData = new Tagged("privatekey", utils.arrayify(wallet.privateKey))
     client = {
       local: await createClient(
         1337,

test/client.spec.ts

@@ -8,6 +8,7 @@ import {
   Logger
 } from "tslog"
 import xdg from "xdg-portable"
+import { Wallet, utils } from "ethers"
 import {
   internal,
   type GolemBaseCreate,
@@ -61,7 +62,14 @@ async function ownerAddress(client: internal.GolemBaseClient): Promise<Hex> {
   return (await client.walletClient.getAddresses())[0]
 }
 
-const keyBytes = fs.readFileSync(xdg.config() + '/golembase/private.key');
+// Path to a golembase wallet
+const walletPath = path.join(xdg.config(), 'golembase', 'wallet.json');
+// The password that the test wallet was encrypted with
+const walletTestPassword = "password";
+
+const keystore = fs.readFileSync(walletPath);
+const wallet = Wallet.fromEncryptedJsonSync(keystore, walletTestPassword);
+
 let client: GolemBaseClient
 
 const data = generateRandomBytes(32)
@@ -73,7 +81,7 @@ let expirationBlock: number
 
 describe("the internal golem-base client", () => {
   it("can be created", async () => {
-    const key: AccountData = new Tagged("privatekey", keyBytes)
+    const key: AccountData = new Tagged("privatekey", utils.arrayify(wallet.privateKey))
     client = {
       local: await internal.createClient(
         1337,