diff --git a/apps/events/src/routes/authenticate-success.tsx b/apps/events/src/routes/authenticate-success.tsx
index 674a5d07..3fe0c372 100644
--- a/apps/events/src/routes/authenticate-success.tsx
+++ b/apps/events/src/routes/authenticate-success.tsx
@@ -45,6 +45,7 @@ function RouteComponent() {
address: parsedAuthParams.appIdentityAddress,
addressPrivateKey: parsedAuthParams.appIdentityAddressPrivateKey,
accountAddress: parsedAuthParams.accountAddress,
+ permissionId: parsedAuthParams.permissionId,
signaturePublicKey: parsedAuthParams.signaturePublicKey,
signaturePrivateKey: parsedAuthParams.signaturePrivateKey,
encryptionPublicKey: parsedAuthParams.encryptionPublicKey,
diff --git a/apps/server/prisma/migrations/20250620005807_add_connect_signer_address/migration.sql b/apps/server/prisma/migrations/20250620005807_add_connect_signer_address/migration.sql
new file mode 100644
index 00000000..61bca61a
--- /dev/null
+++ b/apps/server/prisma/migrations/20250620005807_add_connect_signer_address/migration.sql
@@ -0,0 +1,26 @@
+/*
+ Warnings:
+
+ - Added the required column `connectSignerAddress` to the `Account` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Account" (
+ "address" TEXT NOT NULL PRIMARY KEY,
+ "connectAddress" TEXT NOT NULL,
+ "connectCiphertext" TEXT NOT NULL,
+ "connectNonce" TEXT NOT NULL,
+ "connectSignaturePublicKey" TEXT NOT NULL,
+ "connectEncryptionPublicKey" TEXT NOT NULL,
+ "connectAccountProof" TEXT NOT NULL,
+ "connectKeyProof" TEXT NOT NULL,
+ "connectSignerAddress" TEXT NOT NULL
+);
+INSERT INTO "new_Account" ("address", "connectAccountProof", "connectAddress", "connectCiphertext", "connectEncryptionPublicKey", "connectKeyProof", "connectNonce", "connectSignaturePublicKey") SELECT "address", "connectAccountProof", "connectAddress", "connectCiphertext", "connectEncryptionPublicKey", "connectKeyProof", "connectNonce", "connectSignaturePublicKey" FROM "Account";
+DROP TABLE "Account";
+ALTER TABLE "new_Account" RENAME TO "Account";
+CREATE UNIQUE INDEX "Account_connectAddress_key" ON "Account"("connectAddress");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;
diff --git a/apps/server/prisma/schema.prisma b/apps/server/prisma/schema.prisma
index 29751787..2f2fce42 100644
--- a/apps/server/prisma/schema.prisma
+++ b/apps/server/prisma/schema.prisma
@@ -109,6 +109,7 @@ model Account {
connectKeyProof String
infoAuthor Space[]
spaceKeyBoxes SpaceKeyBox[]
+ connectSignerAddress String
}
model AppIdentity {
diff --git a/apps/server/src/handlers/createIdentity.ts b/apps/server/src/handlers/createIdentity.ts
index 509ae28b..05f5a7d7 100644
--- a/apps/server/src/handlers/createIdentity.ts
+++ b/apps/server/src/handlers/createIdentity.ts
@@ -1,6 +1,7 @@
import { prisma } from '../prisma.js';
type Params = {
+ signerAddress: string;
accountAddress: string;
ciphertext: string;
nonce: string;
@@ -11,6 +12,7 @@ type Params = {
};
export const createIdentity = async ({
+ signerAddress,
accountAddress,
ciphertext,
nonce,
@@ -32,6 +34,7 @@ export const createIdentity = async ({
}
return await prisma.account.create({
data: {
+ connectSignerAddress: signerAddress,
address: accountAddress,
connectAccountProof: accountProof,
connectKeyProof: keyProof,
diff --git a/apps/server/src/handlers/is-signer-for-account.ts b/apps/server/src/handlers/is-signer-for-account.ts
new file mode 100644
index 00000000..26773bfa
--- /dev/null
+++ b/apps/server/src/handlers/is-signer-for-account.ts
@@ -0,0 +1,13 @@
+import { prisma } from '../prisma';
+
+export const isSignerForAccount = async (signerAddress: string, accountAddress: string) => {
+ const account = await prisma.account.findUnique({
+ where: {
+ address: accountAddress,
+ },
+ });
+ if (!account) {
+ return false;
+ }
+ return account.connectSignerAddress === signerAddress;
+};
diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index cb521fed..27c2d231 100755
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -1,5 +1,6 @@
import { parse } from 'node:url';
import { Identity, Inboxes, Messages, SpaceEvents, Utils } from '@graphprotocol/hypergraph';
+import { GEOGENESIS, GEO_TESTNET } from '@graphprotocol/hypergraph/connect/smart-account';
import { bytesToHex, randomBytes } from '@noble/hashes/utils.js';
import cors from 'cors';
import { Effect, Exit, Schema } from 'effect';
@@ -22,6 +23,7 @@ import { getLatestAccountInboxMessages } from './handlers/getLatestAccountInboxM
import { getLatestSpaceInboxMessages } from './handlers/getLatestSpaceInboxMessages.js';
import { getSpace } from './handlers/getSpace.js';
import { getSpaceInbox } from './handlers/getSpaceInbox.js';
+import { isSignerForAccount } from './handlers/is-signer-for-account.js';
import { listAccountInboxes } from './handlers/list-account-inboxes.js';
import { listPublicAccountInboxes } from './handlers/list-public-account-inboxes.js';
import { listSpacesByAccount } from './handlers/list-spaces-by-account.js';
@@ -41,6 +43,8 @@ const decodeRequestMessage = Schema.decodeUnknownEither(Messages.RequestMessage)
const webSocketServer = new WebSocketServer({ noServer: true });
const PORT = process.env.PORT !== undefined ? Number.parseInt(process.env.PORT) : 3030;
const app = express();
+const CHAIN = process.env.HYPERGRAPH_CHAIN === 'geogenesis' ? GEOGENESIS : GEO_TESTNET;
+const RPC_URL = process.env.HYPERGRAPH_RPC_URL ?? CHAIN.rpcUrls.default.http[0];
type AuthenticatedRequest = Request & { accountAddress?: string };
@@ -73,7 +77,12 @@ app.get('/connect/spaces', async (req, res) => {
console.log('GET connect/spaces');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+ const accountAddress = req.headers['account-address'] as string;
+ const signerAddress = await getAddressByPrivyToken(idToken);
+ if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+ res.status(401).send('Unauthorized');
+ return;
+ }
const spaces = await listSpacesByAccount({ accountAddress });
const spaceResults = spaces.map((space) => ({
id: space.id,
@@ -114,8 +123,13 @@ app.post('/connect/spaces', async (req, res) => {
console.log('POST connect/spaces');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
const message = Schema.decodeUnknownSync(Messages.RequestConnectCreateSpaceEvent)(req.body);
+ const accountAddress = message.accountAddress;
+ const signerAddress = await getAddressByPrivyToken(idToken);
+ if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+ res.status(401).send('Unauthorized');
+ return;
+ }
const space = await createSpace({
accountAddress,
event: message.event,
@@ -142,10 +156,15 @@ app.post('/connect/add-app-identity-to-spaces', async (req, res) => {
console.log('POST connect/add-app-identity-to-spaces');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+
+ const signerAddress = await getAddressByPrivyToken(idToken);
const message = Schema.decodeUnknownSync(Messages.RequestConnectAddAppIdentityToSpaces)(req.body);
+ if (!(await isSignerForAccount(signerAddress, message.accountAddress))) {
+ res.status(401).send('Unauthorized');
+ return;
+ }
const space = await addAppIdentityToSpaces({
- accountAddress,
+ accountAddress: message.accountAddress,
appIdentityAddress: message.appIdentityAddress,
spacesInput: message.spacesInput,
});
@@ -166,28 +185,33 @@ app.post('/connect/identity', async (req, res) => {
console.log('POST connect/identity');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddressPrivy = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+ const signerAddress = await getAddressByPrivyToken(idToken);
const message = Schema.decodeUnknownSync(Messages.RequestConnectCreateIdentity)(req.body);
const accountAddress = message.keyBox.accountAddress;
- if (accountAddressPrivy !== accountAddress) {
+
+ if (signerAddress !== message.keyBox.signer) {
res.status(401).send('Unauthorized');
return;
}
if (
- !Identity.verifyIdentityOwnership(
+ !(await Identity.verifyIdentityOwnership(
accountAddress,
message.signaturePublicKey,
message.accountProof,
message.keyProof,
- )
+ CHAIN,
+ RPC_URL,
+ ))
) {
console.log('Ownership proof is invalid');
res.status(401).send('Unauthorized');
return;
}
+ console.log('Ownership proof is valid');
try {
await createIdentity({
+ signerAddress,
accountAddress,
ciphertext: message.keyBox.ciphertext,
nonce: message.keyBox.nonce,
@@ -220,17 +244,23 @@ app.post('/connect/identity', async (req, res) => {
}
});
-app.post('/connect/identity/encrypted', async (req, res) => {
- console.log('POST connect/identity/encrypted');
+app.get('/connect/identity/encrypted', async (req, res) => {
+ console.log('GET connect/identity/encrypted');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+ const signerAddress = await getAddressByPrivyToken(idToken);
+ const accountAddress = req.headers['account-address'] as string;
+ if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+ res.status(401).send('Unauthorized');
+ return;
+ }
const identity = await getConnectIdentity({ accountAddress });
const outgoingMessage: Messages.ResponseIdentityEncrypted = {
keyBox: {
accountAddress,
ciphertext: identity.ciphertext,
nonce: identity.nonce,
+ signer: signerAddress,
},
};
res.status(200).send(outgoingMessage);
@@ -250,16 +280,23 @@ app.get('/connect/app-identity/:appId', async (req, res) => {
console.log('GET connect/app-identity/:appId');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+ const signerAddress = await getAddressByPrivyToken(idToken);
+ const accountAddress = req.headers['account-address'] as string;
+ if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+ res.status(401).send('Unauthorized');
+ return;
+ }
const appId = req.params.appId;
const appIdentity = await findAppIdentity({ accountAddress, appId });
if (!appIdentity) {
+ console.log('App identity not found');
res.status(404).json({ message: 'App identity not found' });
return;
}
+ console.log('App identity found');
res.status(200).json({ appIdentity });
} catch (error) {
- console.error('Error creating space:', error);
+ console.error('Error getting app identity:', error);
if (error instanceof Error && error.message === 'No Privy ID token provided') {
res.status(401).json({ message: 'Unauthorized' });
} else if (error instanceof Error && error.message === 'Missing Privy configuration') {
@@ -274,8 +311,14 @@ app.post('/connect/app-identity', async (req, res) => {
console.log('POST connect/app-identity');
try {
const idToken = req.headers['privy-id-token'];
- const accountAddress = await getAddressByPrivyToken(Array.isArray(idToken) ? idToken[0] : idToken);
+ const signerAddress = await getAddressByPrivyToken(idToken);
const message = Schema.decodeUnknownSync(Messages.RequestConnectCreateAppIdentity)(req.body);
+ const accountAddress = message.accountAddress;
+ if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+ console.log('Signer address is not the signer for the account');
+ res.status(401).send('Unauthorized');
+ return;
+ }
const sessionToken = bytesToHex(randomBytes(32));
const sessionTokenExpires = new Date(Date.now() + 1000 * 60 * 60 * 24 * 30); // 30 days
const appIdentity = await createAppIdentity({
diff --git a/apps/server/src/utils/get-address-by-privy-token.ts b/apps/server/src/utils/get-address-by-privy-token.ts
index 91a9233d..c2a5d327 100644
--- a/apps/server/src/utils/get-address-by-privy-token.ts
+++ b/apps/server/src/utils/get-address-by-privy-token.ts
@@ -1,16 +1,18 @@
import { PrivyClient, type Wallet } from '@privy-io/server-auth';
-export async function getAddressByPrivyToken(idToken: string | undefined): Promise
{
+export async function getAddressByPrivyToken(idToken: string[] | string | undefined): Promise {
if (!idToken) {
throw new Error('No Privy ID token provided');
}
+ const idTokenString = Array.isArray(idToken) ? idToken[0] : idToken;
+
if (!process.env.PRIVY_APP_SECRET || !process.env.PRIVY_APP_ID) {
throw new Error('Missing Privy configuration');
}
const privy = new PrivyClient(process.env.PRIVY_APP_ID, process.env.PRIVY_APP_SECRET);
- const user = await privy.getUser({ idToken });
+ const user = await privy.getUser({ idToken: idTokenString });
if (!user) {
throw new Error('Invalid Privy user');
diff --git a/packages/hypergraph-react/src/internal/constants.ts b/packages/hypergraph-react/src/internal/constants.ts
index 23f8ad8c..3eb9108f 100644
--- a/packages/hypergraph-react/src/internal/constants.ts
+++ b/packages/hypergraph-react/src/internal/constants.ts
@@ -1,2 +1,2 @@
-export const GEO_API_MAINNET_ENDPOINT = 'https://hypergraph-v2.up.railway.app//graphql';
+export const GEO_API_MAINNET_ENDPOINT = 'https://hypergraph-v2.up.railway.app/graphql';
export const GEO_API_TESTNET_ENDPOINT = 'https://hypergraph-v2-testnet.up.railway.app/graphql';
diff --git a/packages/hypergraph/package.json b/packages/hypergraph/package.json
index 4e05c92c..7b568d0b 100644
--- a/packages/hypergraph/package.json
+++ b/packages/hypergraph/package.json
@@ -34,10 +34,12 @@
"@noble/curves": "^1.9.0",
"@noble/hashes": "^1.8.0",
"@noble/secp256k1": "^2.2.3",
+ "@rhinestone/module-sdk": "^0.2.8",
"@serenity-kit/noble-sodium": "^0.2.1",
"@xstate/store": "^3.5.1",
"bs58check": "^4.0.0",
"effect": "^3.16.3",
+ "permissionless": "^0.2.47",
"siwe": "^3.0.0",
"uuid": "^11.1.0",
"viem": "^2.30.6"
diff --git a/packages/hypergraph/src/connect/abis.ts b/packages/hypergraph/src/connect/abis.ts
new file mode 100644
index 00000000..4b4d5a76
--- /dev/null
+++ b/packages/hypergraph/src/connect/abis.ts
@@ -0,0 +1,183 @@
+import mainVotingAbi from './abis/MainVotingPlugin.json' with { type: 'json' };
+import personalSpaceAdminAbi from './abis/PersonalSpaceAdminPlugin.json' with { type: 'json' };
+
+export { mainVotingAbi, personalSpaceAdminAbi };
+
+// Simplified ABI for the Safe Module Manager with the functions we need
+export const safeModuleManagerAbi = [
+ {
+ inputs: [
+ {
+ internalType: 'address',
+ name: 'module',
+ type: 'address',
+ },
+ ],
+ name: 'enableModule',
+ outputs: [],
+ stateMutability: 'nonpayable',
+ type: 'function',
+ },
+ {
+ inputs: [
+ {
+ internalType: 'address',
+ name: 'module',
+ type: 'address',
+ },
+ ],
+ name: 'disableModule',
+ outputs: [],
+ stateMutability: 'nonpayable',
+ type: 'function',
+ },
+];
+
+export const safeOwnerManagerAbi = [
+ {
+ inputs: [
+ {
+ internalType: 'address',
+ name: 'owner',
+ type: 'address',
+ },
+ {
+ internalType: 'uint256',
+ name: 'threshold',
+ type: 'uint256',
+ },
+ ],
+ name: 'addOwnerWithThreshold',
+ outputs: [],
+ stateMutability: 'nonpayable',
+ type: 'function',
+ },
+];
+
+// We only use this for revokeEnableSignature to use as a noop when creating a smart session
+export const smartSessionsAbi = [
+ {
+ inputs: [
+ {
+ internalType: 'PermissionId',
+ name: 'permissionId',
+ type: 'bytes32',
+ },
+ ],
+ name: 'revokeEnableSignature',
+ outputs: [],
+ stateMutability: 'nonpayable',
+ type: 'function',
+ },
+];
+
+// ABI for the Safe7579 module, only with the functions we need
+export const safe7579Abi = [
+ {
+ type: 'function',
+ name: 'isModuleInstalled',
+ inputs: [
+ {
+ name: 'moduleType',
+ type: 'uint256',
+ internalType: 'uint256',
+ },
+ { name: 'module', type: 'address', internalType: 'address' },
+ { name: 'additionalContext', type: 'bytes', internalType: 'bytes' },
+ ],
+ outputs: [
+ {
+ name: '',
+ type: 'bool',
+ internalType: 'bool',
+ },
+ ],
+ stateMutability: 'view',
+ },
+];
+
+// ABI for the DAO Factory, only with the functions we need
+export const daoFactoryAbi = [
+ {
+ inputs: [
+ {
+ components: [
+ {
+ internalType: 'address',
+ name: 'trustedForwarder',
+ type: 'address',
+ },
+ {
+ internalType: 'string',
+ name: 'daoURI',
+ type: 'string',
+ },
+ {
+ internalType: 'string',
+ name: 'subdomain',
+ type: 'string',
+ },
+ {
+ internalType: 'bytes',
+ name: 'metadata',
+ type: 'bytes',
+ },
+ ],
+ internalType: 'struct DAOFactory.DAOSettings',
+ name: '_daoSettings',
+ type: 'tuple',
+ },
+ {
+ components: [
+ {
+ components: [
+ {
+ components: [
+ {
+ internalType: 'uint8',
+ name: 'release',
+ type: 'uint8',
+ },
+ {
+ internalType: 'uint16',
+ name: 'build',
+ type: 'uint16',
+ },
+ ],
+ internalType: 'struct PluginRepo.Tag',
+ name: 'versionTag',
+ type: 'tuple',
+ },
+ {
+ internalType: 'contract PluginRepo',
+ name: 'pluginSetupRepo',
+ type: 'address',
+ },
+ ],
+ internalType: 'struct PluginSetupRef',
+ name: 'pluginSetupRef',
+ type: 'tuple',
+ },
+ {
+ internalType: 'bytes',
+ name: 'data',
+ type: 'bytes',
+ },
+ ],
+ internalType: 'struct DAOFactory.PluginSettings[]',
+ name: '_pluginSettings',
+ type: 'tuple[]',
+ },
+ ],
+ name: 'createDao',
+ outputs: [
+ {
+ internalType: 'contract DAO',
+ name: 'createdDao',
+ type: 'address',
+ },
+ ],
+ stateMutability: 'nonpayable',
+ type: 'function',
+ },
+] as const;
diff --git a/packages/hypergraph/src/connect/abis/MainVotingPlugin.json b/packages/hypergraph/src/connect/abis/MainVotingPlugin.json
new file mode 100644
index 00000000..f93b2b20
--- /dev/null
+++ b/packages/hypergraph/src/connect/abis/MainVotingPlugin.json
@@ -0,0 +1,1865 @@
+[
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_member",
+ "type": "address"
+ }
+ ],
+ "name": "AlreadyAMember",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_editor",
+ "type": "address"
+ }
+ ],
+ "name": "AlreadyAnEditor",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_member",
+ "type": "address"
+ }
+ ],
+ "name": "AlreadyNotAMember",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_editor",
+ "type": "address"
+ }
+ ],
+ "name": "AlreadyNotAnEditor",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "where",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "who",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes32",
+ "name": "permissionId",
+ "type": "bytes32"
+ }
+ ],
+ "name": "DaoUnauthorized",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint64",
+ "name": "limit",
+ "type": "uint64"
+ },
+ {
+ "internalType": "uint64",
+ "name": "actual",
+ "type": "uint64"
+ }
+ ],
+ "name": "DateOutOfBounds",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint64",
+ "name": "limit",
+ "type": "uint64"
+ },
+ {
+ "internalType": "uint64",
+ "name": "actual",
+ "type": "uint64"
+ }
+ ],
+ "name": "DurationOutOfBounds",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "EmptyContent",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "InvalidAddresslistUpdate",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "name": "InvalidInterface",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "NoEditorsLeft",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "caller",
+ "type": "address"
+ }
+ ],
+ "name": "NotAMember",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "NotAnEditor",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "OnlyCreatorCanCancel",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "length",
+ "type": "uint256"
+ }
+ ],
+ "name": "OnlyOneEditorPerCall",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "sender",
+ "type": "address"
+ }
+ ],
+ "name": "ProposalCreationForbidden",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalExecutionForbidden",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "ProposalIsNotOpen",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "limit",
+ "type": "uint256"
+ },
+ {
+ "internalType": "uint256",
+ "name": "actual",
+ "type": "uint256"
+ }
+ ],
+ "name": "RatioOutOfBounds",
+ "type": "error"
+ },
+ {
+ "inputs": [],
+ "name": "Unauthorized",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "account",
+ "type": "address"
+ },
+ {
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "voteOption",
+ "type": "uint8"
+ }
+ ],
+ "name": "VoteCastForbidden",
+ "type": "error"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "subspace",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "AcceptSubspaceProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "AddEditorProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "previousAdmin",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "newAdmin",
+ "type": "address"
+ }
+ ],
+ "name": "AdminChanged",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "beacon",
+ "type": "address"
+ }
+ ],
+ "name": "BeaconUpgraded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorLeft",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorRemoved",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address[]",
+ "name": "editors",
+ "type": "address[]"
+ }
+ ],
+ "name": "EditorsAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "uint8",
+ "name": "version",
+ "type": "uint8"
+ }
+ ],
+ "name": "Initialized",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberLeft",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberRemoved",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalCanceled",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "components": [
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "indexed": false,
+ "internalType": "struct IDAO.Action[]",
+ "name": "actions",
+ "type": "tuple[]"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint256",
+ "name": "allowFailureMap",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalExecuted",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "string",
+ "name": "contentUri",
+ "type": "string"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "PublishEditsProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "RemoveEditorProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "RemoveMemberProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "subspace",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ }
+ ],
+ "name": "RemoveSubspaceProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "implementation",
+ "type": "address"
+ }
+ ],
+ "name": "Upgraded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "voter",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "voteOption",
+ "type": "uint8"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint256",
+ "name": "votingPower",
+ "type": "uint256"
+ }
+ ],
+ "name": "VoteCast",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "enum MajorityVotingBase.VotingMode",
+ "name": "votingMode",
+ "type": "uint8"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint32",
+ "name": "supportThreshold",
+ "type": "uint32"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "duration",
+ "type": "uint64"
+ }
+ ],
+ "name": "VotingSettingsUpdated",
+ "type": "event"
+ },
+ {
+ "inputs": [],
+ "name": "UPDATE_ADDRESSES_PERMISSION_ID",
+ "outputs": [
+ {
+ "internalType": "bytes32",
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "UPDATE_VOTING_SETTINGS_PERMISSION_ID",
+ "outputs": [
+ {
+ "internalType": "bytes32",
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "UPGRADE_PLUGIN_PERMISSION_ID",
+ "outputs": [
+ {
+ "internalType": "bytes32",
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "addEditor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "addMember",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "addresslistLength",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_blockNumber",
+ "type": "uint256"
+ }
+ ],
+ "name": "addresslistLengthAtBlock",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "canExecute",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "_voter",
+ "type": "address"
+ },
+ {
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "_voteOption",
+ "type": "uint8"
+ }
+ ],
+ "name": "canVote",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "cancelProposal",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "components": [
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "internalType": "struct IDAO.Action[]",
+ "name": "_actions",
+ "type": "tuple[]"
+ },
+ {
+ "internalType": "uint256",
+ "name": "_allowFailureMap",
+ "type": "uint256"
+ },
+ {
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "_voteOption",
+ "type": "uint8"
+ },
+ {
+ "internalType": "bool",
+ "name": "_tryEarlyExecution",
+ "type": "bool"
+ }
+ ],
+ "name": "createProposal",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "dao",
+ "outputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "duration",
+ "outputs": [
+ {
+ "internalType": "uint64",
+ "name": "",
+ "type": "uint64"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "execute",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "getProposal",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "open",
+ "type": "bool"
+ },
+ {
+ "internalType": "bool",
+ "name": "executed",
+ "type": "bool"
+ },
+ {
+ "components": [
+ {
+ "internalType": "enum MajorityVotingBase.VotingMode",
+ "name": "votingMode",
+ "type": "uint8"
+ },
+ {
+ "internalType": "uint32",
+ "name": "supportThreshold",
+ "type": "uint32"
+ },
+ {
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "internalType": "uint64",
+ "name": "snapshotBlock",
+ "type": "uint64"
+ }
+ ],
+ "internalType": "struct MajorityVotingBase.ProposalParameters",
+ "name": "parameters",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ {
+ "internalType": "uint256",
+ "name": "abstain",
+ "type": "uint256"
+ },
+ {
+ "internalType": "uint256",
+ "name": "yes",
+ "type": "uint256"
+ },
+ {
+ "internalType": "uint256",
+ "name": "no",
+ "type": "uint256"
+ }
+ ],
+ "internalType": "struct MajorityVotingBase.Tally",
+ "name": "tally",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "internalType": "struct IDAO.Action[]",
+ "name": "actions",
+ "type": "tuple[]"
+ },
+ {
+ "internalType": "uint256",
+ "name": "allowFailureMap",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ },
+ {
+ "internalType": "address",
+ "name": "_voter",
+ "type": "address"
+ }
+ ],
+ "name": "getVoteOption",
+ "outputs": [
+ {
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "",
+ "type": "uint8"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "implementation",
+ "outputs": [
+ {
+ "internalType": "address",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "_dao",
+ "type": "address"
+ },
+ {
+ "components": [
+ {
+ "internalType": "enum MajorityVotingBase.VotingMode",
+ "name": "votingMode",
+ "type": "uint8"
+ },
+ {
+ "internalType": "uint32",
+ "name": "supportThreshold",
+ "type": "uint32"
+ },
+ {
+ "internalType": "uint64",
+ "name": "duration",
+ "type": "uint64"
+ }
+ ],
+ "internalType": "struct MajorityVotingBase.VotingSettings",
+ "name": "_votingSettings",
+ "type": "tuple"
+ },
+ {
+ "internalType": "address[]",
+ "name": "_initialEditors",
+ "type": "address[]"
+ },
+ {
+ "internalType": "contract MemberAccessPlugin",
+ "name": "_memberAccessPlugin",
+ "type": "address"
+ }
+ ],
+ "name": "initialize",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "isEditor",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "isListed",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "_blockNumber",
+ "type": "uint256"
+ }
+ ],
+ "name": "isListedAtBlock",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "isMember",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "isMinParticipationReached",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "isSupportThresholdReached",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "isSupportThresholdReachedEarly",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "leaveSpace",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "leaveSpaceAsEditor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "memberAccessPlugin",
+ "outputs": [
+ {
+ "internalType": "contract MemberAccessPlugin",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "pluginType",
+ "outputs": [
+ {
+ "internalType": "enum IPlugin.PluginType",
+ "name": "",
+ "type": "uint8"
+ }
+ ],
+ "stateMutability": "pure",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "proposalCount",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "contract IDAO",
+ "name": "_subspaceDao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "proposeAcceptSubspace",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "address",
+ "name": "_proposedEditor",
+ "type": "address"
+ }
+ ],
+ "name": "proposeAddEditor",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "address",
+ "name": "_proposedMember",
+ "type": "address"
+ }
+ ],
+ "name": "proposeAddMember",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "string",
+ "name": "_editsContentUri",
+ "type": "string"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "proposeEdits",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "address",
+ "name": "_editor",
+ "type": "address"
+ }
+ ],
+ "name": "proposeRemoveEditor",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "address",
+ "name": "_member",
+ "type": "address"
+ }
+ ],
+ "name": "proposeRemoveMember",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadataContentUri",
+ "type": "bytes"
+ },
+ {
+ "internalType": "contract IDAO",
+ "name": "_subspaceDao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "proposeRemoveSubspace",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "proxiableUUID",
+ "outputs": [
+ {
+ "internalType": "bytes32",
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "removeEditor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "removeMember",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "supportThreshold",
+ "outputs": [
+ {
+ "internalType": "uint32",
+ "name": "",
+ "type": "uint32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes4",
+ "name": "_interfaceId",
+ "type": "bytes4"
+ }
+ ],
+ "name": "supportsInterface",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_blockNumber",
+ "type": "uint256"
+ }
+ ],
+ "name": "totalVotingPower",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "components": [
+ {
+ "internalType": "enum MajorityVotingBase.VotingMode",
+ "name": "votingMode",
+ "type": "uint8"
+ },
+ {
+ "internalType": "uint32",
+ "name": "supportThreshold",
+ "type": "uint32"
+ },
+ {
+ "internalType": "uint64",
+ "name": "duration",
+ "type": "uint64"
+ }
+ ],
+ "internalType": "struct MajorityVotingBase.VotingSettings",
+ "name": "_votingSettings",
+ "type": "tuple"
+ }
+ ],
+ "name": "updateVotingSettings",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "newImplementation",
+ "type": "address"
+ }
+ ],
+ "name": "upgradeTo",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "newImplementation",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "name": "upgradeToAndCall",
+ "outputs": [],
+ "stateMutability": "payable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "uint256",
+ "name": "_proposalId",
+ "type": "uint256"
+ },
+ {
+ "internalType": "enum IMajorityVoting.VoteOption",
+ "name": "_voteOption",
+ "type": "uint8"
+ },
+ {
+ "internalType": "bool",
+ "name": "_tryEarlyExecution",
+ "type": "bool"
+ }
+ ],
+ "name": "vote",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "votingMode",
+ "outputs": [
+ {
+ "internalType": "enum MajorityVotingBase.VotingMode",
+ "name": "",
+ "type": "uint8"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ }
+]
diff --git a/packages/hypergraph/src/connect/abis/PersonalSpaceAdminPlugin.json b/packages/hypergraph/src/connect/abis/PersonalSpaceAdminPlugin.json
new file mode 100644
index 00000000..17823797
--- /dev/null
+++ b/packages/hypergraph/src/connect/abis/PersonalSpaceAdminPlugin.json
@@ -0,0 +1,531 @@
+[
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "where",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "who",
+ "type": "address"
+ },
+ {
+ "internalType": "bytes32",
+ "name": "permissionId",
+ "type": "bytes32"
+ }
+ ],
+ "name": "DaoUnauthorized",
+ "type": "error"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "caller",
+ "type": "address"
+ }
+ ],
+ "name": "NotAMember",
+ "type": "error"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorLeft",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "editor",
+ "type": "address"
+ }
+ ],
+ "name": "EditorRemoved",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address[]",
+ "name": "editors",
+ "type": "address[]"
+ }
+ ],
+ "name": "EditorsAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "uint8",
+ "name": "version",
+ "type": "uint8"
+ }
+ ],
+ "name": "Initialized",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberAdded",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberLeft",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "dao",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "address",
+ "name": "member",
+ "type": "address"
+ }
+ ],
+ "name": "MemberRemoved",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ },
+ {
+ "indexed": true,
+ "internalType": "address",
+ "name": "creator",
+ "type": "address"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "startDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint64",
+ "name": "endDate",
+ "type": "uint64"
+ },
+ {
+ "indexed": false,
+ "internalType": "bytes",
+ "name": "metadata",
+ "type": "bytes"
+ },
+ {
+ "components": [
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "indexed": false,
+ "internalType": "struct IDAO.Action[]",
+ "name": "actions",
+ "type": "tuple[]"
+ },
+ {
+ "indexed": false,
+ "internalType": "uint256",
+ "name": "allowFailureMap",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalCreated",
+ "type": "event"
+ },
+ {
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": true,
+ "internalType": "uint256",
+ "name": "proposalId",
+ "type": "uint256"
+ }
+ ],
+ "name": "ProposalExecuted",
+ "type": "event"
+ },
+ {
+ "inputs": [],
+ "name": "dao",
+ "outputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes",
+ "name": "_metadata",
+ "type": "bytes"
+ },
+ {
+ "components": [
+ {
+ "internalType": "address",
+ "name": "to",
+ "type": "address"
+ },
+ {
+ "internalType": "uint256",
+ "name": "value",
+ "type": "uint256"
+ },
+ {
+ "internalType": "bytes",
+ "name": "data",
+ "type": "bytes"
+ }
+ ],
+ "internalType": "struct IDAO.Action[]",
+ "name": "_actions",
+ "type": "tuple[]"
+ },
+ {
+ "internalType": "uint256",
+ "name": "_allowFailureMap",
+ "type": "uint256"
+ }
+ ],
+ "name": "executeProposal",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "_dao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "_initialEditor",
+ "type": "address"
+ }
+ ],
+ "name": "initialize",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "isEditor",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_account",
+ "type": "address"
+ }
+ ],
+ "name": "isMember",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "leaveSpace",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "pluginType",
+ "outputs": [
+ {
+ "internalType": "enum IPlugin.PluginType",
+ "name": "",
+ "type": "uint8"
+ }
+ ],
+ "stateMutability": "pure",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "proposalCount",
+ "outputs": [
+ {
+ "internalType": "uint256",
+ "name": "",
+ "type": "uint256"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "_subspaceDao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "submitAcceptSubspace",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "string",
+ "name": "_contentUri",
+ "type": "string"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "submitEdits",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_newEditor",
+ "type": "address"
+ }
+ ],
+ "name": "submitNewEditor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_newMember",
+ "type": "address"
+ }
+ ],
+ "name": "submitNewMember",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_editor",
+ "type": "address"
+ }
+ ],
+ "name": "submitRemoveEditor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "_member",
+ "type": "address"
+ }
+ ],
+ "name": "submitRemoveMember",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "contract IDAO",
+ "name": "_subspaceDao",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "_spacePlugin",
+ "type": "address"
+ }
+ ],
+ "name": "submitRemoveSubspace",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes4",
+ "name": "_interfaceId",
+ "type": "bytes4"
+ }
+ ],
+ "name": "supportsInterface",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ }
+]
diff --git a/packages/hypergraph/src/connect/create-callback-params.ts b/packages/hypergraph/src/connect/create-callback-params.ts
index 2e6bf48f..f3121c77 100644
--- a/packages/hypergraph/src/connect/create-callback-params.ts
+++ b/packages/hypergraph/src/connect/create-callback-params.ts
@@ -6,6 +6,7 @@ type CreateAuthUrlParams = {
expiry: number;
nonce: string;
appId: string;
+ permissionId: string;
appIdentityAddress: string;
appIdentityAddressPrivateKey: string;
accountAddress: string;
@@ -15,7 +16,8 @@ type CreateAuthUrlParams = {
encryptionPrivateKey: string;
sessionToken: string;
sessionTokenExpires: number;
- spaces: { id: string }[];
+ privateSpaces: { id: string }[];
+ publicSpaces: { id: string }[];
};
export const createCallbackParams = ({ nonce, ephemeralPublicKey, ...rest }: CreateAuthUrlParams) => {
diff --git a/packages/hypergraph/src/connect/identity-encryption.ts b/packages/hypergraph/src/connect/identity-encryption.ts
index 7b5d77de..17ea4017 100644
--- a/packages/hypergraph/src/connect/identity-encryption.ts
+++ b/packages/hypergraph/src/connect/identity-encryption.ts
@@ -67,7 +67,6 @@ const signatureMessage = (nonce: Uint8Array): string => {
export const encryptIdentity = async (
signer: Signer,
- accountAddress: string,
keys: IdentityKeys,
): Promise<{ ciphertext: string; nonce: string }> => {
const nonce = randomBytes(32);
@@ -76,7 +75,7 @@ export const encryptIdentity = async (
// Check that the signature is valid
const valid = await verifyMessage({
- address: accountAddress as Hex,
+ address: (await signer.getAddress()) as Hex,
message,
signature,
});
@@ -97,18 +96,13 @@ export const encryptIdentity = async (
return { ciphertext, nonce: bytesToHex(nonce) };
};
-export const decryptIdentity = async (
- signer: Signer,
- accountAddress: string,
- ciphertext: string,
- nonce: string,
-): Promise => {
+export const decryptIdentity = async (signer: Signer, ciphertext: string, nonce: string): Promise => {
const message = signatureMessage(hexToBytes(nonce));
const signature = (await signer.signMessage(message)) as Hex;
// Check that the signature is valid
const valid = await verifyMessage({
- address: accountAddress as Hex,
+ address: (await signer.getAddress()) as Hex,
message,
signature,
});
@@ -141,9 +135,9 @@ export const decryptIdentity = async (
export const encryptAppIdentity = async (
signer: Signer,
- accountAddress: string,
appIdentityAddress: string,
appIdentityAddressPrivateKey: string,
+ permissionId: string,
keys: IdentityKeys,
): Promise<{ ciphertext: string; nonce: string }> => {
const nonce = randomBytes(32);
@@ -152,7 +146,7 @@ export const encryptAppIdentity = async (
// Check that the signature is valid
const valid = await verifyMessage({
- address: accountAddress as Hex,
+ address: (await signer.getAddress()) as Hex,
message,
signature,
});
@@ -169,6 +163,7 @@ export const encryptAppIdentity = async (
keys.signaturePrivateKey,
appIdentityAddress,
appIdentityAddressPrivateKey,
+ permissionId,
].join('\n');
const keysMsg = new TextEncoder().encode(keysTxt);
const ciphertext = encrypt(keysMsg, secretKey);
@@ -177,16 +172,15 @@ export const encryptAppIdentity = async (
export const decryptAppIdentity = async (
signer: Signer,
- accountAddress: string,
ciphertext: string,
nonce: string,
-): Promise> => {
+): Promise> => {
const message = signatureMessage(hexToBytes(nonce));
const signature = (await signer.signMessage(message)) as Hex;
// Check that the signature is valid
const valid = await verifyMessage({
- address: accountAddress as Hex,
+ address: (await signer.getAddress()) as Hex,
message,
signature,
});
@@ -220,6 +214,7 @@ export const decryptAppIdentity = async (
signaturePrivateKey,
appIdentityAddress,
appIdentityAddressPrivateKey,
+ permissionId,
] = keysTxt.split('\n');
return {
encryptionPublicKey,
@@ -228,6 +223,6 @@ export const decryptAppIdentity = async (
signaturePrivateKey,
address: appIdentityAddress,
addressPrivateKey: appIdentityAddressPrivateKey,
- accountAddress,
+ permissionId,
};
};
diff --git a/packages/hypergraph/src/connect/index.ts b/packages/hypergraph/src/connect/index.ts
index fcc35ed5..ae6a5582 100644
--- a/packages/hypergraph/src/connect/index.ts
+++ b/packages/hypergraph/src/connect/index.ts
@@ -6,5 +6,5 @@ export * from './identity-encryption.js';
export * from './login.js';
export * from './parse-auth-params.js';
export * from './parse-callback-params.js';
-export * from './prove-ownership.js';
+export * from './smart-account.js';
export * from './types.js';
diff --git a/packages/hypergraph/src/connect/login.ts b/packages/hypergraph/src/connect/login.ts
index dc354a96..09c5a74a 100644
--- a/packages/hypergraph/src/connect/login.ts
+++ b/packages/hypergraph/src/connect/login.ts
@@ -1,11 +1,19 @@
import * as Schema from 'effect/Schema';
-import type { Address } from 'viem';
+import type { SmartAccountClient } from 'permissionless';
+import type { Address, Chain, Hex, WalletClient } from 'viem';
+import { proveIdentityOwnership } from '../identity/prove-ownership.js';
import * as Messages from '../messages/index.js';
import { store } from '../store-connect.js';
-import { storeAccountAddress, storeKeys } from './auth-storage.js';
+import { loadAccountAddress, storeAccountAddress, storeKeys } from './auth-storage.js';
import { createIdentityKeys } from './create-identity-keys.js';
import { decryptIdentity, encryptIdentity } from './identity-encryption.js';
-import { proveIdentityOwnership } from './prove-ownership.js';
+import {
+ type SmartAccountParams,
+ getSmartAccountWalletClient,
+ isSmartAccountDeployed,
+ smartAccountNeedsUpdate,
+ updateLegacySmartAccount,
+} from './smart-account.js';
import type { IdentityKeys, Signer, Storage } from './types.js';
export async function identityExists(accountAddress: string, syncServerUri: string) {
@@ -17,17 +25,24 @@ export async function identityExists(accountAddress: string, syncServerUri: stri
export async function signup(
signer: Signer,
+ walletClient: WalletClient,
+ smartAccountClient: SmartAccountClient,
accountAddress: Address,
syncServerUri: string,
storage: Storage,
identityToken: string,
) {
const keys = createIdentityKeys();
- const { ciphertext, nonce } = await encryptIdentity(signer, accountAddress, keys);
- const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
+ const { ciphertext, nonce } = await encryptIdentity(signer, keys);
+ const { accountProof, keyProof } = await proveIdentityOwnership(
+ walletClient,
+ smartAccountClient,
+ accountAddress,
+ keys,
+ );
const req: Messages.RequestConnectCreateIdentity = {
- keyBox: { accountAddress, ciphertext, nonce },
+ keyBox: { signer: await signer.getAddress(), accountAddress, ciphertext, nonce },
accountProof,
keyProof,
signaturePublicKey: keys.signaturePublicKey,
@@ -49,7 +64,6 @@ export async function signup(
if (!decoded.success) {
throw new Error('Error creating identity');
}
- storeAccountAddress(storage, accountAddress);
storeKeys(storage, accountAddress, keys);
return {
@@ -66,9 +80,10 @@ export async function restoreKeys(
identityToken: string,
) {
const res = await fetch(new URL('/connect/identity/encrypted', syncServerUri), {
- method: 'POST',
+ method: 'GET',
headers: {
'privy-id-token': identityToken,
+ 'account-address': accountAddress,
'Content-Type': 'application/json',
},
});
@@ -77,7 +92,7 @@ export async function restoreKeys(
const decoded = Schema.decodeUnknownSync(Messages.ResponseIdentityEncrypted)(await res.json());
const { keyBox } = decoded;
const { ciphertext, nonce } = keyBox;
- const keys = await decryptIdentity(signer, accountAddress, ciphertext, nonce);
+ const keys = await decryptIdentity(signer, ciphertext, nonce);
storeKeys(storage, accountAddress, keys);
return {
accountAddress,
@@ -87,13 +102,63 @@ export async function restoreKeys(
throw new Error(`Error fetching identity ${res.status}`);
}
-export async function login(
- signer: Signer,
- accountAddress: Address,
- syncServerUri: string,
- storage: Storage,
- identityToken: string,
-) {
+export async function login({
+ walletClient,
+ signer,
+ syncServerUri,
+ storage,
+ identityToken,
+ rpcUrl,
+ chain,
+}: {
+ walletClient: WalletClient;
+ signer: Signer;
+ syncServerUri: string;
+ storage: Storage;
+ identityToken: string;
+ rpcUrl: string;
+ chain: Chain;
+}) {
+ const accountAddressFromStorage = loadAccountAddress(storage) as Hex;
+ const smartAccountParams: SmartAccountParams = {
+ owner: walletClient,
+ rpcUrl,
+ chain,
+ };
+ if (accountAddressFromStorage) {
+ smartAccountParams.address = accountAddressFromStorage;
+ }
+ const smartAccountWalletClient = await getSmartAccountWalletClient(smartAccountParams);
+ if (!smartAccountWalletClient.account) {
+ throw new Error('Smart account wallet client not found');
+ }
+ console.log('smartAccountWalletClient', smartAccountWalletClient);
+ console.log('address', smartAccountWalletClient.account.address);
+ console.log('is deployed', await isSmartAccountDeployed(smartAccountWalletClient));
+ // This will prompt the user to sign a user operation to update the smart account
+ if (await smartAccountNeedsUpdate(smartAccountWalletClient, chain, rpcUrl)) {
+ await updateLegacySmartAccount(smartAccountWalletClient, chain, rpcUrl);
+ }
+
+ // TODO: remove this once we manage to get counterfactual signatures working
+ if (!(await isSmartAccountDeployed(smartAccountWalletClient))) {
+ console.log('sending dummy userOp to deploy smart account');
+ if (!walletClient.account) {
+ throw new Error('Wallet client account not found');
+ }
+ const tx = await smartAccountWalletClient.sendUserOperation({
+ calls: [{ to: walletClient.account.address, data: '0x' }],
+ account: smartAccountWalletClient.account,
+ });
+
+ console.log('tx', tx);
+ const receipt = await smartAccountWalletClient.waitForUserOperationReceipt({ hash: tx });
+ console.log('receipt', receipt);
+ }
+ const accountAddress = smartAccountWalletClient.account.address;
+ if (accountAddressFromStorage === undefined) {
+ storeAccountAddress(storage, accountAddress);
+ }
// const keys = loadKeys(storage, accountAddress);
let authData: {
accountAddress: Address;
@@ -101,7 +166,15 @@ export async function login(
};
const exists = await identityExists(accountAddress, syncServerUri);
if (!exists) {
- authData = await signup(signer, accountAddress, syncServerUri, storage, identityToken);
+ authData = await signup(
+ signer,
+ walletClient,
+ smartAccountWalletClient,
+ accountAddress,
+ syncServerUri,
+ storage,
+ identityToken,
+ );
} else {
authData = await restoreKeys(signer, accountAddress, syncServerUri, storage, identityToken);
}
diff --git a/packages/hypergraph/src/connect/parse-callback-params.ts b/packages/hypergraph/src/connect/parse-callback-params.ts
index 4e978eeb..66e92ee4 100644
--- a/packages/hypergraph/src/connect/parse-callback-params.ts
+++ b/packages/hypergraph/src/connect/parse-callback-params.ts
@@ -53,13 +53,15 @@ export const parseCallbackParams = ({
appIdentityAddress: data.appIdentityAddress,
appIdentityAddressPrivateKey: data.appIdentityAddressPrivateKey,
accountAddress: data.accountAddress,
+ permissionId: data.permissionId,
signaturePublicKey: data.signaturePublicKey,
signaturePrivateKey: data.signaturePrivateKey,
encryptionPublicKey: data.encryptionPublicKey,
encryptionPrivateKey: data.encryptionPrivateKey,
sessionToken: data.sessionToken,
sessionTokenExpires: new Date(data.sessionTokenExpires),
- spaces: data.spaces,
+ privateSpaces: data.privateSpaces,
+ publicSpaces: data.publicSpaces,
});
} catch (error) {
console.error(error);
diff --git a/packages/hypergraph/src/connect/prove-ownership.ts b/packages/hypergraph/src/connect/prove-ownership.ts
deleted file mode 100644
index 3250b7df..00000000
--- a/packages/hypergraph/src/connect/prove-ownership.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { type Hex, verifyMessage } from 'viem';
-import { privateKeyToAccount } from 'viem/accounts';
-
-import { publicKeyToAddress } from '../utils/index.js';
-import type { IdentityKeys, Signer } from './types.js';
-
-export const getAccountProofMessage = (accountAddress: string, publicKey: string): string => {
- return `This message proves I am the owner of the account ${accountAddress} and the public key ${publicKey}`;
-};
-
-export const getKeyProofMessage = (accountAddress: string, publicKey: string): string => {
- return `The public key ${publicKey} is owned by the account ${accountAddress}`;
-};
-
-export const proveIdentityOwnership = async (
- signer: Signer,
- accountAddress: string,
- keys: IdentityKeys,
-): Promise<{ accountProof: string; keyProof: string }> => {
- const publicKey = keys.signaturePublicKey;
- const accountProofMessage = getAccountProofMessage(accountAddress, publicKey);
- const keyProofMessage = getKeyProofMessage(accountAddress, publicKey);
- const accountProof = await signer.signMessage(accountProofMessage);
- const account = privateKeyToAccount(keys.signaturePrivateKey as Hex);
- const keyProof = await account.signMessage({ message: keyProofMessage });
- return { accountProof, keyProof };
-};
-
-export const verifyIdentityOwnership = async (
- accountAddress: string,
- publicKey: string,
- accountProof: string,
- keyProof: string,
-): Promise => {
- const accountProofMessage = getAccountProofMessage(accountAddress, publicKey);
- const keyProofMessage = getKeyProofMessage(accountAddress, publicKey);
- const validAccountProof = await verifyMessage({
- address: accountAddress as Hex,
- message: accountProofMessage,
- signature: accountProof as Hex,
- });
- if (!validAccountProof) {
- console.log('Invalid account proof');
- return false;
- }
-
- const keyAddress = publicKeyToAddress(publicKey) as Hex;
- const validKeyProof = await verifyMessage({
- address: keyAddress,
- message: keyProofMessage,
- signature: keyProof as Hex,
- });
- if (!validKeyProof) {
- console.log('Invalid key proof');
- return false;
- }
- return true;
-};
diff --git a/packages/hypergraph/src/connect/smart-account.ts b/packages/hypergraph/src/connect/smart-account.ts
new file mode 100644
index 00000000..83d14726
--- /dev/null
+++ b/packages/hypergraph/src/connect/smart-account.ts
@@ -0,0 +1,896 @@
+import { MAINNET, TESTNET } from '@graphprotocol/grc-20/contracts';
+import { randomBytes } from '@noble/hashes/utils';
+import {
+ OWNABLE_VALIDATOR_ADDRESS,
+ RHINESTONE_ATTESTER_ADDRESS,
+ type Session,
+ SmartSessionMode,
+ encodeSmartSessionSignature,
+ encodeValidationData,
+ encodeValidatorNonce,
+ getAccount,
+ getEnableSessionDetails,
+ getOwnableValidator,
+ getOwnableValidatorMockSignature,
+ getPermissionId,
+ getSmartSessionsValidator,
+ getSpendingLimitsPolicy,
+ getSudoPolicy,
+ getTimeFramePolicy,
+ getUniversalActionPolicy,
+ getUsageLimitPolicy,
+ getValueLimitPolicy,
+} from '@rhinestone/module-sdk';
+import { type SmartAccountClient, createSmartAccountClient, encodeInstallModule } from 'permissionless';
+import { type ToSafeSmartAccountParameters, toSafeSmartAccount } from 'permissionless/accounts';
+import { getAccountNonce } from 'permissionless/actions';
+import { erc7579Actions } from 'permissionless/actions/erc7579';
+import { createPimlicoClient } from 'permissionless/clients/pimlico';
+import {
+ http,
+ type AbiFunction,
+ type Account,
+ type Address,
+ type Calls,
+ type Chain,
+ ContractFunctionExecutionError,
+ type Hex,
+ type Narrow,
+ type SignableMessage,
+ type WalletClient,
+ createPublicClient,
+ encodeFunctionData,
+ getAbiItem,
+ toBytes,
+ toFunctionSelector,
+ toHex,
+} from 'viem';
+import {
+ type UserOperation,
+ type WaitForUserOperationReceiptReturnType,
+ entryPoint07Address,
+ getUserOperationHash,
+} from 'viem/account-abstraction';
+import { privateKeyToAccount } from 'viem/accounts';
+import { bytesToHex } from '../utils/hexBytesAddressUtils.js';
+import {
+ daoFactoryAbi,
+ mainVotingAbi,
+ personalSpaceAdminAbi,
+ safe7579Abi,
+ safeModuleManagerAbi,
+ safeOwnerManagerAbi,
+ smartSessionsAbi,
+} from './abis.js';
+
+export const DEFAULT_RPC_URL = 'https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz';
+export const TESTNET_RPC_URL = 'https://rpc-geo-test-zc16z3tcvf.t.conduit.xyz';
+/**
+ * We provide a fallback API key for gas sponsorship for the duration of the
+ * Geo Genesis early access period. This API key is gas-limited.
+ */
+const DEFAULT_API_KEY = 'pim_KqHm63txxhbCYjdDaWaHqH';
+const BUNDLER_TRANSPORT_URL_BASE = 'https://api.pimlico.io/v2/';
+
+const SAFE_7579_MODULE_ADDRESS = '0x7579EE8307284F293B1927136486880611F20002';
+const SAFE_4337_MODULE_ADDRESS = '0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226';
+const ERC7579_LAUNCHPAD_ADDRESS = '0x7579011aB74c46090561ea277Ba79D510c6C00ff';
+
+const SPACE_FACTORY_ADDRESS: Record = {
+ '80451': MAINNET.DAO_FACTORY_ADDRESS,
+ '19411': TESTNET.DAO_FACTORY_ADDRESS,
+};
+
+const MODULE_TYPE_VALIDATOR = 1;
+
+const PUBLIC_SPACE_FUNCTIONS = [
+ 'leaveSpace',
+ 'leaveSpaceAsEditor',
+ 'createProposal',
+ 'proposeEdits',
+ 'proposeAcceptSubspace',
+ 'proposeRemoveSubspace',
+ 'proposeAddMember',
+ 'proposeRemoveMember',
+ 'proposeAddEditor',
+ 'proposeRemoveEditor',
+ 'cancelProposal',
+ 'vote',
+ 'execute',
+];
+
+const PERSONAL_SPACE_FUNCTIONS = [
+ 'executeProposal',
+ 'submitEdits',
+ 'submitAcceptSubspace',
+ 'submitRemoveSubspace',
+ 'submitNewMember',
+ 'submitRemoveMember',
+ 'leaveSpace',
+ 'submitNewEditor',
+ 'submitRemoveEditor',
+];
+
+export const GEOGENESIS = {
+ id: Number('80451'),
+ name: 'Geo Genesis',
+ nativeCurrency: {
+ name: 'Graph Token',
+ symbol: 'GRT',
+ decimals: 18,
+ },
+ rpcUrls: {
+ default: {
+ http: [DEFAULT_RPC_URL],
+ },
+ public: {
+ http: [DEFAULT_RPC_URL],
+ },
+ },
+};
+
+export const GEO_TESTNET = {
+ id: Number('19411'),
+ name: 'Geo Testnet',
+ nativeCurrency: {
+ name: 'Sepolia Ether',
+ symbol: 'ETH',
+ decimals: 18,
+ },
+ rpcUrls: {
+ default: {
+ http: [TESTNET_RPC_URL],
+ },
+ public: {
+ http: [TESTNET_RPC_URL],
+ },
+ },
+};
+
+export type Action = {
+ actionTarget: Address;
+ actionTargetSelector: Hex;
+ actionPolicies: { policy: Address; address: Address; initData: Hex }[];
+};
+
+// We re-export these functions to allow creating sessions with policies for
+// additional actions without needing the Rhinestone module SDK.
+export {
+ getSudoPolicy,
+ getUniversalActionPolicy,
+ getSpendingLimitsPolicy,
+ getTimeFramePolicy,
+ getUsageLimitPolicy,
+ getValueLimitPolicy,
+};
+
+export type SmartSessionClient = {
+ sendUserOperation: ({ calls }: { calls: calls }) => Promise;
+ waitForUserOperationReceipt: ({ hash }: { hash: Hex }) => Promise;
+ signMessage: ({ message }: { message: SignableMessage }) => Promise;
+};
+
+// Gets the legacy Geo smart account wallet client. If the smart account returned
+// by this function is deployed, it means it might need to be updated to have the 7579 module installed
+const getLegacySmartAccountWalletClient = async ({
+ owner,
+ address,
+ chain = GEOGENESIS,
+ rpcUrl = DEFAULT_RPC_URL,
+ apiKey = DEFAULT_API_KEY,
+}: {
+ owner: WalletClient | Account;
+ address?: Hex;
+ chain?: Chain;
+ rpcUrl?: string;
+ apiKey?: string;
+}): Promise => {
+ const transport = http(rpcUrl);
+ const publicClient = createPublicClient({
+ transport,
+ chain,
+ });
+
+ const safeAccountParams: ToSafeSmartAccountParameters<'0.7', Hex> = {
+ client: publicClient,
+ owners: [owner],
+ entryPoint: {
+ address: entryPoint07Address,
+ version: '0.7',
+ },
+ version: '1.4.1',
+ };
+ if (address) {
+ safeAccountParams.address = address;
+ }
+ const safeAccount = await toSafeSmartAccount(safeAccountParams);
+
+ const bundlerTransport = http(`${BUNDLER_TRANSPORT_URL_BASE}${chain.id}/rpc?apikey=${apiKey}`);
+ const paymasterClient = createPimlicoClient({
+ transport: bundlerTransport,
+ chain,
+ entryPoint: {
+ address: entryPoint07Address,
+ version: '0.7',
+ },
+ });
+
+ const smartAccountClient = createSmartAccountClient({
+ chain,
+ account: safeAccount,
+ paymaster: paymasterClient,
+ bundlerTransport,
+ userOperation: {
+ estimateFeesPerGas: async () => {
+ return (await paymasterClient.getUserOperationGasPrice()).fast;
+ },
+ },
+ });
+ return smartAccountClient;
+};
+
+// Gets the 7579 smart account wallet client. This is the new type of smart account that
+// includes the session keys validator and the 7579 module.
+const get7579SmartAccountWalletClient = async ({
+ owner,
+ address,
+ chain = GEOGENESIS,
+ rpcUrl = DEFAULT_RPC_URL,
+ apiKey = DEFAULT_API_KEY,
+}: {
+ owner: WalletClient | Account;
+ address?: Hex;
+ chain?: Chain;
+ rpcUrl?: string;
+ apiKey?: string;
+}): Promise => {
+ const transport = http(rpcUrl);
+ const publicClient = createPublicClient({
+ transport,
+ chain,
+ });
+ console.log('owner', owner);
+ console.log('chain', chain);
+ console.log('rpcUrl', rpcUrl);
+ console.log('apiKey', apiKey);
+ console.log('address', address);
+ const ownerAddress = 'account' in owner ? owner.account?.address : owner.address;
+ if (!ownerAddress) {
+ throw new Error('Owner address not found');
+ }
+
+ const ownableValidator = getOwnableValidator({
+ owners: [ownerAddress],
+ threshold: 1,
+ });
+ const smartSessionsValidator = getSmartSessionsValidator({});
+
+ const safeAccountParams: ToSafeSmartAccountParameters<'0.7', Hex> = {
+ client: publicClient,
+ owners: [owner],
+ version: '1.4.1' as const,
+ entryPoint: {
+ address: entryPoint07Address,
+ version: '0.7' as const,
+ },
+ safe4337ModuleAddress: SAFE_7579_MODULE_ADDRESS as Hex,
+ erc7579LaunchpadAddress: ERC7579_LAUNCHPAD_ADDRESS as Hex,
+ attesters: [
+ RHINESTONE_ATTESTER_ADDRESS, // Rhinestone Attester
+ ],
+ attestersThreshold: 1,
+ validators: [
+ {
+ address: ownableValidator.address,
+ context: ownableValidator.initData,
+ },
+ {
+ address: smartSessionsValidator.address,
+ context: smartSessionsValidator.initData,
+ },
+ ],
+ };
+ if (address) {
+ safeAccountParams.address = address;
+ }
+ const safeAccount = await toSafeSmartAccount(safeAccountParams);
+
+ const bundlerTransport = http(`${BUNDLER_TRANSPORT_URL_BASE}${chain.id}/rpc?apikey=${apiKey}`);
+ const paymasterClient = createPimlicoClient({
+ transport: bundlerTransport,
+ chain,
+ entryPoint: {
+ address: entryPoint07Address,
+ version: '0.7',
+ },
+ });
+
+ const smartAccountClient = createSmartAccountClient({
+ chain,
+ account: safeAccount,
+ paymaster: paymasterClient,
+ bundlerTransport,
+ userOperation: {
+ estimateFeesPerGas: async () => {
+ return (await paymasterClient.getUserOperationGasPrice()).fast;
+ },
+ },
+ }).extend(erc7579Actions());
+ // For some reason, the .extend() breaks the type inference, so we need to cast to unknown
+ return smartAccountClient as unknown as SmartAccountClient;
+};
+
+// Checks if the smart account is deployed.
+export const isSmartAccountDeployed = async (smartAccountClient: SmartAccountClient): Promise => {
+ if (!smartAccountClient.account) {
+ throw new Error('Invalid smart account');
+ }
+ return smartAccountClient.account.isDeployed();
+};
+
+export type SmartAccountParams = {
+ owner: WalletClient | Account;
+ address?: Hex;
+ chain?: Chain;
+ rpcUrl?: string;
+ apiKey?: string;
+};
+// Gets the smart account wallet client. This is the main function to use to get a smart account wallet client.
+// It will return the 7579 smart account wallet client if the smart account is deployed, otherwise it will return the legacy smart account wallet client, that might need to be updated.
+// You can use smartAccountNeedsUpdate to check if the smart account needs to be updated, and then call updateLegacySmartAccount to update it,
+// which requires executing a user operation.
+export const getSmartAccountWalletClient = async ({
+ owner,
+ address,
+ chain = GEOGENESIS,
+ rpcUrl = DEFAULT_RPC_URL,
+ apiKey = DEFAULT_API_KEY,
+}: SmartAccountParams): Promise => {
+ if (chain.id === GEO_TESTNET.id) {
+ // We don't have the smart sessions module deployed on testnet yet, so we need to use the legacy smart account wallet client
+ // TODO: remove this once we have the smart sessions module deployed on testnet
+ const params: SmartAccountParams = { owner, chain, rpcUrl, apiKey };
+ if (address) {
+ params.address = address;
+ }
+ console.log('on testnet, getting legacy smart account wallet client');
+ return getLegacySmartAccountWalletClient(params);
+ }
+ if (address) {
+ return get7579SmartAccountWalletClient({ owner, address, chain, rpcUrl, apiKey });
+ }
+ const legacyClient = await getLegacySmartAccountWalletClient({ owner, chain, rpcUrl, apiKey });
+ if (await isSmartAccountDeployed(legacyClient)) {
+ return legacyClient;
+ }
+ return get7579SmartAccountWalletClient({ owner, chain, rpcUrl, apiKey });
+};
+
+// Checks if the smart account has the 7579 module installed, the smart sessions validator installed, and the ownable validator installed.
+export const legacySmartAccountUpdateStatus = async (
+ smartAccountClient: SmartAccountClient,
+ chain: Chain,
+ rpcUrl: string,
+): Promise<{ has7579Module: boolean; hasSmartSessionsValidator: boolean; hasOwnableValidator: boolean }> => {
+ if (!smartAccountClient.account) {
+ throw new Error('Invalid smart account');
+ }
+ // We assume the smart account is deployed, so we just need to check if it has the 7579 module and smart sesions validator installed
+ // TODO: call the isModuleInstalled function from the safe7579Abi on the
+ // smart account, checking if the smart sessions validator is installed. This would fail
+ // if the smart account doesn't have the 7579 module installed.
+ const transport = http(rpcUrl);
+ const publicClient = createPublicClient({
+ transport,
+ chain,
+ });
+ const smartSessionsValidator = getSmartSessionsValidator({});
+ let isSmartSessionsValidatorInstalled = false;
+ try {
+ isSmartSessionsValidatorInstalled = (await publicClient.readContract({
+ abi: safe7579Abi,
+ address: smartAccountClient.account.address,
+ functionName: 'isModuleInstalled',
+ args: [MODULE_TYPE_VALIDATOR, smartSessionsValidator.address, '0x'],
+ })) as boolean;
+ } catch (error) {
+ if (error instanceof ContractFunctionExecutionError && error.details.includes('execution reverted')) {
+ // If the smart account doesn't have the 7579 module installed, the isModuleInstalled function will revert
+ return { has7579Module: false, hasSmartSessionsValidator: false, hasOwnableValidator: false };
+ }
+ throw error;
+ }
+ const ownableValidator = getOwnableValidator({
+ owners: [smartAccountClient.account.address],
+ threshold: 1,
+ });
+ // This shouldn't throw because by now we know the smart account has the 7579 module installed
+ const isOwnableValidatorInstalled = (await publicClient.readContract({
+ abi: safe7579Abi,
+ address: smartAccountClient.account.address,
+ functionName: 'isModuleInstalled',
+ args: [MODULE_TYPE_VALIDATOR, ownableValidator.address, '0x'],
+ })) as boolean;
+ return {
+ has7579Module: true,
+ hasSmartSessionsValidator: isSmartSessionsValidatorInstalled,
+ hasOwnableValidator: isOwnableValidatorInstalled,
+ };
+};
+
+// Checks if the smart account needs to be updated from a legacy ERC-4337 smart account to an ERC-7579 smart account
+// with support for smart sessions.
+export const smartAccountNeedsUpdate = async (
+ smartAccountClient: SmartAccountClient,
+ chain: Chain,
+ rpcUrl: string,
+): Promise => {
+ if (chain.id === GEO_TESTNET.id) {
+ // We don't have the smart sessions module deployed on testnet yet, so we need to use the legacy smart account wallet client
+ // TODO: remove this once we have the smart sessions module deployed on testnet
+ return false;
+ }
+ // If we haven't deployed the smart account, we would always deploy an updated version
+ if (!(await isSmartAccountDeployed(smartAccountClient))) {
+ return false;
+ }
+ const updateStatus = await legacySmartAccountUpdateStatus(smartAccountClient, chain, rpcUrl);
+ return !updateStatus.has7579Module || !updateStatus.hasSmartSessionsValidator || !updateStatus.hasOwnableValidator;
+};
+
+// Legacy Geo smart accounts (i.e. the ones that don't have the 7579 module installed)
+// need to be updated to have the 7579 module installed with the ownable and smart sessions validators.
+export const updateLegacySmartAccount = async (
+ smartAccountClient: SmartAccountClient,
+ chain: Chain,
+ rpcUrl: string,
+): Promise => {
+ if (!smartAccountClient.account?.address) {
+ throw new Error('Invalid smart account');
+ }
+ if (chain.id === GEO_TESTNET.id) {
+ // We don't have the smart sessions module deployed on testnet yet, so we need to use the legacy smart account wallet client
+ // TODO: remove this once we have the smart sessions module deployed on testnet
+ console.log('on testnet, skipping updateLegacySmartAccount');
+ return;
+ }
+ const ownableValidator = getOwnableValidator({
+ owners: [smartAccountClient.account.address],
+ threshold: 1,
+ });
+ const smartSessionsValidator = getSmartSessionsValidator({});
+ const installValidatorsTx = encodeInstallModule({
+ account: smartAccountClient.account,
+ modules: [
+ {
+ type: ownableValidator.type,
+ address: ownableValidator.address,
+ context: ownableValidator.initData,
+ },
+ {
+ type: smartSessionsValidator.type,
+ address: smartSessionsValidator.address,
+ context: smartSessionsValidator.initData,
+ },
+ ],
+ });
+
+ const updateStatus = await legacySmartAccountUpdateStatus(smartAccountClient, chain, rpcUrl);
+ const calls = [];
+ if (!updateStatus.has7579Module) {
+ calls.push({
+ to: smartAccountClient.account.address,
+ data: encodeFunctionData({
+ abi: safeModuleManagerAbi,
+ functionName: 'enableModule',
+ args: [SAFE_7579_MODULE_ADDRESS as Hex],
+ }),
+ value: BigInt(0),
+ });
+ calls.push({
+ to: smartAccountClient.account.address,
+ data: encodeFunctionData({
+ abi: safeModuleManagerAbi,
+ functionName: 'setFallbackHandler',
+ args: [SAFE_7579_MODULE_ADDRESS as Hex],
+ }),
+ value: BigInt(0),
+ });
+ calls.push({
+ to: smartAccountClient.account.address,
+ data: encodeFunctionData({
+ abi: safeModuleManagerAbi,
+ functionName: 'disableModule',
+ args: [SAFE_4337_MODULE_ADDRESS as Hex],
+ }),
+ value: BigInt(0),
+ });
+ }
+ if (!updateStatus.hasOwnableValidator) {
+ calls.push({
+ to: installValidatorsTx[0].to,
+ data: installValidatorsTx[0].data,
+ value: installValidatorsTx[0].value,
+ });
+ }
+ if (!updateStatus.hasSmartSessionsValidator) {
+ calls.push({
+ to: installValidatorsTx[1].to,
+ data: installValidatorsTx[1].data,
+ value: installValidatorsTx[1].value,
+ });
+ }
+ if (calls.length === 0) {
+ return;
+ }
+ const tx = await smartAccountClient.sendUserOperation({
+ calls,
+ });
+ const receipt = await smartAccountClient.waitForUserOperationReceipt({
+ hash: tx,
+ });
+ if (!receipt.success) {
+ throw new Error('Transaction to update legacy smart account failed');
+ }
+ return receipt;
+};
+
+// Gets the actions that a session key needs permission to perform on a space.
+const getSpaceActions = (space: { address: Hex; type: 'personal' | 'public' }) => {
+ const actions: Action[] = [];
+ if (space.type === 'public') {
+ for (const functionName of PUBLIC_SPACE_FUNCTIONS) {
+ actions.push({
+ actionTarget: space.address,
+ actionTargetSelector: toFunctionSelector(
+ getAbiItem({
+ abi: mainVotingAbi,
+ name: functionName,
+ }) as AbiFunction,
+ ),
+ actionPolicies: [getSudoPolicy()],
+ });
+ }
+ } else {
+ for (const functionName of PERSONAL_SPACE_FUNCTIONS) {
+ actions.push({
+ actionTarget: space.address,
+ actionTargetSelector: toFunctionSelector(
+ getAbiItem({
+ abi: personalSpaceAdminAbi,
+ name: functionName,
+ }) as AbiFunction,
+ ),
+ actionPolicies: [getSudoPolicy()],
+ });
+ }
+ }
+ return actions;
+};
+
+// This is the function that the Connect app uses to create a smart session and
+// enable it on the smart account.
+// It will prompt the user to sign the message to enable the session, and then
+// execute the transaction to enable the session.
+// It will return the permissionId that can be used to create a smart session client.
+export const createSmartSession = async (
+ owner: WalletClient,
+ accountAddress: Hex,
+ sessionPrivateKey: Hex,
+ chain: Chain,
+ rpcUrl: string,
+ {
+ allowCreateSpace = false,
+ spaces = [],
+ additionalActions = [],
+ }: {
+ allowCreateSpace?: boolean;
+ spaces?: {
+ address: Hex;
+ type: 'personal' | 'public';
+ }[];
+ additionalActions?: Action[];
+ } = {},
+): Promise => {
+ const smartAccountClient = await getSmartAccountWalletClient({
+ owner,
+ address: accountAddress,
+ chain,
+ rpcUrl,
+ });
+ if (!smartAccountClient.account) {
+ throw new Error('Invalid wallet client');
+ }
+ if (!smartAccountClient.account.isDeployed()) {
+ throw new Error('Smart account must be deployed');
+ }
+ if (await smartAccountNeedsUpdate(smartAccountClient, chain, rpcUrl)) {
+ throw new Error('Smart account needs to be updated');
+ }
+ if (!smartAccountClient.chain) {
+ throw new Error('Invalid smart account chain');
+ }
+ if (!owner.account) {
+ throw new Error('Invalid wallet client');
+ }
+
+ const sessionKeyAccount = privateKeyToAccount(sessionPrivateKey);
+ const transport = http(rpcUrl);
+ const publicClient = createPublicClient({
+ transport,
+ chain,
+ });
+ if (chain.id === GEO_TESTNET.id) {
+ // We don't have the smart sessions module deployed on testnet yet, so we need to fake it by adding an account owner
+ // TODO: remove this once we have the smart sessions module deployed on testnet
+ console.log('on testnet, faking a smart session by adding an account owner');
+ const tx = await smartAccountClient.sendUserOperation({
+ calls: [
+ {
+ to: smartAccountClient.account.address,
+ data: encodeFunctionData({
+ abi: safeOwnerManagerAbi,
+ functionName: 'addOwnerWithThreshold',
+ args: [sessionKeyAccount.address, BigInt(1)],
+ }),
+ value: BigInt(0),
+ },
+ ],
+ account: smartAccountClient.account,
+ });
+ const receipt = await smartAccountClient.waitForUserOperationReceipt({
+ hash: tx,
+ });
+ if (!receipt.success) {
+ throw new Error('Transaction to add account owner failed');
+ }
+ console.log('account owner added');
+ return bytesToHex(randomBytes(32)) as Hex;
+ }
+ // We create a dummy action so that we can execute a userOp immediately and create the session onchain,
+ // rather than having to pass along all the enable data to the end user app.
+ // In the future, if we enable attestations with the Rhinestone registry, we can remove this and instead
+ // call enableSessions on the smart sessions module from the smart account.
+ console.log('creating noOpActionPolicy');
+ const noOpActionPolicy = getUniversalActionPolicy({
+ paramRules: {
+ length: BigInt(1),
+ // @ts-expect-error - The Rhinestone SDK doesn't export the types we need here
+ rules: new Array(16).fill({
+ condition: BigInt(0), // ParamCondition.EQUAL
+ isLimited: false,
+ offset: BigInt(0),
+ ref: toHex(toBytes('0x', { size: 32 })),
+ usage: { limit: BigInt(0), used: BigInt(0) },
+ }),
+ },
+ valueLimitPerUse: BigInt(0),
+ });
+ console.log('noOpActionPolicy created');
+ const actions: Action[] = [
+ {
+ actionTarget: sessionKeyAccount.address,
+ actionTargetSelector: toFunctionSelector(
+ getAbiItem({
+ abi: smartSessionsAbi,
+ name: 'revokeEnableSignature',
+ }) as AbiFunction,
+ ),
+ actionPolicies: [noOpActionPolicy],
+ },
+ ];
+
+ console.log('getting space actions');
+ for (const space of spaces) {
+ actions.push(...getSpaceActions(space));
+ }
+ console.log('space actions created');
+ if (allowCreateSpace) {
+ const spaceFactoryAddress = SPACE_FACTORY_ADDRESS[chain.id.toString()];
+ actions.push({
+ actionTarget: spaceFactoryAddress,
+ actionTargetSelector: toFunctionSelector(
+ getAbiItem({
+ abi: daoFactoryAbi,
+ name: 'createDao',
+ }) as AbiFunction,
+ ),
+ actionPolicies: [getSudoPolicy()],
+ });
+ }
+ if (additionalActions) {
+ actions.push(...additionalActions);
+ }
+ console.log('actions created');
+ const session: Session = {
+ sessionValidator: OWNABLE_VALIDATOR_ADDRESS,
+ sessionValidatorInitData: encodeValidationData({
+ threshold: 1,
+ owners: [sessionKeyAccount.address],
+ }),
+ salt: bytesToHex(randomBytes(32)) as Hex,
+ userOpPolicies: [getSudoPolicy()],
+ erc7739Policies: {
+ allowedERC7739Content: [],
+ erc1271Policies: [],
+ },
+ actions,
+ chainId: BigInt(smartAccountClient.chain.id),
+ permitERC4337Paymaster: true,
+ };
+ const account = getAccount({
+ address: smartAccountClient.account.address,
+ type: 'safe',
+ });
+
+ console.log('session object');
+ // We use UNSAFE_ENABLE because we're not using Rhinestone's Registry
+ // contract to attest to the sessions we're creating.
+ // That's also why we set ignoreSecurityAttestations to true.
+ const sessionDetails = await getEnableSessionDetails({
+ // enableMode: SmartSessionMode.ENABLE,
+ sessions: [session],
+ account,
+ clients: [publicClient],
+ // ignoreSecurityAttestations: true,
+ });
+
+ console.log('signing session details');
+ // This will prompt the user to sign the message to enable the session
+ sessionDetails.enableSessionData.enableSession.permissionEnableSig = await owner.signMessage({
+ message: { raw: sessionDetails.permissionEnableHash },
+ account: owner.account.address,
+ });
+ console.log('session details signed');
+ const smartSessions = getSmartSessionsValidator({});
+ const nonce = await getAccountNonce(publicClient, {
+ address: smartAccountClient.account.address,
+ entryPointAddress: entryPoint07Address,
+ key: encodeValidatorNonce({
+ account,
+ validator: smartSessions,
+ }),
+ });
+ console.log('nonce');
+ // This will be replaced with the actual signature below
+ sessionDetails.signature = getOwnableValidatorMockSignature({
+ threshold: 1,
+ });
+ console.log('prep user op');
+ const userOperation = await smartAccountClient.prepareUserOperation({
+ account: smartAccountClient.account,
+ calls: [
+ {
+ // We use the revokeEnableSignature with permissionId 0 function to create a noop action
+ to: sessionKeyAccount.address,
+ value: BigInt(0),
+ data: encodeFunctionData({
+ abi: smartSessionsAbi,
+ functionName: 'revokeEnableSignature',
+ args: [toHex(toBytes('0x', { size: 32 }))],
+ }),
+ },
+ ],
+ nonce,
+ signature: encodeSmartSessionSignature(sessionDetails),
+ });
+ console.log('user operation prepared');
+ const userOpHashToSign = getUserOperationHash({
+ chainId: chain.id,
+ entryPointAddress: entryPoint07Address,
+ entryPointVersion: '0.7',
+ userOperation,
+ });
+ console.log('user op hash to sign');
+ sessionDetails.signature = await sessionKeyAccount.signMessage({
+ message: { raw: userOpHashToSign },
+ });
+ console.log('user op hash to sign signed');
+ userOperation.signature = encodeSmartSessionSignature(sessionDetails);
+ console.log('user op hash to sign encoded');
+ const userOpHash = await smartAccountClient.sendUserOperation(userOperation as UserOperation); // No idea why the type doesn't match
+ console.log('user op hash');
+ const receipt = await smartAccountClient.waitForUserOperationReceipt({
+ hash: userOpHash,
+ });
+ if (!receipt.success) {
+ throw new Error('Transaction to create smart session failed');
+ }
+ return getPermissionId({ session });
+};
+
+// This is the function that we use on the end user app to create a smart session client that can send transactions to the smart account.
+// The session must have previously been created by the createSmartSession function.
+// The client also includes a signMessage function that can be used to sign messages with the session key.
+export const getSmartSessionClient = async ({
+ accountAddress,
+ chain = GEOGENESIS,
+ rpcUrl = DEFAULT_RPC_URL,
+ apiKey = DEFAULT_API_KEY,
+ sessionPrivateKey,
+ permissionId,
+}: {
+ accountAddress: Hex;
+ chain?: Chain;
+ rpcUrl?: string;
+ apiKey?: string;
+ sessionPrivateKey: Hex;
+ permissionId: Hex;
+}): Promise => {
+ const sessionKeyAccount = privateKeyToAccount(sessionPrivateKey);
+ const smartAccountClient = await getSmartAccountWalletClient({
+ owner: sessionKeyAccount, // Won't really be used (except in testnet), but we need to pass in an account
+ address: accountAddress,
+ chain,
+ rpcUrl,
+ apiKey,
+ });
+
+ const smartSessions = getSmartSessionsValidator({});
+ const publicClient = createPublicClient({
+ transport: http(rpcUrl),
+ chain,
+ });
+
+ return {
+ sendUserOperation: async ({ calls }: { calls: calls }) => {
+ if (!smartAccountClient.account) {
+ throw new Error('Invalid smart account');
+ }
+ if (chain.id === GEO_TESTNET.id) {
+ // We don't have the smart sessions module deployed on testnet yet, so we need to use the legacy smart account wallet client
+ // TODO: remove this once we have the smart sessions module deployed on testnet
+ return smartAccountClient.sendUserOperation({
+ calls: calls as Calls>,
+ account: smartAccountClient.account,
+ });
+ }
+ const account = getAccount({
+ address: smartAccountClient.account.address,
+ type: 'safe',
+ });
+ const sessionDetails = {
+ mode: SmartSessionMode.USE,
+ permissionId,
+ signature: getOwnableValidatorMockSignature({
+ threshold: 1,
+ }),
+ };
+ const nonce = await getAccountNonce(publicClient, {
+ address: smartAccountClient.account.address,
+ entryPointAddress: entryPoint07Address,
+ key: encodeValidatorNonce({
+ account,
+ validator: smartSessions,
+ }),
+ });
+ const userOperation = await smartAccountClient.prepareUserOperation({
+ account: smartAccountClient.account,
+ calls,
+ nonce,
+ signature: encodeSmartSessionSignature(sessionDetails),
+ });
+
+ const userOpHashToSign = getUserOperationHash({
+ chainId: chain.id,
+ entryPointAddress: entryPoint07Address,
+ entryPointVersion: '0.7',
+ userOperation,
+ });
+
+ sessionDetails.signature = await sessionKeyAccount.signMessage({
+ message: { raw: userOpHashToSign },
+ });
+
+ userOperation.signature = encodeSmartSessionSignature(sessionDetails);
+
+ return smartAccountClient.sendUserOperation(userOperation as UserOperation);
+ },
+ signMessage: async ({ message }: { message: SignableMessage }) => {
+ return sessionKeyAccount.signMessage({ message });
+ },
+ waitForUserOperationReceipt: async ({ hash }: { hash: Hex }) => {
+ return smartAccountClient.waitForUserOperationReceipt({ hash });
+ },
+ };
+};
diff --git a/packages/hypergraph/src/connect/types.ts b/packages/hypergraph/src/connect/types.ts
index 3216c2be..8d8b5dd0 100644
--- a/packages/hypergraph/src/connect/types.ts
+++ b/packages/hypergraph/src/connect/types.ts
@@ -58,6 +58,7 @@ export type PublicAppIdentity = {
export type PrivateAppIdentity = IdentityKeys & {
address: string;
addressPrivateKey: string;
+ permissionId: string;
sessionToken: string;
sessionTokenExpires: Date;
accountAddress: string;
diff --git a/packages/hypergraph/src/identity/auth-storage.ts b/packages/hypergraph/src/identity/auth-storage.ts
index bdcb94a1..ffdc7e55 100644
--- a/packages/hypergraph/src/identity/auth-storage.ts
+++ b/packages/hypergraph/src/identity/auth-storage.ts
@@ -11,6 +11,7 @@ export const storeIdentity = (storage: Storage, identity: PrivateAppIdentity) =>
storage.setItem('hypergraph:encryption-private-key', identity.encryptionPrivateKey);
storage.setItem('hypergraph:session-token', identity.sessionToken);
storage.setItem('hypergraph:session-token-expires', identity.sessionTokenExpires.toISOString());
+ storage.setItem('hypergraph:permission-id', identity.permissionId);
};
export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
@@ -23,6 +24,7 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
const encryptionPrivateKey = storage.getItem('hypergraph:encryption-private-key');
const sessionToken = storage.getItem('hypergraph:session-token');
const sessionTokenExpires = storage.getItem('hypergraph:session-token-expires');
+ const permissionId = storage.getItem('hypergraph:permission-id');
if (
!address ||
!addressPrivateKey ||
@@ -32,7 +34,8 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
!encryptionPublicKey ||
!encryptionPrivateKey ||
!sessionToken ||
- !sessionTokenExpires
+ !sessionTokenExpires ||
+ !permissionId
) {
return null;
}
@@ -46,6 +49,7 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
encryptionPrivateKey,
sessionToken,
sessionTokenExpires: new Date(sessionTokenExpires),
+ permissionId,
};
};
@@ -59,4 +63,5 @@ export const wipeIdentity = (storage: Storage) => {
storage.removeItem('hypergraph:encryption-private-key');
storage.removeItem('hypergraph:session-token');
storage.removeItem('hypergraph:session-token-expires');
+ storage.removeItem('hypergraph:permission-id');
};
diff --git a/packages/hypergraph/src/identity/get-verified-identity.ts b/packages/hypergraph/src/identity/get-verified-identity.ts
index 2963334f..31f3e3dd 100644
--- a/packages/hypergraph/src/identity/get-verified-identity.ts
+++ b/packages/hypergraph/src/identity/get-verified-identity.ts
@@ -34,7 +34,7 @@ export const getVerifiedIdentity = async (
resDecoded.keyProof,
))
) {
- throw new Error('Invalid identity');
+ throw new Error('Invalid identity in getVerifiedIdentity');
}
store.send({
diff --git a/packages/hypergraph/src/identity/index.ts b/packages/hypergraph/src/identity/index.ts
index 8793973d..eef44451 100644
--- a/packages/hypergraph/src/identity/index.ts
+++ b/packages/hypergraph/src/identity/index.ts
@@ -1,6 +1,6 @@
export * from './auth-storage.js';
export * from './get-verified-identity.js';
export * from './identity-encryption.js';
-export * from './logout.js';
export * from './prove-ownership.js';
+export * from './logout.js';
export * from './types.js';
diff --git a/packages/hypergraph/src/identity/prove-ownership.ts b/packages/hypergraph/src/identity/prove-ownership.ts
index 3250b7df..246145ee 100644
--- a/packages/hypergraph/src/identity/prove-ownership.ts
+++ b/packages/hypergraph/src/identity/prove-ownership.ts
@@ -1,8 +1,10 @@
-import { type Hex, verifyMessage } from 'viem';
+import { http, type Chain, type Hex, type WalletClient, createPublicClient, verifyMessage } from 'viem';
import { privateKeyToAccount } from 'viem/accounts';
+import type { SmartAccountClient } from 'permissionless';
+import { DEFAULT_RPC_URL, GEOGENESIS } from '../connect/smart-account.js';
import { publicKeyToAddress } from '../utils/index.js';
-import type { IdentityKeys, Signer } from './types.js';
+import type { IdentityKeys } from './types.js';
export const getAccountProofMessage = (accountAddress: string, publicKey: string): string => {
return `This message proves I am the owner of the account ${accountAddress} and the public key ${publicKey}`;
@@ -12,15 +14,37 @@ export const getKeyProofMessage = (accountAddress: string, publicKey: string): s
return `The public key ${publicKey} is owned by the account ${accountAddress}`;
};
+export const accountProofDomain = {
+ name: 'Hypergraph',
+ version: '1',
+};
+
export const proveIdentityOwnership = async (
- signer: Signer,
+ walletClient: WalletClient,
+ smartAccountClient: SmartAccountClient,
accountAddress: string,
keys: IdentityKeys,
): Promise<{ accountProof: string; keyProof: string }> => {
+ if (!smartAccountClient.account) {
+ throw new Error('Smart account client does not have an account');
+ }
+ if (!smartAccountClient.chain) {
+ throw new Error('Smart account client does not have a chain');
+ }
const publicKey = keys.signaturePublicKey;
- const accountProofMessage = getAccountProofMessage(accountAddress, publicKey);
const keyProofMessage = getKeyProofMessage(accountAddress, publicKey);
- const accountProof = await signer.signMessage(accountProofMessage);
+
+ const accountProof = await smartAccountClient.account.signTypedData({
+ message: {
+ message: getAccountProofMessage(accountAddress, publicKey),
+ },
+ types: {
+ Message: [{ name: 'message', type: 'string' }],
+ },
+ domain: accountProofDomain,
+ primaryType: 'Message',
+ });
+ console.log('accountProof', accountProof);
const account = privateKeyToAccount(keys.signaturePrivateKey as Hex);
const keyProof = await account.signMessage({ message: keyProofMessage });
return { accountProof, keyProof };
@@ -31,12 +55,30 @@ export const verifyIdentityOwnership = async (
publicKey: string,
accountProof: string,
keyProof: string,
+ chain: Chain = GEOGENESIS,
+ rpcUrl: string = DEFAULT_RPC_URL,
): Promise => {
- const accountProofMessage = getAccountProofMessage(accountAddress, publicKey);
const keyProofMessage = getKeyProofMessage(accountAddress, publicKey);
- const validAccountProof = await verifyMessage({
+ const publicClient = createPublicClient({
+ chain,
+ transport: http(rpcUrl),
+ });
+
+ console.log('accountProof', accountProof);
+ console.log('accountAddress', accountAddress);
+ console.log('publicKey', publicKey);
+
+ const accountProofMessage = getAccountProofMessage(accountAddress, publicKey);
+ const validAccountProof = await publicClient.verifyTypedData({
address: accountAddress as Hex,
- message: accountProofMessage,
+ message: {
+ message: accountProofMessage,
+ },
+ types: {
+ Message: [{ name: 'message', type: 'string' }],
+ },
+ domain: accountProofDomain,
+ primaryType: 'Message',
signature: accountProof as Hex,
});
if (!validAccountProof) {
diff --git a/packages/hypergraph/src/messages/types.ts b/packages/hypergraph/src/messages/types.ts
index 6b9fb5ca..05f6b0bd 100644
--- a/packages/hypergraph/src/messages/types.ts
+++ b/packages/hypergraph/src/messages/types.ts
@@ -41,6 +41,7 @@ export const KeyBoxWithKeyId = Schema.Struct({
export type KeyBoxWithKeyId = Schema.Schema.Type;
export const IdentityKeyBox = Schema.Struct({
+ signer: Schema.String,
accountAddress: Schema.String,
ciphertext: Schema.String,
nonce: Schema.String,
@@ -60,6 +61,7 @@ export type RequestCreateSpaceEvent = Schema.Schema.Type;
diff --git a/packages/hypergraph/test/identity/connect.test.ts b/packages/hypergraph/test/identity/connect.test.ts
index 328ae152..89ea51e6 100644
--- a/packages/hypergraph/test/identity/connect.test.ts
+++ b/packages/hypergraph/test/identity/connect.test.ts
@@ -85,47 +85,51 @@ describe('identity encryption', () => {
});
});
-describe('identity ownership proofs', () => {
- it('should generate and verify ownership proofs', async () => {
- // generate a random private key to simulate a user wallet
- const account = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
-
- const signer = accountSigner(account);
- const accountAddress = await signer.getAddress();
- const keys = createIdentityKeys();
- const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
-
- const valid = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof, keyProof);
- expect(valid).toBe(true);
- });
- it('should fail to verify ownership proofs with invalid proofs', async () => {
- // generate a random private key to simulate a user wallet
- const account = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
- const signer = accountSigner(account);
- const accountAddress = await signer.getAddress();
- const keys = createIdentityKeys();
- const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
-
- // Create invalid proofs using a different account
- const account2 = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
- const signer2 = accountSigner(account2);
- const accountAddress2 = await signer2.getAddress();
- const keys2 = createIdentityKeys();
- const { accountProof: accountProof2, keyProof: keyProof2 } = await proveIdentityOwnership(
- signer2,
- accountAddress2,
- keys2,
- );
-
- // Check with invalid wallet proof, key proof, and with both invalid proofs
- const valid = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof2, keyProof);
- expect(valid).toBe(false);
-
- const valid2 = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof, keyProof2);
- expect(valid2).toBe(false);
-
- const valid3 = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof2, keyProof2);
-
- expect(valid3).toBe(false);
- });
-});
+// TODO: add tests for identity ownership proofs
+// These are not so easy to test now because we need to interact with a blockchain RPC
+// to verify smart account signatures.
+//
+// describe('identity ownership proofs', () => {
+// it('should generate and verify ownership proofs', async () => {
+// // generate a random private key to simulate a user wallet
+// const account = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
+
+// const signer = accountSigner(account);
+// const accountAddress = await signer.getAddress();
+// const keys = createIdentityKeys();
+// const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
+
+// const valid = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof, keyProof);
+// expect(valid).toBe(true);
+// });
+// it('should fail to verify ownership proofs with invalid proofs', async () => {
+// // generate a random private key to simulate a user wallet
+// const account = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
+// const signer = accountSigner(account);
+// const accountAddress = await signer.getAddress();
+// const keys = createIdentityKeys();
+// const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
+
+// // Create invalid proofs using a different account
+// const account2 = privateKeyToAccount(bytesToHex(randomBytes(32)) as Hex);
+// const signer2 = accountSigner(account2);
+// const accountAddress2 = await signer2.getAddress();
+// const keys2 = createIdentityKeys();
+// const { accountProof: accountProof2, keyProof: keyProof2 } = await proveIdentityOwnership(
+// signer2,
+// accountAddress2,
+// keys2,
+// );
+
+// // Check with invalid wallet proof, key proof, and with both invalid proofs
+// const valid = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof2, keyProof);
+// expect(valid).toBe(false);
+
+// const valid2 = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof, keyProof2);
+// expect(valid2).toBe(false);
+
+// const valid3 = await verifyIdentityOwnership(accountAddress, keys.signaturePublicKey, accountProof2, keyProof2);
+
+// expect(valid3).toBe(false);
+// });
+// });
diff --git a/packages/hypergraph/tsconfig.src.json b/packages/hypergraph/tsconfig.src.json
index 579ef691..db90507a 100644
--- a/packages/hypergraph/tsconfig.src.json
+++ b/packages/hypergraph/tsconfig.src.json
@@ -1,6 +1,6 @@
{
"extends": "../../tsconfig.base.json",
- "include": ["src"],
+ "include": ["src", "src/connect/abis/*.json"],
"compilerOptions": {
"tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo",
"rootDir": "src"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 93154582..e0f52550 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -46,7 +46,7 @@ importers:
version: link:../../packages/hypergraph-react/publish
'@privy-io/react-auth':
specifier: ^2.13.0
- version: 2.13.0(@solana/web3.js@1.98.2(bufferutil@4.0.9)(encoding@0.1.13)(typescript@5.8.3)(utf-8-validate@5.0.10))(@types/react@19.1.3)(bs58@6.0.0)(bufferutil@4.0.9)(immer@9.0.21)(permissionless@0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(use-sync-external-store@1.5.0(react@19.1.0))(utf-8-validate@5.0.10)(zod@3.25.51)
+ version: 2.13.0(@solana/web3.js@1.98.2(bufferutil@4.0.9)(encoding@0.1.13)(typescript@5.8.3)(utf-8-validate@5.0.10))(@types/react@19.1.3)(bs58@6.0.0)(bufferutil@4.0.9)(immer@9.0.21)(permissionless@0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(use-sync-external-store@1.5.0(react@19.1.0))(utf-8-validate@5.0.10)(zod@3.25.51)
'@radix-ui/react-avatar':
specifier: ^1.1.9
version: 1.1.9(@types/react-dom@19.1.3(@types/react@19.1.3))(@types/react@19.1.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -77,6 +77,9 @@ importers:
framer-motion:
specifier: ^12.10.1
version: 12.10.1(@emotion/is-prop-valid@1.2.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+ graphql-request:
+ specifier: ^7.2.0
+ version: 7.2.0(graphql@16.11.0)
lucide-react:
specifier: ^0.508.0
version: 0.508.0(react@19.1.0)
@@ -173,7 +176,7 @@ importers:
version: 7.1.2(graphql@16.11.0)
isomorphic-ws:
specifier: ^5.0.0
- version: 5.0.0(ws@8.18.1(bufferutil@4.0.9)(utf-8-validate@5.0.10))
+ version: 5.0.0(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@5.0.10))
lucide-react:
specifier: ^0.508.0
version: 0.508.0(react@19.1.0)
@@ -420,7 +423,7 @@ importers:
version: 0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8)
'@effect/language-service':
specifier: latest
- version: 0.21.3
+ version: 0.21.6
'@effect/platform':
specifier: latest
version: 0.85.2(effect@3.16.8)
@@ -534,6 +537,9 @@ importers:
'@noble/secp256k1':
specifier: ^2.2.3
version: 2.2.3
+ '@rhinestone/module-sdk':
+ specifier: ^0.2.8
+ version: 0.2.8(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
'@serenity-kit/noble-sodium':
specifier: ^0.2.1
version: 0.2.1
@@ -546,6 +552,9 @@ importers:
effect:
specifier: ^3.16.3
version: 3.16.3
+ permissionless:
+ specifier: ^0.2.47
+ version: 0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
siwe:
specifier: ^3.0.0
version: 3.0.0(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))
@@ -2221,8 +2230,8 @@ packages:
lmdb:
optional: true
- '@effect/language-service@0.21.3':
- resolution: {integrity: sha512-dX/Q1OUzGxpRnhKW0iNXxHWXEMMD+mAKTKpiQMaq2HtuYffVRhBaDM2dxLjYrM4cUoGYO4asqOexNZ/D6GkkZg==}
+ '@effect/language-service@0.21.6':
+ resolution: {integrity: sha512-5gJnx1SRNyx6RtHWWjxoZq/eqrlCLgMI5Uw/2onmxGd62QMQMJqDvNiyFg9rtdtFYbM4M5q3Z86Tk0IkZmCK2A==}
'@effect/platform-node-shared@0.40.4':
resolution: {integrity: sha512-EfnRTSHKs33OTfKN9pF+G2AyxMXm/+4rKrGM8yEw56Ij6QV5dq2g28yi0eOH7BytvilnreVmcbAec7M77EArgg==}
@@ -3864,6 +3873,11 @@ packages:
'@repeaterjs/repeater@3.0.6':
resolution: {integrity: sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==}
+ '@rhinestone/module-sdk@0.2.8':
+ resolution: {integrity: sha512-azCJrJqTEJJgheidxv6vT6tKURXvbQecsRWF4AESjA4UIUlJj3ds3BJMHWCdPjJooDKFgdMQBRveFpzmmveorA==}
+ peerDependencies:
+ viem: ^2.0.0
+
'@rolldown/pluginutils@1.0.0-beta.9':
resolution: {integrity: sha512-e9MeMtVWo186sgvFFJOPGy7/d2j2mZhLJIdVW0C/xDluuOvymEATqz6zKsP0ZmXGzQtqlyjz5sC1sYQUoJG98w==}
@@ -8842,11 +8856,11 @@ packages:
resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
engines: {node: '>= 14.16'}
- permissionless@0.2.44:
- resolution: {integrity: sha512-bWhPY7specEYAyHlox+VCkZZr3Z9wGbKkuG/fm6rYPoGolgxIC51igV7yIz4wmeTV5zUwEA8bp8XAMeexOnWGA==}
+ permissionless@0.2.47:
+ resolution: {integrity: sha512-/Y+2SK+OGrPJuVZ9RcDDBL+U3wGnw3PByc610zvk2G1h//rRez3YZ9CyuMiOf7MpTh53XxmQeKsqKPna0Ilciw==}
peerDependencies:
ox: 0.6.7
- viem: ^2.23.2
+ viem: ^2.28.1
peerDependenciesMeta:
ox:
optional: true
@@ -10129,6 +10143,9 @@ packages:
sockjs@0.3.24:
resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==}
+ solady@0.0.235:
+ resolution: {integrity: sha512-JUEXLDG7ag3HmqUnrDG7ilhafH6R9bFPpwV63O2kH4UbnS2+gRGEOqqy4k01O7tHjo3MWkDD0cpG+UY9pjy/fQ==}
+
solid-js@1.9.5:
resolution: {integrity: sha512-ogI3DaFcyn6UhYhrgcyRAMbu/buBJitYQASZz5WzfQVPP10RD2AbCoRZ517psnezrasyCbWzIxZ6kVqet768xw==}
@@ -13945,7 +13962,7 @@ snapshots:
effect: 3.16.8
uuid: 11.1.0
- '@effect/language-service@0.21.3': {}
+ '@effect/language-service@0.21.6': {}
'@effect/platform-node-shared@0.40.4(@effect/cluster@0.37.2(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.61.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/workflow@0.1.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(@effect/rpc@0.61.4(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/sql@0.38.2(@effect/experimental@0.49.2(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(@effect/platform@0.85.2(effect@3.16.8))(effect@3.16.8))(bufferutil@4.0.9)(effect@3.16.8)(utf-8-validate@5.0.10)':
dependencies:
@@ -14507,7 +14524,7 @@ snapshots:
fractional-indexing-jittered: 1.0.0
graphql-request: 7.2.0(graphql@16.11.0)
image-size: 2.0.2
- permissionless: 0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
+ permissionless: 0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
uuid: 11.1.0
viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
transitivePeerDependencies:
@@ -15616,7 +15633,7 @@ snapshots:
'@privy-io/chains@0.0.1': {}
- '@privy-io/js-sdk-core@0.50.0(bufferutil@4.0.9)(permissionless@0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))':
+ '@privy-io/js-sdk-core@0.50.0(bufferutil@4.0.9)(permissionless@0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))':
dependencies:
'@ethersproject/abstract-signer': 5.7.0
'@ethersproject/bignumber': 5.7.0
@@ -15636,7 +15653,7 @@ snapshots:
set-cookie-parser: 2.7.1
uuid: 9.0.1
optionalDependencies:
- permissionless: 0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
+ permissionless: 0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
transitivePeerDependencies:
- bufferutil
@@ -15667,7 +15684,7 @@ snapshots:
- typescript
- utf-8-validate
- '@privy-io/react-auth@2.13.0(@solana/web3.js@1.98.2(bufferutil@4.0.9)(encoding@0.1.13)(typescript@5.8.3)(utf-8-validate@5.0.10))(@types/react@19.1.3)(bs58@6.0.0)(bufferutil@4.0.9)(immer@9.0.21)(permissionless@0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(use-sync-external-store@1.5.0(react@19.1.0))(utf-8-validate@5.0.10)(zod@3.25.51)':
+ '@privy-io/react-auth@2.13.0(@solana/web3.js@1.98.2(bufferutil@4.0.9)(encoding@0.1.13)(typescript@5.8.3)(utf-8-validate@5.0.10))(@types/react@19.1.3)(bs58@6.0.0)(bufferutil@4.0.9)(immer@9.0.21)(permissionless@0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(use-sync-external-store@1.5.0(react@19.1.0))(utf-8-validate@5.0.10)(zod@3.25.51)':
dependencies:
'@coinbase/wallet-sdk': 4.3.0
'@floating-ui/react': 0.26.28(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -15676,7 +15693,7 @@ snapshots:
'@marsidev/react-turnstile': 0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
'@metamask/eth-sig-util': 6.0.2
'@privy-io/chains': 0.0.1
- '@privy-io/js-sdk-core': 0.50.0(bufferutil@4.0.9)(permissionless@0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
+ '@privy-io/js-sdk-core': 0.50.0(bufferutil@4.0.9)(permissionless@0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)))(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
'@reown/appkit': 1.7.4(@types/react@19.1.3)(bufferutil@4.0.9)(encoding@0.1.13)(react@19.1.0)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
'@scure/base': 1.2.5
'@simplewebauthn/browser': 9.0.1
@@ -15710,7 +15727,7 @@ snapshots:
zustand: 5.0.3(@types/react@19.1.3)(immer@9.0.21)(react@19.1.0)(use-sync-external-store@1.5.0(react@19.1.0))
optionalDependencies:
'@solana/web3.js': 1.98.2(bufferutil@4.0.9)(encoding@0.1.13)(typescript@5.8.3)(utf-8-validate@5.0.10)
- permissionless: 0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
+ permissionless: 0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))
transitivePeerDependencies:
- '@azure/app-configuration'
- '@azure/cosmos'
@@ -16301,6 +16318,12 @@ snapshots:
'@repeaterjs/repeater@3.0.6': {}
+ '@rhinestone/module-sdk@0.2.8(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51))':
+ dependencies:
+ solady: 0.0.235
+ tslib: 2.8.1
+ viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
+
'@rolldown/pluginutils@1.0.0-beta.9': {}
'@rollup/rollup-android-arm-eabi@4.39.0':
@@ -20853,10 +20876,6 @@ snapshots:
dependencies:
ws: 7.5.10(bufferutil@4.0.9)(utf-8-validate@5.0.10)
- isomorphic-ws@5.0.0(ws@8.18.1(bufferutil@4.0.9)(utf-8-validate@5.0.10)):
- dependencies:
- ws: 8.18.1(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-
isomorphic-ws@5.0.0(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)):
dependencies:
ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -22398,7 +22417,7 @@ snapshots:
pathval@2.0.0: {}
- permissionless@0.2.44(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)):
+ permissionless@0.2.47(ox@0.6.7(typescript@5.8.3)(zod@3.25.51))(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)):
dependencies:
viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
optionalDependencies:
@@ -23992,6 +24011,8 @@ snapshots:
uuid: 8.3.2
websocket-driver: 0.7.4
+ solady@0.0.235: {}
+
solid-js@1.9.5:
dependencies:
csstype: 3.1.3