diff --git a/bun.lock b/bun.lock index 8942ed7..37ccb04 100644 --- a/bun.lock +++ b/bun.lock @@ -85,6 +85,7 @@ }, "dependencies": { "@hono/node-server": "^1.13.0", + "@open-wallet-standard/core": "^1.1.0", "@orbitmem/relay": "workspace:*", "@orbitmem/sdk": "workspace:*", "viem": "^2.0.0", @@ -145,6 +146,7 @@ "@lit-protocol/constants": "^7.0.0", "@lit-protocol/encryption": "^7.0.0", "@lit-protocol/lit-node-client": "^7.0.0", + "@open-wallet-standard/core": "^1.1.0", "@orbitdb/core": "^3.0.2", "@orbitdb/nested-db": "^2.0.4", "@orbitmem/contracts": "^0.1.0", @@ -725,6 +727,16 @@ "@oozcitak/util": ["@oozcitak/util@10.0.0", "", {}, "sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA=="], + "@open-wallet-standard/core": ["@open-wallet-standard/core@1.1.0", "", { "optionalDependencies": { "@open-wallet-standard/core-darwin-arm64": "1.1.0", "@open-wallet-standard/core-darwin-x64": "1.1.0", "@open-wallet-standard/core-linux-arm64-gnu": "1.1.0", "@open-wallet-standard/core-linux-x64-gnu": "1.1.0" }, "bin": { "ows": "bin/ows" } }, "sha512-tQOLBo9y5qHJTTMVFU8s85GRj2vzEH6UILHODxOYifsJlgNWwoU/h4pAVK0vugtR2uGfRsJjxE0VkGICT7b+7Q=="], + + "@open-wallet-standard/core-darwin-arm64": ["@open-wallet-standard/core-darwin-arm64@1.1.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-2w3lttvTcfhYVzXi1HaRPqJOWTQ5we5H9tSGeVNzgj5Q7P5r18BtRMVSEqaf3Uw5MrOLrN6Lb9iVdnGUqcCGJA=="], + + "@open-wallet-standard/core-darwin-x64": ["@open-wallet-standard/core-darwin-x64@1.1.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-HjRnZ9PwG/+NjdKDHAz6VByrb3RYKUx8kYSKclWzw5rgYkaNVDD9PvvCs0odNBOawS/iHbgVUe4dko2py23HDQ=="], + + "@open-wallet-standard/core-linux-arm64-gnu": ["@open-wallet-standard/core-linux-arm64-gnu@1.1.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-q1RC4cbNZLfKbFacVwnudlMDxb0gFWnX+jztQYAFgvCplAO33QWADa+Ua6y2M+yFSJBgoJDkpGgGqmi9tIjbYg=="], + + "@open-wallet-standard/core-linux-x64-gnu": ["@open-wallet-standard/core-linux-x64-gnu@1.1.0", "", { "os": "linux", "cpu": "x64" }, "sha512-FerlsHMBjkFS/oP0bp6SVeJo29lpcbp5qkaRlN2OTx6AlF+mfKRb+pB32M+EiudylaWC9yG88XzxCe9YPoaOig=="], + "@openagenda/verror": ["@openagenda/verror@3.2.0", "", { "dependencies": { "assertion-error": "^1.1.0", "depd": "^2.0.0", "inherits": "^2.0.4", "sprintf-js": "^1.1.2" } }, "sha512-CokE1wm+HQ9al07aPBeSk9tAKniUiLAiUqyRDxB2l+w5ml/hYX8MtV60DLvxgWgjI9bpMPaPIJw6FXQ/09O5Uw=="], "@orbitdb/core": ["@orbitdb/core@3.0.2", "", { "dependencies": { "@ipld/dag-cbor": "^9.0.6", "@libp2p/crypto": "^5.0.5", "it-pipe": "^3.0.1", "level": "^8.0.0", "lru": "^3.1.0", "multiformats": "^12.1.3", "p-queue": "^8.0.1", "timeout-abort-controller": "^3.0.0", "uint8arrays": "^5.0.0" } }, "sha512-YTJIBbe8mIDLpA0T3cOdVjWDeAyIojQLR54p0TfVyUBAjWh7N0rbKBbgQMTOrFxhUmRf/D85iFScmGnnEn5v+w=="], @@ -1753,7 +1765,7 @@ "bufferutil": ["bufferutil@4.1.0", "", { "dependencies": { "node-gyp-build": "^4.3.0" } }, "sha512-ZMANVnAixE6AWWnPzlW2KpUrxhm9woycYvPOo67jWHyFowASTEd9s+QN1EIMsSDtwhIxN4sWE1jotpuDUIgyIw=="], - "bun-types": ["bun-types@1.3.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg=="], + "bun-types": ["bun-types@1.3.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="], "cac": ["cac@6.7.14", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="], @@ -1763,7 +1775,7 @@ "call-bound": ["call-bound@1.0.4", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" } }, "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg=="], - "camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], + "camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], "camelcase-keys": ["camelcase-keys@6.2.2", "", { "dependencies": { "camelcase": "^5.3.1", "map-obj": "^4.0.0", "quick-lru": "^4.0.1" } }, "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="], @@ -2049,7 +2061,7 @@ "event-iterator": ["event-iterator@2.0.0", "", {}, "sha512-KGft0ldl31BZVV//jj+IAIGCxkvvUkkON+ScH6zfoX+l+omX6001ggyRSpI0Io2Hlro0ThXotswCtfzS8UkIiQ=="], - "event-target-shim": ["event-target-shim@6.0.2", "", {}, "sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA=="], + "event-target-shim": ["event-target-shim@5.0.1", "", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="], "eventemitter2": ["eventemitter2@6.4.9", "", {}, "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg=="], @@ -2643,9 +2655,9 @@ "mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="], - "mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], + "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], - "mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], + "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], "mimic-fn": ["mimic-fn@4.0.0", "", {}, "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="], @@ -3513,6 +3525,8 @@ "@ipshipyard/libp2p-auto-tls/@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@1.8.0", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "@multiformats/multiaddr": "^12.0.0", "multiformats": "^13.0.0" } }, "sha512-tR/HFhDucXjvwCef5lfXT7kikqR2ffUjliuYlg/RKYGPySVKVlvrDufz86cIuHNc+i/fNR16FWWgD/pMJ6RW4w=="], + "@istanbuljs/load-nyc-config/camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], + "@istanbuljs/load-nyc-config/js-yaml": ["js-yaml@3.14.2", "", { "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg=="], "@jest/environment/@types/node": ["@types/node@25.3.3", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ=="], @@ -3595,10 +3609,6 @@ "@orbitdb/core/multiformats": ["multiformats@12.1.3", "", {}, "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw=="], - "@orbitmem/relay/bun-types": ["bun-types@1.3.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="], - - "@orbitmem/sdk/bun-types": ["bun-types@1.3.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="], - "@peculiar/asn1-cms/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], "@peculiar/asn1-csr/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], @@ -3821,10 +3831,6 @@ "@walletconnect/utils/viem": ["viem@2.23.2", "", { "dependencies": { "@noble/curves": "1.8.1", "@noble/hashes": "1.7.1", "@scure/bip32": "1.6.2", "@scure/bip39": "1.5.4", "abitype": "1.0.8", "isows": "1.0.6", "ox": "0.6.7", "ws": "8.18.0" }, "peerDependencies": { "typescript": ">=5.0.4" }, "optionalPeers": ["typescript"] }, "sha512-NVmW/E0c5crMOtbEAqMF0e3NmvQykFXhLOc/CkLIXOlzHSA6KXVz3CYVmaKqBF8/xtjsjHAGjdJN3Ru1kFJLaA=="], - "abort-controller/event-target-shim": ["event-target-shim@5.0.1", "", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="], - - "accepts/mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], - "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], "asn1js/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], @@ -3835,7 +3841,7 @@ "blockstore-level/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="], - "bun-types/@types/node": ["@types/node@25.3.3", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ=="], + "camelcase-keys/camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], "cbw-sdk/clsx": ["clsx@1.2.1", "", {}, "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="], @@ -3901,6 +3907,8 @@ "finalhandler/encodeurl": ["encodeurl@1.0.2", "", {}, "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="], + "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], + "h3/cookie-es": ["cookie-es@1.2.2", "", {}, "sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg=="], "hamt-sharding/uint8arrays": ["uint8arrays@3.1.1", "", { "dependencies": { "multiformats": "^9.4.2" } }, "sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg=="], @@ -3975,8 +3983,6 @@ "jest-util/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], - "jest-validate/camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], - "jest-worker/@types/node": ["@types/node@25.3.3", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ=="], "json-rpc-engine/@metamask/safe-event-emitter": ["@metamask/safe-event-emitter@2.0.0", "", {}, "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="], @@ -3993,8 +3999,6 @@ "metro/hermes-parser": ["hermes-parser@0.33.3", "", { "dependencies": { "hermes-estree": "0.33.3" } }, "sha512-Yg3HgaG4CqgyowtYjX/FsnPAuZdHOqSMtnbpylbptsQ9nwwSKsy6uRWcGO5RK0EqiX12q8HvDWKgeAVajRO5DA=="], - "metro/mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], - "metro/source-map": ["source-map@0.5.7", "", {}, "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="], "metro/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], @@ -4073,6 +4077,8 @@ "react-native-webrtc/debug": ["debug@4.3.4", "", { "dependencies": { "ms": "2.1.2" } }, "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="], + "react-native-webrtc/event-target-shim": ["event-target-shim@6.0.2", "", {}, "sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA=="], + "read-pkg/normalize-package-data": ["normalize-package-data@2.5.0", "", { "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } }, "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="], "read-pkg/type-fest": ["type-fest@0.6.0", "", {}, "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="], @@ -4365,8 +4371,6 @@ "@walletconnect/utils/viem/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], - "accepts/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], - "cids/uint8arrays/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], "connect/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], @@ -4385,6 +4389,8 @@ "finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], + "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], + "hamt-sharding/uint8arrays/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], "hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], @@ -4417,8 +4423,6 @@ "metro/hermes-parser/hermes-estree": ["hermes-estree@0.33.3", "", {}, "sha512-6kzYZHCk8Fy1Uc+t3HGYyJn3OL4aeqKLTyina4UFtWl8I0kSL7OmKThaiX+Uh2f8nGw3mo4Ifxg0M5Zk3/Oeqg=="], - "metro/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], - "multicodec/uint8arrays/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], "multihashes/uint8arrays/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], @@ -4661,6 +4665,8 @@ "qrcode/yargs/cliui/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="], + "qrcode/yargs/yargs-parser/camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], + "wagmi/@wagmi/connectors/@base-org/account/@noble/hashes": ["@noble/hashes@1.4.0", "", {}, "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="], "wagmi/@wagmi/connectors/@base-org/account/clsx": ["clsx@1.2.1", "", {}, "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="], diff --git a/examples/agent-research/tools/shared.ts b/examples/agent-research/tools/shared.ts index a7668c9..ecc067d 100644 --- a/examples/agent-research/tools/shared.ts +++ b/examples/agent-research/tools/shared.ts @@ -7,11 +7,12 @@ import { homedir } from "node:os"; import { join } from "node:path"; import { createOrbitMem, getNetwork, type NetworkId } from "@orbitmem/sdk"; +import { createOwsAdapter } from "@orbitmem/sdk/identity"; import { createPublicClient, createWalletClient, http } from "viem"; -import { privateKeyToAccount } from "viem/accounts"; import { baseSepolia } from "viem/chains"; interface Config { + walletName: string; network: NetworkId; relay: string; } @@ -23,36 +24,34 @@ function getConfigDir(): string { function loadConfig(): Config { const configPath = join(getConfigDir(), "config.json"); const network = getNetwork(); - const defaults: Config = { network: "base-sepolia", relay: network.relayUrl }; + const defaults: Config = { walletName: "", network: "base-sepolia", relay: network.relayUrl }; if (!existsSync(configPath)) return defaults; const raw = JSON.parse(readFileSync(configPath, "utf-8")); return { ...defaults, ...raw }; } -function loadKey(): string { - const keyPath = join(getConfigDir(), "key.json"); - if (!existsSync(keyPath)) { - throw new Error("No key found. Run `bun run cli init` first."); - } - return JSON.parse(readFileSync(keyPath, "utf-8")).privateKey; -} - export async function createAgentClient() { const config = loadConfig(); + if (!config.walletName) { + throw new Error("No wallet configured. Run `bun run cli init` first."); + } + const network = getNetwork(config.network); const transport = http(network.rpcUrl); - const account = privateKeyToAccount(loadKey() as `0x${string}`); + + const adapter = createOwsAdapter(config.walletName, `eip155:${baseSepolia.id}`); + const viemAccount = await adapter.toViemAccount(); const publicClient = createPublicClient({ chain: baseSepolia, transport }); const walletClient = createWalletClient({ chain: baseSepolia, transport, - account, + account: viemAccount, }); const client = await createOrbitMem({ network: config.network, - identity: { privateKey: loadKey() }, + identity: { owsWallet: config.walletName }, vault: { dbName: "orbitmem-agent-research" }, encryption: { defaultEngine: "aes", aes: { kdf: "hkdf-sha256" } }, persistence: { relayUrl: config.relay }, diff --git a/packages/cli/package.json b/packages/cli/package.json index fd7a5d6..ac977a2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -20,8 +20,9 @@ }, "dependencies": { "@hono/node-server": "^1.13.0", - "@orbitmem/sdk": "workspace:*", + "@open-wallet-standard/core": "^1.1.0", "@orbitmem/relay": "workspace:*", + "@orbitmem/sdk": "workspace:*", "viem": "^2.0.0" }, "devDependencies": { diff --git a/packages/cli/src/__tests__/cli.test.ts b/packages/cli/src/__tests__/cli.test.ts index 8fffa17..a0f5153 100644 --- a/packages/cli/src/__tests__/cli.test.ts +++ b/packages/cli/src/__tests__/cli.test.ts @@ -5,6 +5,19 @@ import { join } from "node:path"; const TEST_DIR = join(import.meta.dir, ".test-orbitmem-cli"); const CLI = join(import.meta.dir, "..", "index.ts"); +// Unique wallet name per test run to avoid OWS keystore conflicts +const RUN_ID = Date.now().toString(36); +const WALLET_NAME = `orbitmem-cli-test-${RUN_ID}`; + +async function deleteTestWallet(name: string): Promise { + try { + const { deleteWallet } = await import("@open-wallet-standard/core"); + deleteWallet(name); + } catch { + // ignore — wallet may not exist + } +} + describe("CLI integration", () => { beforeEach(() => { mkdirSync(TEST_DIR, { recursive: true }); @@ -27,36 +40,45 @@ describe("CLI integration", () => { }); test("init --json creates config and returns address", async () => { - const proc = Bun.spawn(["bun", CLI, "init", "--json"], { - env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, - stdout: "pipe", - }); - const text = await new Response(proc.stdout).text(); - await proc.exited; - const result = JSON.parse(text); - expect(result.address).toMatch(/^0x[0-9a-fA-F]{40}$/); - expect(result.network).toBe("base-sepolia"); - expect(result.relay).toBe("https://orbitmem-relay.fly.dev"); + try { + const proc = Bun.spawn(["bun", CLI, "init", "--json", "--name", WALLET_NAME], { + env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, + stdout: "pipe", + }); + const text = await new Response(proc.stdout).text(); + await proc.exited; + const result = JSON.parse(text); + expect(result.address).toMatch(/^0x[0-9a-fA-F]{40}$/); + expect(result.network).toBe("base-sepolia"); + expect(result.relay).toBe("https://orbitmem-relay.fly.dev"); + } finally { + await deleteTestWallet(WALLET_NAME); + } }); test("status --json after init shows config", async () => { - // First init - const initProc = Bun.spawn(["bun", CLI, "init"], { - env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, - stdout: "pipe", - }); - await initProc.exited; + const walletName = `${WALLET_NAME}-status`; + try { + // First init + const initProc = Bun.spawn(["bun", CLI, "init", "--name", walletName], { + env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, + stdout: "pipe", + }); + await initProc.exited; - // Then status - const proc = Bun.spawn(["bun", CLI, "status", "--json"], { - env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, - stdout: "pipe", - }); - const text = await new Response(proc.stdout).text(); - await proc.exited; - const result = JSON.parse(text); - expect(result.address).toMatch(/^0x/); - expect(result.chain).toBe("base-sepolia"); + // Then status + const proc = Bun.spawn(["bun", CLI, "status", "--json"], { + env: { ...process.env, ORBITMEM_HOME: TEST_DIR }, + stdout: "pipe", + }); + const text = await new Response(proc.stdout).text(); + await proc.exited; + const result = JSON.parse(text); + expect(result.address).toMatch(/^0x/); + expect(result.chain).toBe("base-sepolia"); + } finally { + await deleteTestWallet(walletName); + } }); test("unknown command exits with error", async () => { diff --git a/packages/cli/src/__tests__/config.test.ts b/packages/cli/src/__tests__/config.test.ts index 64e4cc5..ae50acc 100644 --- a/packages/cli/src/__tests__/config.test.ts +++ b/packages/cli/src/__tests__/config.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import { mkdirSync, rmSync } from "node:fs"; import { join } from "node:path"; -import { loadConfig, loadKey, saveConfig, saveKey } from "../config.js"; +import { loadConfig, saveConfig } from "../config.js"; const TEST_DIR = join(import.meta.dir, ".test-orbitmem"); @@ -31,13 +31,9 @@ describe("config", () => { expect(config.chain).toBe("base-sepolia"); }); - test("saveKey and loadKey roundtrip", () => { - saveKey("0xabc123"); - const key = loadKey(); - expect(key).toBe("0xabc123"); - }); - - test("loadKey throws when no key exists", () => { - expect(() => loadKey()).toThrow("No key found"); + test("saveConfig persists walletName", () => { + saveConfig({ walletName: "my-wallet" }); + const loaded = loadConfig(); + expect(loaded.walletName).toBe("my-wallet"); }); }); diff --git a/packages/cli/src/__tests__/init.test.ts b/packages/cli/src/__tests__/init.test.ts index c75efe7..6c6a10e 100644 --- a/packages/cli/src/__tests__/init.test.ts +++ b/packages/cli/src/__tests__/init.test.ts @@ -1,41 +1,58 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test"; -import { existsSync, mkdirSync, rmSync } from "node:fs"; +import { mkdirSync, rmSync } from "node:fs"; import { join } from "node:path"; import { init } from "../commands/init.js"; -import { loadConfig, loadKey } from "../config.js"; +import { loadConfig } from "../config.js"; const TEST_DIR = join(import.meta.dir, ".test-orbitmem-init"); +// Use a unique wallet name per test run to avoid OWS keystore conflicts +const RUN_ID = Date.now().toString(36); + +async function deleteTestWallet(name: string): Promise { + try { + const { deleteWallet } = await import("@open-wallet-standard/core"); + deleteWallet(name); + } catch { + // ignore — wallet may not exist + } +} + describe("init", () => { beforeEach(() => { process.env.ORBITMEM_HOME = TEST_DIR; mkdirSync(TEST_DIR, { recursive: true }); }); - afterEach(() => { + afterEach(async () => { + // Clean up config dir rmSync(TEST_DIR, { recursive: true, force: true }); delete process.env.ORBITMEM_HOME; }); - test("creates config and key files", async () => { - await init([], {}); - expect(existsSync(join(TEST_DIR, "config.json"))).toBe(true); - expect(existsSync(join(TEST_DIR, "key.json"))).toBe(true); - }); - - test("generated key is a valid hex private key", async () => { - await init([], {}); - const key = loadKey(); - expect(key).toMatch(/^0x[0-9a-f]{64}$/); + test("creates config file with walletName", async () => { + const walletName = `test-init-a-${RUN_ID}`; + try { + await init([], { name: walletName }); + const config = loadConfig(); + expect(config.walletName).toBe(walletName); + } finally { + await deleteTestWallet(walletName); + } }); test("config has default network and relay", async () => { - await init([], {}); - const config = loadConfig(); - expect(config.network).toBe("base-sepolia"); - expect(config.relay).toBe("https://orbitmem-relay.fly.dev"); - expect(config.registryAddress).toBe("0x9eE44938ED77227470CaA2DbCC0459F49d249B7A"); - expect(config.reputationAddress).toBe("0x1Bce77f90C33A5f8faCa54782Ce3a17d1AD7109a"); + const walletName = `test-init-b-${RUN_ID}`; + try { + await init([], { name: walletName }); + const config = loadConfig(); + expect(config.network).toBe("base-sepolia"); + expect(config.relay).toBe("https://orbitmem-relay.fly.dev"); + expect(config.registryAddress).toBe("0x9eE44938ED77227470CaA2DbCC0459F49d249B7A"); + expect(config.reputationAddress).toBe("0x1Bce77f90C33A5f8faCa54782Ce3a17d1AD7109a"); + } finally { + await deleteTestWallet(walletName); + } }); }); diff --git a/packages/cli/src/commands/discover.ts b/packages/cli/src/commands/discover.ts index 14d80b7..0dea474 100644 --- a/packages/cli/src/commands/discover.ts +++ b/packages/cli/src/commands/discover.ts @@ -1,4 +1,4 @@ -import { loadConfig, loadKey } from "../config.js"; +import { loadConfig } from "../config.js"; import { createClient } from "../utils/client.js"; import { error, output } from "../utils/output.js"; @@ -8,7 +8,7 @@ export async function discover(args: string[], flags: Record): P if (!config.registryAddress) error("No registry address configured. Set registryAddress in ~/.orbitmem/config.json"); - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const query: Record = {}; diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 3dc3fbb..72b192d 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -1,32 +1,39 @@ import { existsSync } from "node:fs"; import { join } from "node:path"; +import { createWallet } from "@open-wallet-standard/core"; import type { NetworkId } from "@orbitmem/sdk/contracts"; -import { generatePrivateKey, privateKeyToAccount } from "viem/accounts"; +import { createOwsAdapter } from "@orbitmem/sdk/identity"; -import { getConfigDir, loadConfig, saveConfig, saveKey } from "../config.js"; +import { getConfigDir, loadConfig, saveConfig, toCaip2 } from "../config.js"; import { output } from "../utils/output.js"; export async function init(_args: string[], flags: Record): Promise { const configDir = getConfigDir(); - const keyPath = join(configDir, "key.json"); - - if (existsSync(keyPath) && flags.force === undefined) { - process.stderr.write(`Already initialized at ${configDir}. Use --force to reinitialize.\n`); - process.exit(1); + const configPath = join(configDir, "config.json"); + + if (existsSync(configPath) && flags.force === undefined) { + const existing = loadConfig(); + if (existing.walletName) { + process.stderr.write(`Already initialized at ${configDir}. Use --force to reinitialize.\n`); + process.exit(1); + } } - const privateKey = generatePrivateKey(); - const account = privateKeyToAccount(privateKey); + const walletName = flags.name ?? "orbitmem"; + createWallet(walletName); const network = (flags.network ?? "base-sepolia") as NetworkId; - - saveKey(privateKey); - saveConfig({ network }); + saveConfig({ walletName, network }); const config = loadConfig(); + const caip2 = toCaip2(network); + const adapter = createOwsAdapter(walletName, caip2); + const address = await adapter.getAddress(); + const info = { - address: account.address, + wallet: walletName, + address, configDir, network: config.network, relay: config.relay, @@ -39,7 +46,7 @@ export async function init(_args: string[], flags: Record): Prom output(info, true); } else { process.stdout.write(`\nOrbitMem initialized!\n\n`); - process.stdout.write(` Address: ${info.address}\n`); + process.stdout.write(` Wallet: ${info.wallet}\n`); process.stdout.write(` Config: ${info.configDir}\n`); process.stdout.write(` Network: ${info.network}\n`); process.stdout.write(` Relay: ${info.relay}\n`); diff --git a/packages/cli/src/commands/register.ts b/packages/cli/src/commands/register.ts index b8159df..721f84d 100644 --- a/packages/cli/src/commands/register.ts +++ b/packages/cli/src/commands/register.ts @@ -1,4 +1,4 @@ -import { loadConfig, loadKey } from "../config.js"; +import { loadConfig } from "../config.js"; import { createClient } from "../utils/client.js"; import { error, output } from "../utils/output.js"; @@ -11,7 +11,7 @@ export async function register(args: string[], flags: Record): P if (!config.registryAddress) error("No registry address configured. Set registryAddress in ~/.orbitmem/config.json"); - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const entry = await client.vault.get(path); diff --git a/packages/cli/src/commands/snapshot.ts b/packages/cli/src/commands/snapshot.ts index bb0291d..a916f62 100644 --- a/packages/cli/src/commands/snapshot.ts +++ b/packages/cli/src/commands/snapshot.ts @@ -1,11 +1,11 @@ -import { loadConfig, loadKey } from "../config.js"; +import { loadConfig } from "../config.js"; import { createClient } from "../utils/client.js"; import { output } from "../utils/output.js"; export async function snapshot(_args: string[], flags: Record): Promise { const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const result = await client.persistence.archive({ diff --git a/packages/cli/src/commands/status.ts b/packages/cli/src/commands/status.ts index 2faecf6..7677b0f 100644 --- a/packages/cli/src/commands/status.ts +++ b/packages/cli/src/commands/status.ts @@ -1,21 +1,21 @@ -import { privateKeyToAccount } from "viem/accounts"; +import { createOwsAdapter } from "@orbitmem/sdk/identity"; -import { getConfigDir, loadConfig, loadKey } from "../config.js"; +import { getConfigDir, loadConfig, toCaip2 } from "../config.js"; import { error, output } from "../utils/output.js"; export async function status(_args: string[], flags: Record): Promise { - let key: string; - try { - key = loadKey(); - } catch { + const config = loadConfig(); + if (!config.walletName) { error("Not initialized. Run `orbitmem init` first."); } - const config = loadConfig(); - const account = privateKeyToAccount(key as `0x${string}`); + const caip2 = toCaip2(config.network); + const adapter = createOwsAdapter(config.walletName, caip2); + const address = await adapter.getAddress(); const info = { - address: account.address, + wallet: config.walletName, + address, configDir: getConfigDir(), relay: flags.relay ?? config.relay, chain: flags.chain ?? config.chain, diff --git a/packages/cli/src/commands/vault.ts b/packages/cli/src/commands/vault.ts index c0d9224..088ab98 100644 --- a/packages/cli/src/commands/vault.ts +++ b/packages/cli/src/commands/vault.ts @@ -7,7 +7,7 @@ import type { Visibility, } from "@orbitmem/sdk/types"; -import { loadConfig, loadKey } from "../config.js"; +import { loadConfig } from "../config.js"; import { createClient, type LitNetwork } from "../utils/client.js"; import { error, output } from "../utils/output.js"; @@ -39,7 +39,7 @@ async function vaultStore(args: string[], flags: Record): Promis const litNetwork = (flags["lit-network"] as LitNetwork) ?? "cayenne"; const useLit = engine === "lit"; - const client = await createClient(config, loadKey(), useLit ? { litNetwork } : undefined); + const client = await createClient(config, useLit ? { litNetwork } : undefined); try { let visibility: Visibility; @@ -117,7 +117,7 @@ async function vaultGet(args: string[], flags: Record): Promise< const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const entry = await client.vault.get(path); @@ -133,7 +133,7 @@ async function vaultLs(args: string[], flags: Record): Promise): Pro const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const currency = flags.currency ?? "USDC"; @@ -194,7 +194,7 @@ async function vaultPriceGet(args: string[], flags: Record): Pro const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const price = await client.pricing.getPrice(path); @@ -217,7 +217,7 @@ async function vaultPriceGet(args: string[], flags: Record): Pro async function vaultPriceLs(flags: Record): Promise { const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { const prices = await client.pricing.listPrices(); @@ -241,7 +241,7 @@ async function vaultPriceRm(args: string[], flags: Record): Prom const config = loadConfig(); if (flags.relay) config.relay = flags.relay; - const client = await createClient(config, loadKey()); + const client = await createClient(config); try { await client.pricing.removePrice(path); diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts index 4d3d990..d867ab1 100644 --- a/packages/cli/src/config.ts +++ b/packages/cli/src/config.ts @@ -5,6 +5,7 @@ import { join } from "node:path"; import { getNetwork, type NetworkId } from "@orbitmem/sdk/contracts"; export interface CliConfig { + walletName: string; network: NetworkId; relay: string; chain: string; @@ -12,7 +13,7 @@ export interface CliConfig { reputationAddress: string; } -function defaultConfig(network?: NetworkId): CliConfig { +function defaultConfig(network?: NetworkId): Omit { const net = getNetwork(network); return { network: network ?? "base-sepolia", @@ -35,11 +36,19 @@ function ensureDir(): void { export function loadConfig(): CliConfig { const configPath = join(getConfigDir(), "config.json"); const defaults = defaultConfig(); - if (!existsSync(configPath)) return { ...defaults }; + if (!existsSync(configPath)) return { walletName: "", ...defaults }; const raw = JSON.parse(readFileSync(configPath, "utf-8")); - // If saved config has a network, resolve defaults from that network const base = raw.network ? defaultConfig(raw.network) : defaults; - return { ...base, ...raw }; + return { walletName: "", ...base, ...raw }; +} + +/** Derive CAIP-2 chain ID from network name */ +export function toCaip2(network: string): string { + const map: Record = { + "base-sepolia": "eip155:84532", + base: "eip155:8453", + }; + return map[network] ?? "eip155:84532"; } export function saveConfig(config: Partial): void { @@ -49,18 +58,3 @@ export function saveConfig(config: Partial): void { const merged = { ...existing, ...config }; writeFileSync(configPath, `${JSON.stringify(merged, null, 2)}\n`); } - -export function loadKey(): string { - const keyPath = join(getConfigDir(), "key.json"); - if (!existsSync(keyPath)) { - throw new Error("No key found. Run `orbitmem init` first."); - } - const raw = JSON.parse(readFileSync(keyPath, "utf-8")); - return raw.privateKey; -} - -export function saveKey(privateKey: string): void { - ensureDir(); - const keyPath = join(getConfigDir(), "key.json"); - writeFileSync(keyPath, `${JSON.stringify({ privateKey }, null, 2)}\n`); -} diff --git a/packages/cli/src/utils/client.ts b/packages/cli/src/utils/client.ts index ec2ad2f..05918e9 100644 --- a/packages/cli/src/utils/client.ts +++ b/packages/cli/src/utils/client.ts @@ -1,7 +1,7 @@ import { createOrbitMem, getNetwork } from "@orbitmem/sdk"; +import { createOwsAdapter } from "@orbitmem/sdk/identity"; import type { EncryptionConfig } from "@orbitmem/sdk/types"; import { createPublicClient, createWalletClient, http } from "viem"; -import { privateKeyToAccount } from "viem/accounts"; import { base, baseSepolia } from "viem/chains"; import type { CliConfig } from "../config.js"; @@ -17,14 +17,16 @@ export interface CreateClientOpts { litNetwork?: LitNetwork; } -export async function createClient(config: CliConfig, privateKey: string, opts?: CreateClientOpts) { +export async function createClient(config: CliConfig, opts?: CreateClientOpts) { const network = getNetwork(config.network); const chain = CHAINS[config.network] ?? baseSepolia; const transport = http(network.rpcUrl); - const account = privateKeyToAccount(privateKey as `0x${string}`); + + const adapter = createOwsAdapter(config.walletName, `eip155:${chain.id}`); + const viemAccount = await adapter.toViemAccount(); const publicClient = createPublicClient({ chain, transport }); - const walletClient = createWalletClient({ chain, transport, account }); + const walletClient = createWalletClient({ chain, transport, account: viemAccount }); const encryption: EncryptionConfig = { defaultEngine: "aes", @@ -36,7 +38,7 @@ export async function createClient(config: CliConfig, privateKey: string, opts?: const client = await createOrbitMem({ network: config.network, - identity: { privateKey }, + identity: { owsWallet: config.walletName }, vault: { dbName: "orbitmem-cli" }, encryption, persistence: { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a32e5df..9b72fb9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -36,6 +36,11 @@ "bun": "./src/contracts.ts", "import": "./dist/contracts.js" }, + "./identity": { + "types": "./src/identity/index.ts", + "bun": "./src/identity/index.ts", + "import": "./dist/identity/index.js" + }, "./types": { "types": "./src/types.ts", "bun": "./src/types.ts", @@ -61,6 +66,7 @@ "@lit-protocol/constants": "^7.0.0", "@lit-protocol/encryption": "^7.0.0", "@lit-protocol/lit-node-client": "^7.0.0", + "@open-wallet-standard/core": "^1.1.0", "@orbitdb/core": "^3.0.2", "@orbitdb/nested-db": "^2.0.4", "@orbitmem/contracts": "^0.1.0", diff --git a/packages/sdk/src/identity/__tests__/ows-adapter.test.ts b/packages/sdk/src/identity/__tests__/ows-adapter.test.ts new file mode 100644 index 0000000..beba176 --- /dev/null +++ b/packages/sdk/src/identity/__tests__/ows-adapter.test.ts @@ -0,0 +1,47 @@ +import { afterAll, beforeAll, describe, expect, test } from "bun:test"; + +import { createOwsAdapter } from "../ows-adapter.js"; + +const WALLET = "orbitmem-test-adapter"; +const CHAIN = "eip155:84532"; // Base Sepolia + +describe("ows-adapter", () => { + beforeAll(async () => { + const { createWallet, listWallets } = await import("@open-wallet-standard/core"); + const existing = listWallets().find((w) => w.name === WALLET); + if (!existing) { + createWallet(WALLET); + } + }); + + afterAll(async () => { + try { + const { deleteWallet } = await import("@open-wallet-standard/core"); + deleteWallet(WALLET); + } catch { + // ignore + } + }); + + test("getAddress returns a valid EVM address", async () => { + const adapter = createOwsAdapter(WALLET, CHAIN); + const address = await adapter.getAddress(); + expect(address).toMatch(/^0x[0-9a-fA-F]{40}$/); + }); + + test("signMessage returns a Uint8Array signature", async () => { + const adapter = createOwsAdapter(WALLET, CHAIN); + const result = await adapter.signMessage("hello"); + expect(result.signature).toBeInstanceOf(Uint8Array); + expect(result.signature.length).toBeGreaterThan(0); + expect(result.algorithm).toBe("ecdsa-secp256k1"); + }); + + test("toViemAccount returns account with address and sign methods", async () => { + const adapter = createOwsAdapter(WALLET, CHAIN); + const account = await adapter.toViemAccount(); + expect(account.address).toMatch(/^0x[0-9a-fA-F]{40}$/); + expect(typeof account.signMessage).toBe("function"); + expect(typeof account.signTransaction).toBe("function"); + }); +}); diff --git a/packages/sdk/src/identity/identity-layer.ts b/packages/sdk/src/identity/identity-layer.ts index fb37937..33b187a 100644 --- a/packages/sdk/src/identity/identity-layer.ts +++ b/packages/sdk/src/identity/identity-layer.ts @@ -1,4 +1,5 @@ import type { + ChainFamily, IdentityConfig, IIdentityLayer, SessionKey, @@ -20,27 +21,25 @@ export function createIdentityLayer(config: IdentityConfig): IIdentityLayer { return { async connect(opts) { - // If a private key was provided (CLI / server usage), auto-connect via viem - if (config.privateKey && opts.method === "evm") { - const { privateKeyToAccount } = await import("viem/accounts"); - const account = privateKeyToAccount(config.privateKey as `0x${string}`); + // If an OWS wallet was provided (CLI / server usage), auto-connect via OWS adapter + if (config.owsWallet) { + const { createOwsAdapter } = await import("./ows-adapter.js"); + const owsChain = config.owsChain ?? "eip155:84532"; + const adapter = createOwsAdapter(config.owsWallet, owsChain); + const address = await adapter.getAddress(); + + const family: ChainFamily = owsChain.startsWith("solana:") ? "solana" : "evm"; + const algorithm: SignatureAlgorithm = family === "solana" ? "ed25519" : "ecdsa-secp256k1"; connection = { - address: account.address, - family: "evm", - signatureAlgorithm: "ecdsa-secp256k1", + address, + family, + signatureAlgorithm: algorithm, connectedAt: Date.now(), }; signFn = async (message: string) => { - const sig = await account.signMessage({ message }); - const bytes = new Uint8Array( - sig - .slice(2) - .match(/.{2}/g)! - .map((b) => Number.parseInt(b, 16)), - ); - return { signature: bytes, algorithm: "ecdsa-secp256k1" as const }; + return adapter.signMessage(message); }; for (const cb of listeners) cb(connection); @@ -48,7 +47,7 @@ export function createIdentityLayer(config: IdentityConfig): IIdentityLayer { } throw new Error( - `connect(${opts.method}) requires a wallet adapter or privateKey config. ` + + `connect(${opts.method}) requires a wallet adapter or owsWallet config. ` + "Use setConnection() for testing or integrate a wallet provider.", ); }, diff --git a/packages/sdk/src/identity/index.ts b/packages/sdk/src/identity/index.ts index a8dccd4..e0e0e71 100644 --- a/packages/sdk/src/identity/index.ts +++ b/packages/sdk/src/identity/index.ts @@ -1,2 +1,3 @@ export { createIdentityLayer } from "./identity-layer.js"; export { deriveSessionKey } from "./session.js"; +export { createOwsAdapter, type OwsAdapter } from "./ows-adapter.js"; diff --git a/packages/sdk/src/identity/ows-adapter.ts b/packages/sdk/src/identity/ows-adapter.ts new file mode 100644 index 0000000..b76fc3a --- /dev/null +++ b/packages/sdk/src/identity/ows-adapter.ts @@ -0,0 +1,80 @@ +import type { SignatureAlgorithm, WalletAddress } from "../types.js"; + +export interface OwsAdapter { + getAddress(): Promise; + signMessage(message: string): Promise<{ signature: Uint8Array; algorithm: SignatureAlgorithm }>; + toViemAccount(): Promise; +} + +/** + * @param walletName — OWS wallet name (e.g., "orbitmem") + * @param chain — CAIP-2 chain ID (e.g., "eip155:84532" for Base Sepolia) + */ +export function createOwsAdapter(walletName: string, chain: string): OwsAdapter { + // OWS NAPI-RS bindings are synchronous — wrap in lazy import for ESM compat. + const ows = () => import("@open-wallet-standard/core"); + + function hexToBytes(hex: string): Uint8Array { + const clean = hex.replace(/^0x/, ""); + return new Uint8Array(clean.match(/.{2}/g)!.map((b) => Number.parseInt(b, 16))); + } + + /** + * Find the EVM address for the given CAIP-2 chain from WalletInfo.accounts. + * Falls back to the first eip155 account if exact chain not found. + */ + function resolveAddress(accounts: Array<{ chainId: string; address: string }>): string { + const exact = accounts.find((a) => a.chainId === chain); + if (exact) return exact.address; + const evm = accounts.find((a) => a.chainId.startsWith("eip155:")); + if (evm) return evm.address; + throw new Error(`No EVM account found for chain ${chain} in wallet "${walletName}"`); + } + + return { + async getAddress(): Promise { + const { getWallet } = await ows(); + const wallet = getWallet(walletName); + return resolveAddress(wallet.accounts) as WalletAddress; + }, + + async signMessage( + message: string, + ): Promise<{ signature: Uint8Array; algorithm: SignatureAlgorithm }> { + const { signMessage: owsSign } = await ows(); + const result = owsSign(walletName, chain, message); + return { signature: hexToBytes(result.signature), algorithm: "ecdsa-secp256k1" }; + }, + + async toViemAccount(): Promise { + const address = await this.getAddress(); + const { toAccount } = await import("viem/accounts"); + return toAccount({ + address: address as `0x${string}`, + async signMessage({ message }) { + const { signMessage: owsSign } = await ows(); + const msg = + typeof message === "string" + ? message + : typeof message === "object" && "raw" in message + ? typeof message.raw === "string" + ? message.raw + : new TextDecoder().decode(message.raw) + : String(message); + const result = owsSign(walletName, chain, msg); + return result.signature as `0x${string}`; + }, + async signTransaction(tx) { + const { signTransaction: owsSignTx } = await ows(); + const result = owsSignTx(walletName, chain, JSON.stringify(tx)); + return result.signature as `0x${string}`; + }, + async signTypedData(typedData) { + const { signTypedData: owsSignTyped } = await ows(); + const result = owsSignTyped(walletName, chain, JSON.stringify(typedData)); + return result.signature as `0x${string}`; + }, + }); + }, + }; +} diff --git a/packages/sdk/src/types.ts b/packages/sdk/src/types.ts index 754a031..187c3c7 100644 --- a/packages/sdk/src/types.ts +++ b/packages/sdk/src/types.ts @@ -63,8 +63,10 @@ export type SignatureAlgorithm = "p256" | "ecdsa-secp256k1" | "ed25519"; export interface IdentityConfig { /** Supported chain families (default: ["evm"]) */ chains?: ChainFamily[]; - /** EVM private key for CLI / server-side usage (hex string) */ - privateKey?: string; + /** OWS wallet name for CLI / server-side usage */ + owsWallet?: string; + /** CAIP-2 chain ID for OWS signing (e.g., "eip155:84532"). Defaults to "eip155:84532" (Base Sepolia) */ + owsChain?: string; /** Porto Passkey config (optional if not using passkey auth) */ passkey?: { /** WebAuthn Relying Party ID (e.g., "app.orbitmem.xyz") */