mirror of
https://github.com/onsonr/sonr.git
synced 2025-03-10 21:09:11 +00:00
* chore: remove unused new.Dockerfile * feat: add DID model definitions * fix: Fix EncodePublicKey method in KeyInfo struct * feat: Update `EncodePublicKey` to be the inverse of `DecodePublicKey` * refactor: update AssetInfo protobuf definition * fix: update default assets with correct asset types * fix: Initialize IPFS client and check for mounted directories * feat: Improve IPFS client initialization and mount checking * feat: Add local filesystem check for IPFS and IPNS * fix: Use Unixfs().Get() instead of Cat() for IPFS and IPNS content retrieval * feat: Update GetCID and GetIPNS functions to read data from IPFS node * fix: Ensure IPFS client is initialized before pinning CID * feat: Add AddFile and AddFolder methods * feat: add IPFS file system abstraction * feat: Implement IPFS file, location, and filesystem abstractions * refactor: remove unused functions and types * refactor: remove unused FileSystem interface * feat: add initial wasm entrypoint * feat: add basic vault command operations * docs: add vault module features * test: remove test for MsgUpdateParams * refactor: Replace PrimaryKey with Property struct in zkprop.go * feat: Update the `CreateWitness` and `CreateAccumulator` and `VerifyWitness` and `UpdateAccumulator` to Use the new `Accumulator` and `Witness` types. Then Clean up the code in the file and refactor the marshalling methods * <no value> * feat: add KeyCurve and KeyType to KeyInfo in genesis * feat: add WASM build step to devbox.json * feat: Add zkgate.go file * feat: Uncomment and modify zkgate code to work with Property struct * feat: Merge zkgate.go and zkprop.go logic * feat: implement API endpoints for profile management * refactor: remove unused template file * feat(orm): remove unused ORM models * feat: add persistent SQLite database support in WASM * fix: Update module names in protobuf files * feat: Add method to initialize SQLite database * fix: update go-sqlite3 dependency to version 1.14.23 * feat: introduce database layer * feat: Implement database layer for Vault node * feature/update-dockerfile * feat: Add keyshares table * fix: Reorder the SQL statements in the tables.go file * feat: Update the `createCredentialsTable` method to match the proper Credential struct * feat: Update createProfilesTable and add createPropertiesTable * feat: Add constant SQL queries to queries.go and use prepared statements in db.go * feat: Add createKeysharesTable to internal/db/db.go * feat: Update `createPermissionsTable` to match Permissions struct * feat: Add database enum types * feat: Add DIDNamespace and PermissionScope enums * feat: Add DBConfig and DBOption types * feat: Update the db implementation to use the provided go library * fix: update db implementation to use go-sqlite3 v0.18.2 * fix: Refactor database connection and statement handling * feat: Simplify db.go implementation * feat: Convert constant SQL queries to functions in queries.go and update db.go to use prepared statements * feat: Add models.go file with database table structs * fix: Remove unused statement map and prepare statements diff --git a/internal/db/db.go b/internal/db/db.go index 201d09b..d4d4d4e 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -32,11 +32,6 @@ func Open(config *DBConfig) (*DB, error) { Conn: conn, } - if err := createTables(db); err != nil { - conn.Close() - return nil, fmt.Errorf("failed to create tables: %w", err) - } - return db, nil } @@ -61,114 +56,3 @@ func createTables(db *DB) error { return nil } -// AddAccount adds a new account to the database -func (db *DB) AddAccount(name, address string) error { - return db.Exec(insertAccountQuery(name, address)) -} - -// AddAsset adds a new asset to the database -func (db *DB) AddAsset(name, symbol string, decimals int, chainID int64) error { - return db.Exec(insertAssetQuery(name, symbol, decimals, chainID)) -} - -// AddChain adds a new chain to the database -func (db *DB) AddChain(name, networkID string) error { - return db.Exec(insertChainQuery(name, networkID)) -} - -// AddCredential adds a new credential to the database -func (db *DB) AddCredential( - handle, controller, attestationType, origin string, - credentialID, publicKey []byte, - transport string, - signCount uint32, - userPresent, userVerified, backupEligible, backupState, cloneWarning bool, -) error { - return db.Exec(insertCredentialQuery( - handle, - controller, - attestationType, - origin, - credentialID, - publicKey, - transport, - signCount, - userPresent, - userVerified, - backupEligible, - backupState, - cloneWarning, - )) -} - -// AddProfile adds a new profile to the database -func (db *DB) AddProfile( - id, subject, controller, originURI, publicMetadata, privateMetadata string, -) error { - return db.statements["insertProfile"].Exec( - id, subject, controller, originURI, publicMetadata, privateMetadata, - ) -} - -// AddProperty adds a new property to the database -func (db *DB) AddProperty( - profileID, key, accumulator, propertyKey string, -) error { - return db.statements["insertProperty"].Exec( - profileID, key, accumulator, propertyKey, - ) -} - -// AddPermission adds a new permission to the database -func (db *DB) AddPermission( - serviceID string, - grants []DIDNamespace, - scopes []PermissionScope, -) error { - grantsJSON, err := json.Marshal(grants) - if err != nil { - return fmt.Errorf("failed to marshal grants: %w", err) - } - - scopesJSON, err := json.Marshal(scopes) - if err != nil { - return fmt.Errorf("failed to marshal scopes: %w", err) - } - - return db.statements["insertPermission"].Exec( - serviceID, string(grantsJSON), string(scopesJSON), - ) -} - -// GetPermission retrieves the permission for the given service ID -func (db *DB) GetPermission(serviceID string) ([]DIDNamespace, []PermissionScope, error) { - row := db.statements["getPermission"].QueryRow(serviceID) - - var grantsJSON, scopesJSON string - if err := row.Scan(&grantsJSON, &scopesJSON); err != nil { - return nil, nil, fmt.Errorf("failed to get permission: %w", err) - } - - var grants []DIDNamespace - if err := json.Unmarshal([]byte(grantsJSON), &grants); err != nil { - return nil, nil, fmt.Errorf("failed to unmarshal grants: %w", err) - } - - var scopes []PermissionScope - if err := json.Unmarshal([]byte(scopesJSON), &scopes); err != nil { - return nil, nil, fmt.Errorf("failed to unmarshal scopes: %w", err) - } - - return grants, scopes, nil -} - -// Close closes the database connection and finalizes all prepared statements -func (db *DB) Close() error { - for _, stmt := range db.statements { - stmt.Finalize() - } - return db.Conn.Close() -} diff --git a/internal/db/queries.go b/internal/db/queries.go index 807d701..e69de29 100644 --- a/internal/db/queries.go +++ b/internal/db/queries.go @@ -1,79 +0,0 @@ -package db - -import "fmt" - -// Account queries -func insertAccountQuery(name, address string) string { - return fmt.Sprintf(`INSERT INTO accounts (name, address) VALUES (%s, %s)`, name, address) -} - -// Asset queries -func insertAssetQuery(name, symbol string, decimals int, chainID int64) string { - return fmt.Sprintf( - `INSERT INTO assets (name, symbol, decimals, chain_id) VALUES (%s, %s, %d, %d)`, - name, - symbol, - decimals, - chainID, - ) -} - -// Chain queries -func insertChainQuery(name string, networkID string) string { - return fmt.Sprintf(`INSERT INTO chains (name, network_id) VALUES (%s, %d)`, name, networkID) -} - -// Credential queries -func insertCredentialQuery( - handle, controller, attestationType, origin string, - credentialID, publicKey []byte, - transport string, - signCount uint32, - userPresent, userVerified, backupEligible, backupState, cloneWarning bool, -) string { - return fmt.Sprintf(`INSERT INTO credentials ( - handle, controller, attestation_type, origin, - credential_id, public_key, transport, sign_count, - user_present, user_verified, backup_eligible, - backup_state, clone_warning - ) VALUES (%s, %s, %s, %s, %s, %s, %s, %d, %t, %t, %t, %t, %t)`, - handle, controller, attestationType, origin, - credentialID, publicKey, transport, signCount, - userPresent, userVerified, backupEligible, - backupState, cloneWarning) -} - -// Profile queries -func insertProfileQuery( - id, subject, controller, originURI, publicMetadata, privateMetadata string, -) string { - return fmt.Sprintf(`INSERT INTO profiles ( - id, subject, controller, origin_uri, - public_metadata, private_metadata - ) VALUES (%s, %s, %s, %s, %s, %s)`, - id, subject, controller, originURI, - publicMetadata, privateMetadata) -} - -// Property queries -func insertPropertyQuery(profileID, key, accumulator, propertyKey string) string { - return fmt.Sprintf(`INSERT INTO properties ( - profile_id, key, accumulator, property_key - ) VALUES (%s, %s, %s, %s)`, - profileID, key, accumulator, propertyKey) -} - -// Permission queries -func insertPermissionQuery(serviceID, grants, scopes string) string { - return fmt.Sprintf( - `INSERT INTO permissions (service_id, grants, scopes) VALUES (%s, %s, %s)`, - serviceID, - grants, - scopes, - ) -} - -// GetPermission query -func getPermissionQuery(serviceID string) string { - return fmt.Sprintf(`SELECT grants, scopes FROM permissions WHERE service_id = %s`, serviceID) -} * fix: update Makefile to use sonrd instead of wasmd * feat: Add targets for templ and vault in Makefile and use only make in devbox.json * feat: add SQLite database support * bump: version 0.6.0 → 0.7.0 * refactor: upgrade actions to latest versions
174 lines
3.6 KiB
Go
174 lines
3.6 KiB
Go
package ipfs
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/ipfs/boxo/files"
|
|
"github.com/ipfs/boxo/path"
|
|
"github.com/ipfs/kubo/client/rpc"
|
|
)
|
|
|
|
var (
|
|
initialized bool
|
|
localMount bool
|
|
ipfsClient *rpc.HttpApi
|
|
ipfsFS FileSystem
|
|
)
|
|
|
|
// init initializes the IPFS client and checks for local mounts
|
|
func init() {
|
|
var err error
|
|
ipfsClient, err = rpc.NewLocalApi()
|
|
if err != nil {
|
|
initialized = false
|
|
localMount = false
|
|
return
|
|
}
|
|
|
|
initialized = true
|
|
ipfsFS = &IPFSFileSystem{client: ipfsClient}
|
|
|
|
// Check if /ipfs and /ipns are mounted using os package
|
|
_, errIPFS := os.Stat("/ipfs")
|
|
_, errIPNS := os.Stat("/ipns")
|
|
localMount = !os.IsNotExist(errIPFS) && !os.IsNotExist(errIPNS)
|
|
}
|
|
|
|
// GetFileSystem returns the IPFS FileSystem implementation
|
|
func GetFileSystem() FileSystem {
|
|
return ipfsFS
|
|
}
|
|
|
|
// AddFile adds a single file to IPFS and returns its CID
|
|
func AddFile(ctx context.Context, filePath string) (string, error) {
|
|
if !initialized {
|
|
return "", ErrNotInitialized
|
|
}
|
|
|
|
file, err := os.Open(filePath)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to open file: %w", err)
|
|
}
|
|
defer file.Close()
|
|
|
|
fileNode := files.NewReaderFile(file)
|
|
|
|
cidFile, err := ipfsClient.Unixfs().Add(ctx, fileNode)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to add file to IPFS: %w", err)
|
|
}
|
|
|
|
return cidFile.String(), nil
|
|
}
|
|
|
|
// AddFolder adds a folder and its contents to IPFS and returns the CID of the folder
|
|
func AddFolder(ctx context.Context, folderPath string) (string, error) {
|
|
if !initialized {
|
|
return "", ErrNotInitialized
|
|
}
|
|
|
|
stat, err := os.Stat(folderPath)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get folder info: %w", err)
|
|
}
|
|
|
|
if !stat.IsDir() {
|
|
return "", fmt.Errorf("provided path is not a directory")
|
|
}
|
|
|
|
folderNode, err := files.NewSerialFile(folderPath, false, stat)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to create folder node: %w", err)
|
|
}
|
|
|
|
cidFolder, err := ipfsClient.Unixfs().Add(ctx, folderNode)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to add folder to IPFS: %w", err)
|
|
}
|
|
|
|
return cidFolder.String(), nil
|
|
}
|
|
|
|
func GetCID(ctx context.Context, cid string) ([]byte, error) {
|
|
if !initialized {
|
|
return nil, ErrNotInitialized
|
|
}
|
|
|
|
if localMount {
|
|
// Try to read from local filesystem first
|
|
data, err := os.ReadFile(filepath.Join("/ipfs", cid))
|
|
if err == nil {
|
|
return data, nil
|
|
}
|
|
// If local read fails, fall back to IPFS client
|
|
}
|
|
|
|
// Use IPFS client to fetch the data
|
|
p, err := path.NewPath("/ipfs/" + cid)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
n, err := ipfsClient.Unixfs().Get(ctx, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return readNodeData(n)
|
|
}
|
|
|
|
func GetIPNS(ctx context.Context, name string) ([]byte, error) {
|
|
if !initialized {
|
|
return nil, ErrNotInitialized
|
|
}
|
|
|
|
if localMount {
|
|
// Try to read from local filesystem first
|
|
data, err := os.ReadFile(filepath.Join("/ipns", name))
|
|
if err == nil {
|
|
return data, nil
|
|
}
|
|
// If local read fails, fall back to IPFS client
|
|
}
|
|
|
|
// Use IPFS client to fetch the data
|
|
p, err := path.NewPath("/ipns/" + name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
n, err := ipfsClient.Unixfs().Get(ctx, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return readNodeData(n)
|
|
}
|
|
|
|
func PinCID(ctx context.Context, cid string, name string) error {
|
|
if !initialized {
|
|
return ErrNotInitialized
|
|
}
|
|
|
|
p, err := path.NewPath(cid)
|
|
if err != nil {
|
|
return ErrNotInitialized
|
|
}
|
|
err = ipfsClient.Pin().Add(ctx, p)
|
|
if err != nil {
|
|
return ErrInternal
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func readNodeData(n files.Node) ([]byte, error) {
|
|
switch n := n.(type) {
|
|
case files.File:
|
|
return io.ReadAll(n)
|
|
default:
|
|
return nil, fmt.Errorf("unsupported node type: %T", n)
|
|
}
|
|
}
|