Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task storage #11

Merged
merged 2 commits into from
Feb 8, 2025
Merged

Task storage #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beec493
Fixed Nillion Storage, added actions
Okulon Feb 8, 2025
293617a
Update createBountyAction.ts
Okulon Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nillion/postSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async function main() {
await org.init();

// Create a new collection schema for all nodes in the org
const collectionName = 'Web3 Experience Survey';
const collectionName = 'Bounty Schema';
const schema = JSON.parse(await readFile(new URL('./schemaBounty.json', import.meta.url)));
const newSchema = await org.createSchema(schema, collectionName);
console.log('✅ New Collection Schema created for all nodes:', newSchema);
Expand Down
72 changes: 72 additions & 0 deletions nillion/schemaBounty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,60 @@
},
"required": ["$share"]
},
"owner": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"requiredSkills": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"datePosted": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"dueDate": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"state": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"estimatedTime": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"description": {
"type": "object",
"properties": {
Expand All @@ -33,6 +87,24 @@
},
"required": ["$share"]
},
"longDescription": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"bountyId": {
"type": "object",
"properties": {
"$share": {
"type": "string"
}
},
"required": ["$share"]
},
"reward": {
"type": "object",
"items": {
Expand Down
5 changes: 5 additions & 0 deletions nillion/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
export function storeUserData(data: any): Promise<void>;
export function retrieveUserData(userId: string): Promise<any>;
export function createBounty(data: any): Promise<void>;
export function getBountyList(owner: any): Promise<any>;
export function matchBounties(userId: string): Promise<any>;
export function deleteBounty(id: string): Promise<void>; //Bounties need an id to be deleted, completion criteria

export function testFn(): void;
226 changes: 176 additions & 50 deletions nillion/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,209 @@ import { SecretVaultWrapper } from 'nillion-sv-wrappers';
import { v4 as uuidv4 } from 'uuid';
import { orgConfig } from '../nillionOrgConfig.js';

const SCHEMA_ID = '50375cef-636e-4505-b7ab-39d76b7f124d';
const SCHEMA_ID_USER = '50375cef-636e-4505-b7ab-39d76b7f124d';
const SCHEMA_ID_BOUNTY = 'c81a0c9d-eaff-4fa6-8d89-f19a3e00f306';

const data = [
const BOUNTY_ID = '1163837d-318e-46f2-8c2b-86e0fb00b1e7';

//const RECORD_ID = '1163837d-318e-46f2-8c2b-86e0fb00b1e7';
// Check if this is the main module
const isMainModule = import.meta.url === `file://${process.argv[1]}`;

const dataFormat =
{
_id: "1163837d-318e-46f2-8c2b-86e0fb00b1e4",
_id: "1163837d-318e-46f2-8c2b-86e0fb00b1e7",
name: { $allot: 'Vitalik Buterin' }, // name will be encrypted to a $share
gender: { $allot: "Male" }, // years_in_web3 will be encrypted to a $share
interests: [
{ skills: "c++", hobbies: "duneriding" },
{ skills: "typescript", hobbies: "reading" },
], // responses will be stored in plaintext
},
];
const data2 = [
};

const dataFormat2 =
{
_id: "1163837d-318e-46f2-8c2b-86e0fb00b2e5",
name: { $allot: 'Terry Yamato' }, // name will be encrypted to a $share
gender: { $allot: "Female" }, // years_in_web3 will be encrypted to a $share
_id: "1163837d-318e-46f2-8c2b-86e0fb00b1e7",
name: { $allot: 'Vitalik Buterin' }, // name will be encrypted to a $share
telegramId: { $allot: "1234567890" },
interests: [
{ skills: "c+++++", hobbies: "potato" },
{ skills: "wipescript", hobbies: "cheering" },
{ techstack: "c++", hobbies: "duneriding" },
{ skills: "typescript", hobbies: "reading" },
], // responses will be stored in plaintext
},
];
};

export const storeUserData = async (userData) => {
try {
// Create a secret vault wrapper and initialize the SecretVault collection
const collection = new SecretVaultWrapper(


export const resetSchema = async (SCHEMA_ID) => {
const org = new SecretVaultWrapper(
orgConfig.nodes,
orgConfig.orgCredentials,
SCHEMA_ID
orgConfig.orgCredentials
);
await collection.init();

// Add _id if not present
const dataToStore = {
_id: userData._id || uuidv4(),
...userData
};
await org.init();

// Write data to nodes
const dataWritten = await collection.writeToNodes([dataToStore]);
console.log('Data written to nodes:', JSON.stringify(dataWritten, null, 2));
// Create a new collection schema for all nodes in the org
const collectionName = 'Bounty Schema';
const schema = JSON.parse(await readFile(new URL('../schemaBounty.json', import.meta.url)));
const newSchema = await org.createSchema(schema, collectionName);
SCHEMA_ID = newSchema[0].result.data
return SCHEMA_ID
}

return dataWritten;
} catch (error) {
console.error('Error storing user data:', error.message);
throw error;
}
export const retrieveUserData = async (userId, SCHEMA_ID) => {
const collection = await getCollection(SCHEMA_ID);
console.log('Retrieving user data for:', userId);
const decryptedCollectionData = await collection.readFromNodes({});
console.log(decryptedCollectionData)
// Find the record matching the userId
const userRecord = decryptedCollectionData.find(record => {
return record?._id === userId;
});

if (userRecord) {
console.log('Found user record:', userRecord);
return userRecord;
} else {
console.log('No record found:');
return null;
}
};

export const retrieveUserData = async (userId) => {
try {
// Create and initialize collection
export const getCollection = async (SCHEMA_ID) => {
// Create a secret vault wrapper and initialize the SecretVault collection to use
const collection = new SecretVaultWrapper(
orgConfig.nodes,
orgConfig.orgCredentials,
SCHEMA_ID
orgConfig.nodes,
orgConfig.orgCredentials,
SCHEMA_ID
);
await collection.init();
return collection;
};

// Read all data and find matching user
const decryptedData = await collection.readFromNodes({});
const userData = decryptedData.find(record => record._id === userId);
export const matchBounties = async (userId) => {
console.log("matching bounties");
}
const bountyDataFormat = {
title: { $allot: "title2" },
owner: { $allot: "owner1" },
requiredSkills: { $allot: "requiredSkills" },
datePosted: { $allot: "hostTime" },
dueDate: { $allot: "dueDate" },
state: { $allot: "state" },
estimatedTime: { $allot: "estimatedTime" },
description: { $allot: "description" },
longDescription: { $allot: "longDescription" },
bountyId: { $allot: "00000000-0000-0000-0000-000000000000" },
reward: {
amount: { $allot: "1000000000000000000" },
token: { $allot: "BTC" },
chainId: { $allot: "11155111" },
},

if (!userData) {
throw new Error(`User with ID ${userId} not found`);
}
};
const bountyDataFormat2 = {
title: { $allot: "title2" },
owner: { $allot: "owner2" },
requiredSkills: { $allot: "requiredSkills" },
datePosted: { $allot: "hostTime" },
dueDate: { $allot: "dueDate" },
state: { $allot: "state" },
estimatedTime: { $allot: "estimatedTime" },
description: { $allot: "description" },
longDescription: { $allot: "longDescription" },
reward: {
amount: { $allot: "1000000000000000000" },
token: { $allot: "BTC" },
chainId: { $allot: "11155111" },
},
};
const bountyFormat =
{
_id: BOUNTY_ID,
bounties:[bountyDataFormat, bountyDataFormat2, bountyDataFormat, bountyDataFormat2, bountyDataFormat2, bountyDataFormat2, bountyDataFormat2]
};

export const getUserBounties = async (userId, BountyData) => {
const userBounties = BountyData.filter(bounty => {
return bounty.owner === userId;
});
return userBounties;
}

export const retrieveBountyData = async (userId, SCHEMA_ID) => {
const collection = await getCollection(SCHEMA_ID);
console.log('Retrieving bounty data for:', userId);
const decryptedCollectionData = await collection.readFromNodes({});
// console.log(decryptedCollectionData)s
// Find the bounties matching the userId
const userRecord = userId === "0"
? decryptedCollectionData
: decryptedCollectionData.filter(record => {
return record?._id === userId;
});

return userData;
} catch (error) {
console.error('Error retrieving user data:', error.message);
throw error;

if (userRecord.length >= 1) {
console.log('Found bounties:', userRecord);
return userRecord;
} else {
console.log('No record found:');
return null;
}
};


//{bounties: data.bounties} format for data
export const updateDataBounties = async (data, SCHEMA_ID) => {
const collection = await getCollection(SCHEMA_ID);
const filterById = {_id: BOUNTY_ID};

const readOriginalRecord = await collection.readFromNodes(filterById);

console.log('Original record:', readOriginalRecord);
console.log('Updating id:', BOUNTY_ID);

console.log("dataUpdate", {data});
const updateContent = {_id: data._id, bounties: data.bounties};
console.log("updateContent", updateContent);

const updatedData = await collection.updateDataToNodes(data, {_id: BOUNTY_ID});

console.log('Updated data:', updatedData);
console.log('Update result:', updatedData.map((n) => n.result.data));


const readUpdatedRecord = await collection.readFromNodes(filterById);
console.log('Updated record:', readUpdatedRecord);
}

export const storeUserData = async (data, SCHEMA_ID) => {
// Implementation here
console.log('Storing user data for:', data._id);
const collection = await getCollection(SCHEMA_ID);
// console.log('Collection:', collection);
// Write collection data to nodes encrypting the specified fields ahead of time

const dataWritten = await collection.writeToNodes([data]);
console.log(
'👀 Data written to nodes:',
JSON.stringify(dataWritten, null, 2)
);


// Get the ids of the SecretVault records created
const newIds = [
...new Set(dataWritten.map((item) => item.result.data.created).flat()),
];
console.log('uploaded record ids:', newIds);
};

export const createBounty = async (bounty) => {
const bountiesRetrieved = await retrieveBountyData(bountyFormat._id, SCHEMA_ID_BOUNTY)
console.log("total bounties:", bountiesRetrieved[0].bounties.length);
const newBounties = [...bountiesRetrieved[0].bounties, bounty];
updateDataBounties({bounties: newBounties}, SCHEMA_ID_BOUNTY);
}

export const testFn = () => {
console.log('test complete');
};
Expand Down
Loading