- { walletAddress === comment.from ?
- [
- You commented: , date,
- Edit,
- Delete
- ]:
- [{comment.identity} commented:, date]
- }
-
-
-
- { commentError }
-
-
-
- )
-}
-
-export default Comment
\ No newline at end of file
diff --git a/src/components/comments/CommentEditor.jsx b/src/components/comments/CommentEditor.jsx
deleted file mode 100644
index bda4afa..0000000
--- a/src/components/comments/CommentEditor.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import './comments.css'
-import { useState } from "react";
-import CommentManager from "../../services/CommentManager"
-
-const CommentEditor = ({ commentId, content, toggleEditComment, reloadComments }) => {
- const DEFAULT_BTN_LABEL = 'Comment'
-
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
-
- const [contents, setContents] = useState(content);
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents);
- setBtnEnabled(newContents && newContents.trim().length > 0);
- }
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const cancelEditing = () => {
- setSaving(false);
- setBtnEnabled(false);
- toggleEditComment();
- }
-
- const onFocus = event => {
- const element = event.target;
- element.selectionStart = element.value.length;
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = await window.point.storage.putString({data: contents});
- // Save the post contents storage id in the PoinSocial Smart Contract
- await CommentManager.editComment(commentId, storageId);
- setSaving(false);
- // calling renderCommentsImmediate instead of fetching the comments due to issues with fetching content too soon from Arweave after posting.
- // PD: using a timeout of 1000 apparently works
- reloadComments();
- setContents('');
- toggleEditComment(false);
- } catch (err) {
- setSaving(false);
- console.error('Error: ', err);
- }
- };
-
- return (
- -
{comment.contents}
-
-
-
-
- )
-}
-
-export default CommentEditor
diff --git a/src/components/comments/Comments.jsx b/src/components/comments/Comments.jsx
deleted file mode 100644
index 1a7cbc6..0000000
--- a/src/components/comments/Comments.jsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import "./comments.css";
-import { useState, useEffect } from "react";
-import { useAppContext } from '../../context/AppContext';
-import Comment from './Comment'
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Box from '@material-ui/core/Box';
-import { makeStyles } from '@material-ui/core/styles';
-import CommentManager from "../../services/CommentManager"
-
-const useStyles = makeStyles((theme) => ({
- root: {
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center'
- }
-}));
-
-const Comments = ({ postId, commentsCount, setCommentsCount, reloadPostCounters }) => {
- const DEFAULT_BTN_LABEL = 'Comment'
- const [comments, setComments] = useState([])
- const [contents, setContents] = useState()
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
- const [loading, setLoading] = useState(true);
- const { walletAddress } = useAppContext();
- const classes = useStyles();
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents)
- setBtnEnabled(newContents && newContents.trim().length > 0)
- }
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const getComments = async () => {
- setLoading(true);
- const comments = await fetchComments();
- setComments(comments);
- setLoading(false);
- }
-
- const reloadComments = async() => {
- setLoading(true);
- await new Promise((res, rej) => setTimeout(res, 1000));
- await reloadPostCounters();
- await getComments();
- setLoading(false);
- }
-
- useEffect(() => {
- getComments()
- }, [postId])
-
- const fetchComments = async () => {
- const response = await window.point.contract.call({contract: 'PointSocial', method: 'getAllCommentsForPost', params: [postId]});
-
- const comments = response.data.filter(r => (parseInt(r[3]) !== 0)).map(([id, from, contents, createdAt]) => (
- {id, from, contents, createdAt: createdAt*1000}
- )
- )
-
- const commentsContent = await Promise.all(comments.map(async (comment) => {
- const {data: contents} = await window.point.storage.getString({ id: comment.contents, encoding: 'utf-8' });
- const {data: {identity}} = await window.point.identity.ownerToIdentity({owner: comment.from});
- comment.identity = identity;
- comment.contents = contents;
- return comment;
- }))
-
- return commentsContent;
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = await window.point.storage.putString({data: contents});
- // Save the post contents storage id in the PoinSocial Smart Contract
- await CommentManager.addComment(postId, storageId)
- setSaving(false);
- // calling renderCommentsImmediate instead of fetching the comments due to issues with fetching content too soon from Arweave after posting.
- //renderCommentsImmediate(contents);
- reloadComments();
- setContents('');
- // await getComments();
- } catch (err) {
- setSaving(false);
- console.error('Error: ', err);
- }
- };
-
- const loadingBlock = -
- {loading? loadingBlock:
- [,
-
, - (!loading && comments.length === 0) && 'No comments yet. Be the first!', - comments.filter(c => c.createdAt > 0).map((comment) => ([ -,
]) - )] - } -
- )
-}
-
-export default Comments
diff --git a/src/components/comments/comments.css b/src/components/comments/comments.css
deleted file mode 100644
index 178d5f7..0000000
--- a/src/components/comments/comments.css
+++ /dev/null
@@ -1,79 +0,0 @@
- .commentCorners {
- border-radius: 5px;
- border: 1px solid #B4C1CE;
- padding: 12px 8px;
- width: calc(100% - 100px);
- }
-
- .commentButton{
- border: none;
- margin: 5px;
- padding: 7px;
- border-radius: 5px;
- background-color: #1C385B;
- font-weight: 500;
- cursor: pointer;
- color: white;
- width:80px;
- }
-
- .comment {
- font-size: 14px;
- color: white;
- }
-
- .commentFrom {
- font-weight: 500;
- }
-
- .commentDate {
- margin: 0 5px;
- }
-
- .commentWrapper {
- /* padding: 10px; */
- }
-
- .commentHr {
- margin: 20px 0;
- background:#dce2ea;
- height: 1px;
- border:none;
- }
-
- .commentBottom {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- p {
- white-space: pre-wrap;
- }
-
- .commentText {
- margin: 5px;
- margin-left: 10px;
- font-size: 13px;
- }
-
- .commentEditText {
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkblue;
- font-size: 10px;
- }
-
- .commentDeleteText {
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkred;
- font-size: 10px;
- }
-
- .commentButtons {
- margin: 5px;
- display: block;
- align-items: center;
- justify-content: space-between;
- }
diff --git a/src/components/feed/DiscoverFeed.jsx b/src/components/feed/DiscoverFeed.jsx
new file mode 100644
index 0000000..8944a5e
--- /dev/null
+++ b/src/components/feed/DiscoverFeed.jsx
@@ -0,0 +1,256 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+import orderBy from "lodash/orderBy";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import PostManager from '../../services/PostManager';
+import UserManager from "../../services/UserManager";
+
+const NUM_POSTS_PER_CALL = 10;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const DiscoverFeed = ({ setAlert, setUpperLoading }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [renderedPosts, setRenderedPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["PointSocial"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'discover-feed'});
+ events.unsubscribe("PointSocial", "StateChange");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("PointSocial", "StateChange")).on("StateChange", handleEvents, { type: 'discover-feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId());
+ const lastCurrentId = (posts.length > 0)? posts[posts.length - 1].id : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,0) : [];
+
+ const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
+ .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked, flagged]) => (
+ {
+ id,
+ from,
+ contents,
+ image,
+ createdAt: createdAt*1000,
+ likesCount: parseInt(likesCount, 10),
+ dislikesCount: parseInt(dislikesCount, 10),
+ commentsCount: parseInt(commentsCount, 10),
+ liked,
+ disliked,
+ flagged
+ }
+ )
+ );
+
+ return await Promise.all(newPosts.map(async post => {
+ try {
+ post.weight = (await UserManager.isFollowing(walletAddress, post.from))? 1: 0;
+ }
+ catch(error) {
+ console.warn(error.message);
+ }
+ return post;
+ }));
+ //return newPosts;
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ //result.sort(compareByTimestamp);
+ console.log("POSTS:");
+ console.log(result);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+ , - (!loading && comments.length === 0) && 'No comments yet. Be the first!', - comments.filter(c => c.createdAt > 0).map((comment) => ([ -
]) - )] - } -
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ orderBy(posts.filter(post => post.createdAt > 0), ['weight', 'likesCount', 'commentsCount', 'dislikesCount', 'createdAt'], ['desc', 'desc', 'desc', 'asc', 'desc'])
+ .map((post) => (
+
+
+
+ );
+
+}
+export default DiscoverFeed
diff --git a/src/components/feed/Feed.jsx b/src/components/feed/Feed.jsx
index 6079fec..9d4c47a 100644
--- a/src/components/feed/Feed.jsx
+++ b/src/components/feed/Feed.jsx
@@ -158,7 +158,7 @@ const Feed = ({ account, setAlert, setUpperLoading, canPost=false }) => {
PostManager.getPaginatedPosts(onlyNew?0:posts.length,NUM_POSTS_PER_CALL));
const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
- .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked]) => (
+ .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked, flagged]) => (
{
id,
from,
@@ -170,19 +170,12 @@ const Feed = ({ account, setAlert, setUpperLoading, canPost=false }) => {
commentsCount: parseInt(commentsCount, 10),
liked,
disliked,
+ flagged
}
)
);
- return await Promise.all(newPosts.map(async post => {
- try {
- post.isFlagged = await PostManager.isFlaggedPost(post.id);
- }
- catch(error) {
- console.warn(error.message);
- }
- return post;
- }));
+ return newPosts;
} catch(error) {
console.log(error.message);
diff --git a/src/components/feed/FollowFeed.jsx b/src/components/feed/FollowFeed.jsx
new file mode 100644
index 0000000..94d94b2
--- /dev/null
+++ b/src/components/feed/FollowFeed.jsx
@@ -0,0 +1,260 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import PostManager from '../../services/PostManager';
+import UserManager from "../../services/UserManager";
+
+const NUM_POSTS_PER_CALL = 5;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const FollowFeed = ({ setAlert, setUpperLoading}) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["PointSocial"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'feed'});
+ events.unsubscribe("PointSocial", "StateChange");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("PointSocial", "StateChange")).on("StateChange", handleEvents, { type: 'feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Feed) {
+ switch(event.action) {
+ case EventConstants.Action.Create:
+ if (await UserManager.isFollowing(walletAddress, event.from)) {
+ setReload(true);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId());
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,1) : [];
+
+ const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
+ .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked,flagged]) => (
+ {
+ id,
+ from,
+ contents,
+ image,
+ createdAt: createdAt*1000,
+ likesCount: parseInt(likesCount, 10),
+ dislikesCount: parseInt(dislikesCount, 10),
+ commentsCount: parseInt(commentsCount, 10),
+ liked,
+ disliked,
+ flagged
+ }
+ )
+ );
+
+ return newPosts;
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {`No posts yet.`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ posts.filter(post => post.createdAt > 0).map((post) => (
+
+
+
+ );
+
+}
+export default FollowFeed
diff --git a/src/components/feed/FreshFeed.jsx b/src/components/feed/FreshFeed.jsx
new file mode 100644
index 0000000..9a9f341
--- /dev/null
+++ b/src/components/feed/FreshFeed.jsx
@@ -0,0 +1,264 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import PostManager from '../../services/PostManager';
+
+const NUM_POSTS_PER_CALL = 5;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const FreshFeed = ({ setAlert, setUpperLoading, canPost=false }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["PointSocial"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'feed'});
+ events.unsubscribe("PointSocial", "StateChange");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("PointSocial", "StateChange")).on("StateChange", handleEvents, { type: 'feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Feed) {
+ switch(event.action) {
+ case EventConstants.Action.Create:
+ if (event.from.toString().toLowerCase() === walletAddress.toLowerCase()) {
+ // Autoload own posts
+ await reloadPosts();
+ }
+ else {
+ setReload(true);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId());
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,2) : [];
+ console.log(posts);
+
+ const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
+ .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked, flagged]) => (
+ {
+ id,
+ from,
+ contents,
+ image,
+ createdAt: createdAt*1000,
+ likesCount: parseInt(likesCount, 10),
+ dislikesCount: parseInt(dislikesCount, 10),
+ commentsCount: parseInt(commentsCount, 10),
+ liked,
+ disliked,
+ flagged
+ }
+ )
+ );
+
+ return newPosts;
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {'No posts yet! Start following somebody!'}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ posts.filter(post => post.createdAt > 0).map((post) => (
+
+
+
+ );
+
+}
+export default FreshFeed
diff --git a/src/components/feed/TopFeed.jsx b/src/components/feed/TopFeed.jsx
new file mode 100644
index 0000000..115706f
--- /dev/null
+++ b/src/components/feed/TopFeed.jsx
@@ -0,0 +1,250 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+import orderBy from "lodash/orderBy";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import PostManager from '../../services/PostManager';
+
+const NUM_POSTS_PER_CALL = 20;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const TopFeed = ({ setAlert, setUpperLoading, canPost=false }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["PointSocial"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'feed'});
+ events.unsubscribe("PointSocial", "StateChange");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("PointSocial", "StateChange")).on("StateChange", handleEvents, { type: 'feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId());
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,3) : [];
+
+ const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
+ .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked, flagged]) => (
+ {
+ id,
+ from,
+ contents,
+ image,
+ createdAt: createdAt*1000,
+ likesCount: parseInt(likesCount, 10),
+ dislikesCount: parseInt(dislikesCount, 10),
+ commentsCount: parseInt(commentsCount, 10),
+ liked,
+ disliked,
+ flagged
+ }
+ )
+ );
+
+ return newPosts;
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {`No posts yet.${ canPost? " Be the first!" : "" }`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ orderBy(posts.filter(post => post.createdAt > 0), ['likesCount', 'commentsCount', 'dislikesCount'], ['desc', 'desc', 'asc'])
+ .map((post) => (
+
+
+
+ );
+
+}
+export default TopFeed
diff --git a/src/components/feed/feed.css b/src/components/feed/feed.css
index a1f16bf..ce572b6 100644
--- a/src/components/feed/feed.css
+++ b/src/components/feed/feed.css
@@ -14,11 +14,10 @@
font-weight: 400;
}
.no-post-to-show{
- background:url(http://neckcode.com/feed-show-ico.svg) no-repeat white;
display: block;
-text-align: center;
-padding: 30px;
-margin: 10px 0;
-border-radius: 6px;
-font-size:13px;
+ text-align: center;
+ padding: 30px;
+ margin: 10px 0;
+ border-radius: 6px;
+ font-size:13px;
}
diff --git a/src/components/generic/RichTextField.jsx b/src/components/generic/RichTextField.jsx
index 2da268e..6780efe 100644
--- a/src/components/generic/RichTextField.jsx
+++ b/src/components/generic/RichTextField.jsx
@@ -75,7 +75,19 @@ const RichTextField = forwardRef(({value, minLength, maxLength, placeholder, dis
autoFocus
disabled={processing}
/>
-
+ {`No posts yet.${ canPost? " Be the first!" : "" }`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+ {post?.contents}
- { loading? postLoading :
-
-
- { postError }
-
-
-
- );
-}
diff --git a/src/components/post/PostCard.jsx b/src/components/post/PostCard.jsx
index 5585776..581b1c2 100644
--- a/src/components/post/PostCard.jsx
+++ b/src/components/post/PostCard.jsx
@@ -23,6 +23,7 @@ import SaveOutlinedIcon from '@material-ui/icons/SaveOutlined';
import DeleteOutlineOutlinedIcon from '@material-ui/icons/DeleteOutlineOutlined';
import FlagOutlinedIcon from '@material-ui/icons/FlagOutlined';
import VisibilityOutlinedIcon from '@material-ui/icons/VisibilityOutlined';
+import PanoramaOutlinedIcon from '@material-ui/icons/PanoramaOutlined';
import AccountTreeOutlinedIcon from '@material-ui/icons/AccountTreeOutlined';
import LanguageOutlinedIcon from '@material-ui/icons/LanguageOutlined';
@@ -841,11 +842,11 @@ const PostCard = ({
aria-describedby="alert-dialog-description"
>
-
- }
-
-
-
-
- 
-
- {walletAddress === post.from ? You posted : {post.identity}}
-
-
- {format(post.createdAt)}
-
-
- {
- editPost?
- :
- [postedContent, postedMedia]
- }
-
-
-
-
- 
- {post.likesCount} people like it
-
-
- {commentsCount} comments
- { (parseInt(commentsCount) === 0) && postEdit }
- { (parseInt(commentsCount) === 0) && postDelete }
-
-
- {showComments && }
-
-
-
+
{loading && {
diff --git a/src/components/post/PostEditor.jsx b/src/components/post/PostEditor.jsx
deleted file mode 100644
index 7ba4834..0000000
--- a/src/components/post/PostEditor.jsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import "./postEditor.css";
-import { AttachFileTwoTone } from "@material-ui/icons";
-import { useRef, useState } from "react";
-import PostManager from "../../services/PostManager"
-
-export default function PostEditor({ post, toggleEditPost, reloadPost }) {
- const DEFAULT_BTN_LABEL = 'Save'
- const EMPTY_MEDIA = '0x0000000000000000000000000000000000000000000000000000000000000000';
- const EMPTY_CONTENT = '0x0000000000000000000000000000000000000000000000000000000000000000';
- const [contents, setContents] = useState(post.contents);
- const [media, setMedia] = useState(post.image);
-
- const [selectedFile, setSelectedFile] = useState();
- const [preview, setPreview] = useState(`/_storage/${media}`)
-
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
-
- const [loadImgError, setLoadImgError] = useState(false);
- const [loadVideoError, setLoadVideoError] = useState(false);
-
-
- const fileInputRef = useRef()
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents);
- setBtnEnabled(newContents && newContents.trim().length > 0);
- }
-
- const onFileChange = event => {
- let fileToUpload = event.target.files[0];
- if(fileToUpload.type.startsWith('image') || fileToUpload.type.startsWith('video') ) {
- if (fileToUpload.size > 100 * 1024 * 1024){
- alert('Point Social only supports image and video until 100 MB. Please change to a samller image or video file!')
- }
- setSelectedFile(event.target.files[0]);
- setPreview(URL.createObjectURL(event.target.files[0]));
- setBtnEnabled(true);
- } else {
- alert('Point Social only supports image and video uploads for now. Please change to an image or video file!')
- }
- };
-
- const onFocus = event => {
- const element = event.target;
- element.selectionStart = element.value.length;
- }
-
- const onImgErrorHandler = (e) => {
- setLoadImgError(true);
- }
-
- const onVideoErrorHandler = (e) => {
- setLoadVideoError(true);
- }
-
- let mediaTag;
- if (!loadImgError) {
- mediaTag = 
;
- } else {
- if(!loadVideoError) {
- mediaTag = ;
- } else {
- mediaTag = '';
- }
- }
-
- const postedMedia = (media !== EMPTY_MEDIA) && mediaTag
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const cancelEditing = () => {
- setSaving(false);
- setBtnEnabled(false);
- toggleEditPost();
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = (contents && contents.trim().length > 0)? await window.point.storage.putString({data: contents}) : { data: EMPTY_CONTENT };
- let imageId = media;
- if(selectedFile){
- const formData = new FormData()
- formData.append("postfile", selectedFile);
- const res = await window.point.storage.postFile(formData);
- imageId = res.data;
- }
- // Save the post contents storage id in the PoinSocial Smart Contract
- await PostManager.editPost(post.id, storageId, imageId);
- setSaving(false);
- setContents('');
- setSelectedFile();
- setBtnEnabled(false);
- try { fileInputRef.current.value = null } catch (error) {}
- reloadPost(contents, imageId);
- } catch (e) {
- console.error('Error sharing post: ', e.message);
- setSaving(false);
- setContents('');
- setSelectedFile();
- setBtnEnabled(false);
- try { fileInputRef.current.value = null } catch (error) {}
- }
- };
-
- return (
-
@@ -451,7 +586,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
}/>
- { (walletAddress === address) &&
+ { (walletAddress.toLowerCase() === address.toLowerCase()) &&
{
ref={actionsAnchor}
onClick={handleActionsOpen}
className={styles.actionButton}
- color="secondary"
- disabled={processing}>
+ color="secondary">
}
}/>
+ }/>
+ }/>
diff --git a/src/components/share/Share.jsx b/src/components/share/Share.jsx
deleted file mode 100644
index 2fb45df..0000000
--- a/src/components/share/Share.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import "./share.css";
-import { AttachFileTwoTone } from "@material-ui/icons";
-import { useRef, useState } from "react";
-import profileImg from '../../assets/profile-pic.jpg';
-import { useAppContext } from '../../context/AppContext';
-
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
-import PostManager from "../../services/PostManager"
-
-function Alert(props) {
- return
+
+ window.open(`/profile/${address}`, "_blank") }}/>
+
+
+
+
-
- { postedMedia }
-
-
- );
-}
diff --git a/src/components/post/post.css b/src/components/post/post.css
deleted file mode 100644
index 3a58d3b..0000000
--- a/src/components/post/post.css
+++ /dev/null
@@ -1,119 +0,0 @@
- .post {
- width: 100%;
- border-radius: 6px;
- -webkit-box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- margin: 12px 0;
- }
-
- .postWrapper {
- padding: 15px;
- }
-
- .postImage {
- padding: 0;
- display: block;
- margin: 0 auto;
- max-height: 100%;
- max-width: 100%;
- }
-
- .postText {
- display: flex;
- margin-top: 10px;
- margin-bottom: 10px;
- }
-
- .postTop {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .postTopLeft {
- display: flex;
- align-items: center;
- }
-
- .postProfileImg {
- width: 32px;
- height: 32px;
- border-radius: 50%;
- object-fit: cover;
- }
-
- .postUsername {
- font-size: 15px;
- font-weight: 500;
- margin: 0 10px;
- }
-
- .postDate{
- font-size: 12px;
- }
-
- .postCenter{
- margin: 20px 0;
- }
-
- .postImg{
- margin-top: 20px;
- width: 100%;
- max-height: 500px;
- object-fit: contain;
- }
-
- .postBottom{
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .postBottomLeft{
- display: flex;
- align-items: center;
- }
-
- .likeIcon{
- width: 24px;
- height: 24px;
- margin-right: 5px;
- cursor: pointer;
- }
-
- .postLikeCounter{
- font-size: 15px;
- }
-
- .postCommentText{
- cursor: pointer;
- border-bottom: 1px dashed gray;
- font-size: 15px;
- }
-
- .postEditText{
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkblue;
- font-size: 10px;
- }
-
- .postDeleteText{
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkred;
- font-size: 10px;
- }
-
- .comments {
- margin-top: 10px;
- }
- .postDate{
- color:rgb(148, 159, 173);
- }
- .posted-id{
- color:#1c385b;
- }
- p {
- white-space: pre-wrap;
- }
\ No newline at end of file
diff --git a/src/components/post/postEditor.css b/src/components/post/postEditor.css
deleted file mode 100644
index 158bde9..0000000
--- a/src/components/post/postEditor.css
+++ /dev/null
@@ -1,65 +0,0 @@
-.postEditor {
- width: 100%;
- border-radius: 6px;
- -webkit-box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
-}
-
-.editHr {
- margin: 20px 0;
- background:#dce2ea;
- height: 1px;
- border:none;
-}
-
-.editInput {
- border: none;
- width: 100%;
-}
-
-.editInput:focus {
- outline: none;
-}
-
-.editBottom {
- margin-top: 5px;
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- width: 100%;
-}
-
-.editOptions{
- display: flex;
- /* margin-left: 20px; */
-}
-
-.editFilePicker {
- display: flex;
- align-items: center;
- margin-right: 15px;
- cursor: pointer;
-}
-
-.editIcon {
- font-size: 18px;
- margin-right: 3px;
-}
-
-.editOptionText{
- font-size: 14px;
- font-weight: 500;
-}
-
-.editButton {
- border: none;
- border-radius: 5px;
- margin-left: 5px;
- background-color: #1C385B;
- font-weight: 500;
- cursor: pointer;
- color: white;
- width:80px;
-}
-
-
diff --git a/src/components/profile/ProfileCard.jsx b/src/components/profile/ProfileCard.jsx
index f3d5892..20e4fc0 100644
--- a/src/components/profile/ProfileCard.jsx
+++ b/src/components/profile/ProfileCard.jsx
@@ -6,7 +6,6 @@ import { useTheme } from '@material-ui/core/styles';
import { makeStyles } from '@material-ui/core/styles';
import useMediaQuery from '@material-ui/core/useMediaQuery';
-import Avatar from '@material-ui/core/Avatar';
import Backdrop from '@material-ui/core/Backdrop';
import Box from '@material-ui/core/Box';
import Card from '@material-ui/core/Card';
@@ -36,15 +35,24 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
import Close from '@material-ui/icons/Close';
import RoomOutlinedIcon from '@material-ui/icons/RoomOutlined';
import PanoramaOutlinedIcon from '@material-ui/icons/PanoramaOutlined';
+import PersonAddIcon from '@material-ui/icons/PersonAdd';
+import BlockOutlinedIcon from '@material-ui/icons/BlockOutlined';
+import PersonAddDisabledIcon from '@material-ui/icons/PersonAddDisabled';
+import CheckOutlinedIcon from '@material-ui/icons/CheckOutlined';
+import LockOpenOutlinedIcon from '@material-ui/icons/LockOpenOutlined';
+import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
import TabPanel from '../tabs/TabPanel';
import Feed from '../feed/Feed';
import UserAvatar from '../avatar/UserAvatar';
+import UserList from '../user/UserList';
import point from "../../services/PointSDK";
import UserManager from "../../services/UserManager";
import { Link } from "wouter";
+import EventConstants from "../../events";
+
const MAX_FILE_SIZE = 100 * 1024 * 1024;
const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -201,6 +209,13 @@ const useStyles = makeStyles((theme) => ({
justify: "center",
alignItems:"center"
},
+ followBox: {
+ display: 'flex',
+ justifyContent: "end",
+ justify: "end",
+ alignItems:"end",
+ margin: theme.spacing(2)
+ }
}));
const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
@@ -213,12 +228,22 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const [name, setName] = useState(EMPTY);
const [location, setLocation] = useState(EMPTY);
const [about, setAbout] = useState(EMPTY);
+
const [followers, setFollowers] = useState(0);
const [following, setFollowing] = useState(0);
+ const [followersList, setFollowersList] = useState([]);
+ const [followingList, setFollowingList] = useState([]);
+
const [avatar, setAvatar] = useState(EMPTY);
const [banner, setBanner] = useState(EMPTY);
const [profile, setProfile] = useState();
+ const [isOwner, setIsOwner] = useState(false);
+ const [isFollowed, setFollowed] = useState(false);
+ const [isFollower, setFollower] = useState(false);
+ const [isBlocked, setIsBlocked] = useState(false);
+ const [imBlocked, setImBlocked] = useState(false);
+
const [loading, setLoading] = useState(true);
const [actionsOpen, setActionsOpen] = useState(false);
const [edit, setEdit] = useState(false);
@@ -231,7 +256,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const displayAboutRef = useRef();
const actionsAnchor = useRef();
- const { walletAddress, processing, setProcessing, setUserProfile } = useAppContext();
+ const { walletAddress, setUserProfile, events } = useAppContext();
useEffect(() => {
loadProfile();
@@ -241,6 +266,41 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
renderProfile(profile);
}, [profile]);
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["PointSocial"]["FollowEvent"].removeListener("FollowEvent", handleEvents, { type: 'profile', id: address});
+ events.unsubscribe("PointSocial", "FollowEvent");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("PointSocial", "FollowEvent")).on("FollowEvent", handleEvents, { type: 'profile', id: address});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event && (((event.from.toLowerCase() === walletAddress.toLowerCase()) &&
+ (event.to.toLowerCase() === address.toLowerCase())) ||
+ ((event.to.toLowerCase() === walletAddress.toLowerCase()) &&
+ (event.from.toLowerCase() === address.toLowerCase())))) {
+ switch(event.action) {
+ case EventConstants.FollowAction.Follow:
+ case EventConstants.FollowAction.UnFollow:
+ case EventConstants.FollowAction.Block:
+ case EventConstants.FollowAction.UnBlock:
+ await loadFollowStatus();
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
const renderProfile = async (profile) => {
if (profile) {
try {
@@ -250,11 +310,10 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const location = (profile.displayLocation === EMPTY)? "Point Network" : await point.getString(profile.displayLocation, { encoding: 'utf-8' });
setLocation(location);
const about = (profile.displayLocation === EMPTY)? "Hey I'm using Point Social!" : await point.getString(profile.displayAbout, { encoding: 'utf-8' });
- setAbout(about);
- setFollowers(profile.followersCount || 0);
- setFollowing(profile.followingCount || 0);
+ setAbout(about);
setAvatar(`/_storage/${profile.avatar}`);
setBanner((profile.banner=== EMPTY)?defaultBanner:`/_storage/${profile.banner}`);
+ await loadFollowStatus();
setLoading(false);
}
catch(error) {
@@ -263,6 +322,36 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
}
}
+ const loadFollowStatus = async () => {
+ setFollowers(await UserManager.followersCount(address) || 0);
+ setFollowing(await UserManager.followingCount(address) || 0);
+
+ try {
+ setFollowersList(await UserManager.followersList(address));
+ }
+ catch(error) {
+ setFollowersList([]);
+ }
+
+ try {
+ setFollowingList(await UserManager.followingList(address));
+ }
+ catch(error) {
+ setFollowingList([]);
+ }
+
+ const owner = address.toLowerCase() === walletAddress.toLowerCase();
+ if (owner) {
+ setIsOwner(true);
+ }
+ else {
+ setFollowed(await UserManager.isFollowing(walletAddress, address));
+ setFollower(await UserManager.isFollowing(address, walletAddress));
+ setIsBlocked(await UserManager.isBlocked(walletAddress, address));
+ setImBlocked(await UserManager.isBlocked(address, walletAddress));
+ }
+ }
+
const loadProfile = async () => {
try {
const profile = await UserManager.getProfile(address);
@@ -276,7 +365,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
followersCount: 0,
followingCount: 0,
});
- }
+ }
}
catch(error) {
setAlert(error.message);
@@ -304,6 +393,10 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
case 'cancel':
cancelEdit();
break;
+ case 'block':
+ case 'unblock':
+ toggleBlock();
+ break;
}
setActionsOpen(false);
@@ -352,7 +445,6 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
};
const saveEdit = async () => {
- setProcessing(true);
setLoading(true);
const newProfile = { ...profile };
@@ -407,7 +499,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
followingCount: 0,
};
- const result = await UserManager.setProfile(
+ await UserManager.setProfile(
updatedProfile.displayName,
updatedProfile.displayLocation,
updatedProfile.displayAbout,
@@ -432,10 +524,53 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
}
finally {
setLoading(false);
- setProcessing(false);
}
};
+ const toggleFollow = async () => {
+ try {
+ setLoading(true);
+ if (isFollowed) {
+ await UserManager.unfollowUser(address);
+ setFollowed(false);
+ setAlert(`You're no longer following to ${name}|success`);
+ }
+ else {
+ await UserManager.followUser(address);
+ setFollowed(true);
+ setAlert(`Now you're following ${name}|success`);
+ }
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const toggleBlock = async () => {
+ try {
+ setLoading(true);
+ if (isBlocked) {
+ await UserManager.unblockUser(address);
+ setIsBlocked(false);
+ setAlert(`You unblocked all activity from ${name}|success`);
+ }
+ else {
+ await UserManager.blockUser(address);
+ setIsBlocked(true);
+ setAlert(`You blocked all activity from ${name}|success`);
+ }
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
const bannerContent =
-
-
- Error sharing post: {shareError && shareError.message}. Did you deploy the contract sucessfully?
-
-
-
- );
-}
diff --git a/src/components/share/share.css b/src/components/share/share.css
deleted file mode 100644
index 55035ed..0000000
--- a/src/components/share/share.css
+++ /dev/null
@@ -1,97 +0,0 @@
- .share {
- width: 100%;
- border-radius: 6px;
- -webkit-box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- }
-
- .shareWrapper {
- padding: 15px;
- }
-
- .shareTop {
- display: flex;
- align-items: center;
- }
-
- .shareProfileImg {
- width: 50px;
- height: 50px;
- border-radius: 50%;
- object-fit: cover;
- margin-right: 10px;
- border:1px solid #dee0e6;
- }
-
- .shareInput {
- border: none;
- width: 80%;
- }
-
- .shareInput:focus {
- outline: none;
- }
-
- .shareHr {
- margin: 20px 0;
- background:#dce2ea;
- height: 1px;
- border:none;
- }
-
- .shareBottom {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .shareOptions{
- display: flex;
- /* margin-left: 20px; */
- }
-
- .shareOption{
- display: flex;
- align-items: center;
- margin-right: 15px;
- cursor: pointer;
- }
-
- .shareIcon{
- font-size: 18px;
- margin-right: 3px;
- }
-
- .shareOptionText{
- font-size: 14px;
- font-weight: 500;
- }
-
- .shareButton{
- border: none;
- padding: 7px;
- border-radius: 5px;
- background-color: #1C385B;
- font-weight: 500;
- cursor: pointer;
- color: white;
- width:80px;
- }
-
- .shareImgContainer{
- padding: 0 20px 10px 20px;
- position: relative;
- }
-
- .shareImg{
- width: 100%;
- object-fit: cover;
- }
-
- .shareCancelImg{
- position: absolute;
- top: 0;
- right: 20px;
- cursor: pointer;
- opacity: 0.7;
- }
\ No newline at end of file
diff --git a/src/components/topbar/Topbar.jsx b/src/components/topbar/Topbar.jsx
deleted file mode 100644
index 6a1996d..0000000
--- a/src/components/topbar/Topbar.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import "./topbar.css";
-import { useAppContext } from '../../context/AppContext';
-import { Link } from "wouter";
-import pointlogo from '../../assets/pointlogowhite.png';
-
-import Avatar from '@material-ui/core/Avatar';
-
-export default function Topbar() {
- const { walletAddress } = useAppContext();
- const { identity } = useAppContext();
- const { profile } = useAppContext();
-
- return (
-
- );
-}
diff --git a/src/components/topbar/topbar.css b/src/components/topbar/topbar.css
deleted file mode 100644
index a4a5435..0000000
--- a/src/components/topbar/topbar.css
+++ /dev/null
@@ -1,100 +0,0 @@
-@import url('https://fonts.googleapis.com/css2?family=Bungee+Inline&display=swap');
-
-.topbarContainer {
- height: 50px;
- width: 100%;
- background-color: #1c385b;
- display: flex;
- align-items: center;
- position: sticky;
- top: 0;
- z-index: 999;
- color:white;
- }
-
- .topbarLeft {
- margin-left: 10px;
- flex: 3;
- }
-
- .logo {
- font-size: 24px;
- margin-left: 5px;
- font-weight: bold;
- color: white;
- cursor: pointer;
- }
-
- .topbarCenter {
- flex: 5;
- }
-
- .searchbar {
- width: 100%;
- height: 30px;
- background-color: white;
- border-radius: 30px;
- display: flex;
- align-items: center;
- }
-
- .searchIcon {
- font-size: 20px !important;
- margin-left: 10px;
- }
-
- .searchInput {
- border: none;
- width: 70%;
- }
-
- .searchInput:focus {
- outline: none;
- }
-
- .topbarRight {
- flex: 4;
- display: flex;
- align-items: center;
- justify-content: space-around;
- color: white;
- }
-
- .topbarLink {
- margin-right: 10px;
- font-size: 14px;
- cursor: pointer;
- }
-
- .topbarIcons {
- display: flex;
- }
-
- .topbarIconItem {
- margin-right: 15px;
- cursor: pointer;
- position: relative;
- }
-
- .topbarIconBadge {
- width: 15px;
- height: 15px;
- background-color: red;
- border-radius: 50%;
- color: white;
- position: absolute;
- top: -5px;
- right: -5px;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 12px;
- }
-
- .topbarImg {
- width: 40px;
- height: 40px;
- border-radius: 50%;
- object-fit: cover;
- cursor: pointer;
- }
diff --git a/src/components/user/UserItem.jsx b/src/components/user/UserItem.jsx
new file mode 100644
index 0000000..c1fcbb4
--- /dev/null
+++ b/src/components/user/UserItem.jsx
@@ -0,0 +1,69 @@
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import { makeStyles } from '@material-ui/core/styles';
+
+import ListItem from '@material-ui/core/ListItem';
+import Divider from '@material-ui/core/Divider';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListItemAvatar from '@material-ui/core/ListItemAvatar';
+import UserAvatar from "../avatar/UserAvatar";
+
+import point from "../../services/PointSDK";
+import UserManager from "../../services/UserManager";
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ cursor:'pointer',
+ },
+}));
+
+const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
+
+const UserItem = ({address}) => {
+
+ const styles = useStyles();
+ const [loading, setLoading] = useState(false);
+ const [name, setName] = useState('');
+ const [about, setAbout] = useState('');
+
+ const { walletAddress, profile, identity } = useAppContext();
+
+ useEffect(() => {
+ loadUser();
+ }, []);
+
+ const loadUser = async () => {
+ setLoading(true);
+ if (address.toString().toLowerCase() === walletAddress.toString().toLowerCase()) {
+ setName((profile && profile.displayName) || identity);
+ setAbout(profile.displayAbout || "Hey I'm using Point Social!");
+ }
+ else {
+ try {
+ const profile = await UserManager.getProfile(address);
+ const { identity } = await point.ownerToIdentity(address);
+ const name = (profile[0] === EMPTY)? identity : await point.getString(profile[0], { encoding: 'utf-8' });
+ const about = (profile[2] === EMPTY)? "Hey I'm using Point Social!" : await point.getString(profile[2], {encoding: 'utf-8'});
+ setName(name);
+ setAbout(about);
+ }
+ catch(error) {}
+ }
+ setLoading(false);
+ }
+
+ return (
+ <>
+
-
- -
-
-
-
-
- - -
+ {
+ (users.length === 0)
+ ?
+
+
+ :
+
+ )
+}
+
+export default UserList
\ No newline at end of file
diff --git a/src/context/AppContext.js b/src/context/AppContext.js
index 05bd95a..0da9926 100644
--- a/src/context/AppContext.js
+++ b/src/context/AppContext.js
@@ -10,6 +10,7 @@ const events = new EventManager();
const defaultContext = {
walletAddress: undefined,
deployer : false,
+ isGateWay: false,
walletError: undefined,
identity: undefined,
profile: undefined,
@@ -32,7 +33,7 @@ export const ProvideAppContext = ({ children }) => {
const [, setLocation] = useLocation();
const [profile, setUserProfile] = useState();
const [deployer, setDeployer] = useState(false);
- const [processing, setProcessing] = useState(false);
+ const [processing, setProcessing] = useState(point.isGateway() || false);
useEffect(() => {
(async () => {
@@ -70,6 +71,7 @@ export const ProvideAppContext = ({ children }) => {
const context = {
walletAddress,
deployer,
+ isGateway : point.isGateway(),
walletError,
identity,
profile,
diff --git a/src/events.js b/src/events.js
index a27642a..3dc1210 100644
--- a/src/events.js
+++ b/src/events.js
@@ -14,6 +14,12 @@ const EventConstants = {
Feed: "1",
Post: "2",
Comment: "3",
+ },
+ FollowAction: {
+ Follow : "0",
+ UnFollow : "1",
+ Block : "2",
+ UnBlock : "3"
}
}
diff --git a/src/pages/home/Home.jsx b/src/pages/home/Home.jsx
index e621ae7..f9877da 100644
--- a/src/pages/home/Home.jsx
+++ b/src/pages/home/Home.jsx
@@ -1,81 +1,148 @@
-import Appbar from '../../components/topbar/Appbar';
-import Footer from '../../components/footer/Footer';
+import Appbar from "../../components/topbar/Appbar";
+import Footer from "../../components/footer/Footer";
-import { useState } from 'react';
+import { useState } from "react";
import { useAppContext } from '../../context/AppContext';
import { makeStyles } from '@material-ui/core/styles';
-import { Backdrop, CircularProgress, Snackbar, Container } from '@material-ui/core';
+import { Backdrop,
+ Button,
+ CircularProgress,
+ Snackbar,
+ SnackbarContent,
+ Container } from '@material-ui/core';
-import CircularProgressWithIcon from '../../components/generic/CircularProgressWithIcon';
-import ShareCard from '../../components/share/ShareCard';
-import Feed from '../../components/feed/Feed';
-import Alert from '../../components/generic/Alert';
+import Tabs from '@material-ui/core/Tabs';
+import Tab from '@material-ui/core/Tab';
+import TabPanel from '../../components/tabs/TabPanel';
+import Tooltip from '@material-ui/core/Tooltip';
+
+import DiscoverFeed from '../../components/feed/DiscoverFeed';
+import FollowFeed from '../../components/feed/FollowFeed';
+import FreshFeed from '../../components/feed/FreshFeed';
+import TopFeed from '../../components/feed/TopFeed';
+
+import ExploreOutlinedIcon from '@material-ui/icons/ExploreOutlined';
+import PersonPinCircleOutlinedIcon from '@material-ui/icons/PersonPinCircleOutlined';
+import EcoOutlinedIcon from '@material-ui/icons/EcoOutlined';
+import EmojiEventsOutlinedIcon from '@material-ui/icons/EmojiEventsOutlined';
+
+import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
+import ShareCard from "../../components/share/ShareCard";
+import Feed from "../../components/feed/Feed";
+import Alert from "../../components/generic/Alert";
import AccountBalanceWalletOutlinedIcon from '@material-ui/icons/AccountBalanceWalletOutlined';
+
const useStyles = makeStyles((theme) => ({
- root: {
- height: '100%',
- padding: 0,
- margin: 0,
- },
- container: {
- padding: theme.spacing(2, 2),
- display: 'flex',
- minHeight: '100%',
- flexDirection: 'column',
- justifyContent: 'center',
- maxWidth: '900px',
- },
- backdrop: {
- zIndex: theme.zIndex.drawer + 1,
- },
+ root: {
+ height: "100%",
+ padding: 0,
+ margin: 0,
+ },
+ container: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ minHeight: "100%",
+ flexDirection: "column",
+ justifyContent: "center",
+ maxWidth: '900px',
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ tab: {
+ padding: 0,
+ margin: 0,
+ },
+ tabpanel: {
+ padding: 0,
+ }
}));
-const Home = () => {
- const [loading, setLoading] = useState(false);
- const [alert, setAlert] = useState('');
- const { walletAddress } = useAppContext();
+function a11yProps(index) {
+ return {
+ id: `scrollable-prevent-tab-${index}`,
+ 'aria-controls': `scrollable-prevent-tabpanel-${index}`,
+ };
+}
- const styles = useStyles();
+const Home = () => {
+ const [loading, setLoading] = useState(false);
+ const [alert, setAlert] = useState("");
+ const { walletAddress, isGateway } = useAppContext();
+ const [tabIndex, setTabIndex] = useState(0);
- const handleAlert = (event, reason) => {
- if (reason === 'clickaway') {
- return;
- }
- setAlert('');
- };
+ const styles = useStyles();
+
+ const handleAlert = (event, reason) => {
+ if (reason === 'clickaway') {
+ return;
+ }
+ setAlert("");
+ };
- return (
-
+ No users yet.
+
+ -
+ {
+ users.map((user) => (
+
-
- {walletAddress ? (
-
- {walletAddress && (
- <>
-
-
-
-
- )}
-
-
- {alert.split('|')[0]}
-
-
-
- );
-};
+ const handleChange = (event, newIndex) => {
+ setTabIndex(newIndex);
+ };
+
+ return (
+
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
+
+ {
+ walletAddress?
+
+ {
+ walletAddress &&
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+ { alert.split("|")[0] }
+
+
+ );
+}
-export default Home;
+export default Home
\ No newline at end of file
diff --git a/src/pages/post/Post.jsx b/src/pages/post/Post.jsx
index 31cdaad..0421c86 100644
--- a/src/pages/post/Post.jsx
+++ b/src/pages/post/Post.jsx
@@ -8,7 +8,10 @@ import PostManager from '../../services/PostManager';
import CircularProgress from '@material-ui/core/CircularProgress';
import Backdrop from '@material-ui/core/Backdrop';
+import Button from '@material-ui/core/Button';
import Snackbar from '@material-ui/core/Snackbar';
+import SnackbarContent from '@material-ui/core/SnackbarContent';
+
import MuiAlert from '@material-ui/lab/Alert';
import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
@@ -46,7 +49,7 @@ const Post = () => {
const [alert, setAlert] = useState("");
const [post, setPost] = useState();
- const { walletAddress, events } = useAppContext();
+ const { walletAddress, isGateway, events } = useAppContext();
const styles = useStyles();
@@ -143,6 +146,16 @@ const Post = () => {
return (
{ walletAddress && }
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
{
walletAddress?
diff --git a/src/pages/profile/Profile.jsx b/src/pages/profile/Profile.jsx
index d790e44..0891f6b 100644
--- a/src/pages/profile/Profile.jsx
+++ b/src/pages/profile/Profile.jsx
@@ -8,7 +8,10 @@ import CircularProgress from '@material-ui/core/CircularProgress';
import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
import Backdrop from '@material-ui/core/Backdrop';
+import Button from '@material-ui/core/Button';
import Snackbar from '@material-ui/core/Snackbar';
+import SnackbarContent from '@material-ui/core/SnackbarContent';
+
import MuiAlert from '@material-ui/lab/Alert';
import Box from '@material-ui/core/Box';
@@ -41,7 +44,7 @@ const Profile = () => {
const [identity, setIdentity] = useState(undefined);
const [address, setAddress] = useState(undefined);
- const { walletAddress } = useAppContext();
+ const { walletAddress, isGateway } = useAppContext();
const styles = useStyles();
@@ -98,6 +101,16 @@ const Profile = () => {
} props={{color : "inherit"}} />
}
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
{walletAddress &&
<> { (address && identity)?
<>
diff --git a/src/services/PointSDK.js b/src/services/PointSDK.js
index c87ddb1..a9bd779 100644
--- a/src/services/PointSDK.js
+++ b/src/services/PointSDK.js
@@ -1,8 +1,8 @@
const POINT_TIMEOUT = 30 * 1000;
const MAX_TIMEOUT = 600 * 1000;
-const DEBUG = false;
-const DISPLAY_ERRORS = false;
+const DEBUG = true;
+const DISPLAY_ERRORS = true;
class PointSDK {
@@ -46,6 +46,11 @@ class PointSDK {
return data;
}
+ static isGateway() {
+ const point = PointSDK._getPoint();
+ return point.isGateway;
+ }
+
/************** WALLET FUNCTIONS **************/
static getWalletAddress = async () => PointSDK._callSDKFunction('wallet', 'address'); // OK
diff --git a/src/services/PostManager.js b/src/services/PostManager.js
index cb7d38f..28f58be 100644
--- a/src/services/PostManager.js
+++ b/src/services/PostManager.js
@@ -4,7 +4,7 @@ const EMPTY = '0x0000000000000000000000000000000000000000';
class PostManager {
static getPost = async (postId) => point.contractCall("PointSocial", "getPostById", [postId]);
- static isFlaggedPost = async (postId) => point.contractCall("PointSocial", "postIsFlagged", [postId]);
+ static postIsFlagged = async (postId) => point.contractCall("PointSocial", "postIsFlagged", [postId]);
static addPost = async (contentId, imageId) =>
point.contractCall("PointSocial", "addPost", [
(contentId) ? contentId : EMPTY,
@@ -14,8 +14,8 @@ class PostManager {
static editPost = async (postId, contentId, imageId) => {
return point.contractCall("PointSocial", "editPost", [
postId,
- (contentId) ? contentId : EMPTY,
- (imageId) ? imageId : EMPTY
+ (contentId ? contentId : EMPTY),
+ (imageId ? imageId : EMPTY)
]);
}
static flagPost = async (postId) => point.contractCall("PointSocial", "flagPost", [postId]);
@@ -23,8 +23,9 @@ class PostManager {
static addDislikeToPost = async (postId) => point.contractSend("PointSocial", "addDislikeToPost", [postId]);
static getAllPostsByOwnerLength = async (account) => point.contractCall("PointSocial", "getAllPostsByOwnerLength", [account]);
static getAllPostsLength = async () => point.contractCall("PointSocial", "getAllPostsLength", []);
+ static getLastPostId = async () => point.contractCall("PointSocial", "getLastPostId", []);
static getPaginatedPostsByOwner = async (account, length, amount) => point.contractCall("PointSocial", "getPaginatedPostsByOwner", [account, length, amount]);
- static getPaginatedPosts = async (length, amount) => point.contractCall("PointSocial", "getPaginatedPosts", [length, amount]);
+ static getPaginatedPosts = async (length, amount, type = 2) => point.contractCall("PointSocial", "getPaginatedPosts", [length, amount, type]);
static checkLikeToPost = async (postId) => point.contractCall("PointSocial", "checkLikeToPost", [postId]);
}
diff --git a/src/services/UserManager.js b/src/services/UserManager.js
index 5ae355c..df6010a 100644
--- a/src/services/UserManager.js
+++ b/src/services/UserManager.js
@@ -3,6 +3,17 @@ import point from "./PointSDK"
class UserManager {
static getProfile = async (userAddress) => point.contractCall("PointSocial", "getProfile", [userAddress]);
static setProfile = async (displayName, displayLocation, displayAbout, avatar, banner) => point.contractCall("PointSocial", "setProfile", [displayName, displayLocation, displayAbout, avatar, banner]);
+ static isFollowing = async (owner, user) => point.contractCall("PointSocial", "isFollowing", [owner, user]);
+ static followUser = async (user) => point.contractCall("PointSocial", "followUser", [user]);
+ static unfollowUser = async (user) => point.contractCall("PointSocial", "unfollowUser", [user]);
+ static blockUser = async (user) => point.contractCall("PointSocial", "blockUser", [user]);
+ static unblockUser = async (user) => point.contractCall("PointSocial", "unBlockUser", [user]);
+ static isBlocked = async (owner, user) => point.contractCall("PointSocial", "isBlocked", [owner, user]);
+ static blockList = async () => point.contractCall("PointSocial", "blockList", []);
+ static followingList = async (user) => point.contractCall("PointSocial", "followingList", [user]);
+ static followersList = async (user) => point.contractCall("PointSocial", "followersList", [user]);
+ static followingCount = async (user) => point.contractCall("PointSocial", "followingCount", [user]);
+ static followersCount = async (user) => point.contractCall("PointSocial", "followersCount", [user]);
}
export default UserManager
diff --git a/tests/unit/smartcontracts/PointSocial.js b/tests/unit/smartcontracts/PointSocial.js
index 034e30e..9fe1048 100644
--- a/tests/unit/smartcontracts/PointSocial.js
+++ b/tests/unit/smartcontracts/PointSocial.js
@@ -41,24 +41,41 @@ describe('PointSocial contract', function () {
await upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer);
});
- it('Should not upgrade the proxy by a non-deployer', async function () {
- await identityContract.setDevMode(true);
- await identityContract.register(
- handle,
- owner.address,
- '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
- '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb'
- );
-
- const factory = await ethers.getContractFactory('PointSocial');
- let socialFactoryDeployer = factory.connect(addr1);
- await expect(
- upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer)
- ).to.be.revertedWith('ERROR_NOT_DEPLOYER');
+ describe("Testing deployment functions", function () {
+
+ it("Should upgrade the proxy by a deployer", async function () {
+ await identityContract.setDevMode(true);
+ await identityContract.register(
+ handle,
+ owner.address,
+ '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
+ '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb');
+ await identityContract.addIdentityDeployer(handle, addr1.address);
+ const factory = await ethers.getContractFactory("PointSocial");
+ let socialFactoryDeployer = factory.connect(addr1);
+
+ await upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer);
+ });
+
+ it("Should not upgrade the proxy by a non-deployer", async function () {
+ await identityContract.setDevMode(true);
+ await identityContract.register(
+ handle,
+ owner.address,
+ '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
+ '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb');
+
+ const factory = await ethers.getContractFactory("PointSocial");
+ let socialFactoryDeployer = factory.connect(addr1);
+ await expect(
+ upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer)
+ ).to.be.revertedWith('ERROR_NOT_DEPLOYER');
+ });
+
});
});
- /*describe("Testing migrator functions", function () {
+ describe("Testing migrator functions", function () {
it("User can add migrator", async function () {
await pointSocial.addMigrator(
addr1.address
@@ -161,7 +178,7 @@ describe('PointSocial contract', function () {
pointSocial.connect(addr2).addMigrator(addr2.address)
).to.be.revertedWith("Ownable: caller is not the owner");
});
- });*/
+ });
describe('Testing user functions', function () {
it('User can create post', async function () {
@@ -259,10 +276,16 @@ describe('PointSocial contract', function () {
const postCommentId = await pointSocial.commentIdsByPost(1, 0);
const postComments = await pointSocial.commentById(postCommentId);
- expect(postComments.contents).to.be.equal(
- '0x0090916c0e6846d5dc8d22560e90782ded96e4efdeb53db214f612a54d4f5fbe'
- );
- });
+ const paginatedPosts = await pointSocial.getPaginatedPosts("5", "5", "1");
+
+ expect(paginatedPosts.length).to.be.equal(5);
+ });
+
+ it("Add comments to posts", async function () {
+ await pointSocial.addPost(
+ postContent,
+ postimage
+ )
it('Add dislike to posts', async () => {
await pointSocial.addPost(postContent, postimage);
@@ -354,4 +377,4 @@ describe('PointSocial contract', function () {
);
});
});
-});
+});
\ No newline at end of file
diff --git a/typechain/ERC1967UpgradeUpgradeable.d.ts b/typechain/ERC1967UpgradeUpgradeable.d.ts
deleted file mode 100644
index 329ad08..0000000
--- a/typechain/ERC1967UpgradeUpgradeable.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface ERC1967UpgradeUpgradeableInterface extends ethers.utils.Interface {
- functions: {};
-
- events: {
- "AdminChanged(address,address)": EventFragment;
- "BeaconUpgraded(address)": EventFragment;
- "Upgraded(address)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
-}
-
-export type AdminChangedEvent = TypedEvent<
- [string, string] & { previousAdmin: string; newAdmin: string }
->;
-
-export type BeaconUpgradedEvent = TypedEvent<[string] & { beacon: string }>;
-
-export type UpgradedEvent = TypedEvent<[string] & { implementation: string }>;
-
-export class ERC1967UpgradeUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: ERC1967UpgradeUpgradeableInterface;
-
- functions: {};
-
- callStatic: {};
-
- filters: {
- "AdminChanged(address,address)"(
- previousAdmin?: null,
- newAdmin?: null
- ): TypedEventFilter<
- [string, string],
- { previousAdmin: string; newAdmin: string }
- >;
-
- AdminChanged(
- previousAdmin?: null,
- newAdmin?: null
- ): TypedEventFilter<
- [string, string],
- { previousAdmin: string; newAdmin: string }
- >;
-
- "BeaconUpgraded(address)"(
- beacon?: string | null
- ): TypedEventFilter<[string], { beacon: string }>;
-
- BeaconUpgraded(
- beacon?: string | null
- ): TypedEventFilter<[string], { beacon: string }>;
-
- "Upgraded(address)"(
- implementation?: string | null
- ): TypedEventFilter<[string], { implementation: string }>;
-
- Upgraded(
- implementation?: string | null
- ): TypedEventFilter<[string], { implementation: string }>;
- };
-
- estimateGas: {};
-
- populateTransaction: {};
-}
diff --git a/typechain/IBeaconUpgradeable.d.ts b/typechain/IBeaconUpgradeable.d.ts
deleted file mode 100644
index 864f4a0..0000000
--- a/typechain/IBeaconUpgradeable.d.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IBeaconUpgradeableInterface extends ethers.utils.Interface {
- functions: {
- "implementation()": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "implementation",
- values?: undefined
- ): string;
-
- decodeFunctionResult(
- functionFragment: "implementation",
- data: BytesLike
- ): Result;
-
- events: {};
-}
-
-export class IBeaconUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IBeaconUpgradeableInterface;
-
- functions: {
- implementation(overrides?: CallOverrides): Promise<[string]>;
- };
-
- implementation(overrides?: CallOverrides): Promise;
-
- callStatic: {
- implementation(overrides?: CallOverrides): Promise;
- };
-
- filters: {};
-
- estimateGas: {
- implementation(overrides?: CallOverrides): Promise;
- };
-
- populateTransaction: {
- implementation(overrides?: CallOverrides): Promise;
- };
-}
diff --git a/typechain/IERC1822ProxiableUpgradeable.d.ts b/typechain/IERC1822ProxiableUpgradeable.d.ts
deleted file mode 100644
index e45277d..0000000
--- a/typechain/IERC1822ProxiableUpgradeable.d.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IERC1822ProxiableUpgradeableInterface extends ethers.utils.Interface {
- functions: {
- "proxiableUUID()": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "proxiableUUID",
- values?: undefined
- ): string;
-
- decodeFunctionResult(
- functionFragment: "proxiableUUID",
- data: BytesLike
- ): Result;
-
- events: {};
-}
-
-export class IERC1822ProxiableUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IERC1822ProxiableUpgradeableInterface;
-
- functions: {
- proxiableUUID(overrides?: CallOverrides): Promise<[string]>;
- };
-
- proxiableUUID(overrides?: CallOverrides): Promise;
-
- callStatic: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-
- filters: {};
-
- estimateGas: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-
- populateTransaction: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-}
diff --git a/typechain/IIdentity.d.ts b/typechain/IIdentity.d.ts
deleted file mode 100644
index 46c24a1..0000000
--- a/typechain/IIdentity.d.ts
+++ /dev/null
@@ -1,919 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- Overrides,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IIdentityInterface extends ethers.utils.Interface {
- functions: {
- "addIdentityDeployer(string,address)": FunctionFragment;
- "canonical(string)": FunctionFragment;
- "finishMigrations()": FunctionFragment;
- "getCommPublicKeyByIdentity(string)": FunctionFragment;
- "getDevMode()": FunctionFragment;
- "getIdentityByOwner(address)": FunctionFragment;
- "getMaxHandleLength()": FunctionFragment;
- "getOracleAddress()": FunctionFragment;
- "getOwnerByIdentity(string)": FunctionFragment;
- "ikvGet(string,string)": FunctionFragment;
- "ikvImportKV(string,string,string,string)": FunctionFragment;
- "ikvPut(string,string,string,string)": FunctionFragment;
- "isIdentityDeployer(string,address)": FunctionFragment;
- "register(string,address,bytes32,bytes32)": FunctionFragment;
- "registerVerified(string,address,bytes32,bytes32,bytes32,uint8,bytes32,bytes32)": FunctionFragment;
- "removeIdentityDeployer(string,address)": FunctionFragment;
- "setDevMode(bool)": FunctionFragment;
- "setMaxHandleLength(uint256)": FunctionFragment;
- "setOracleAddress(address)": FunctionFragment;
- "transferIdentityOwnership(string,address)": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "addIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "canonical", values: [string]): string;
- encodeFunctionData(
- functionFragment: "finishMigrations",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getCommPublicKeyByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getDevMode",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getIdentityByOwner",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getMaxHandleLength",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOracleAddress",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOwnerByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvGet",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvImportKV",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvPut",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "isIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "register",
- values: [string, string, BytesLike, BytesLike]
- ): string;
- encodeFunctionData(
- functionFragment: "registerVerified",
- values: [
- string,
- string,
- BytesLike,
- BytesLike,
- BytesLike,
- BigNumberish,
- BytesLike,
- BytesLike
- ]
- ): string;
- encodeFunctionData(
- functionFragment: "removeIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "setDevMode", values: [boolean]): string;
- encodeFunctionData(
- functionFragment: "setMaxHandleLength",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "setOracleAddress",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferIdentityOwnership",
- values: [string, string]
- ): string;
-
- decodeFunctionResult(
- functionFragment: "addIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "canonical", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "finishMigrations",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getCommPublicKeyByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "getDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "getIdentityByOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOwnerByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvGet", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ikvImportKV",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvPut", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "isIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "register", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "registerVerified",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "removeIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "setDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "setMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "setOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferIdentityOwnership",
- data: BytesLike
- ): Result;
-
- events: {
- "IKVSet(string,string,string,string)": EventFragment;
- "IdentityDeployerChanged(string,address,bool)": EventFragment;
- "IdentityOwnershipTransferred(string,address,address,uint256)": EventFragment;
- "IdentityRegistered(string,address,tuple)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "IKVSet"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityDeployerChanged"): EventFragment;
- getEvent(
- nameOrSignatureOrTopic: "IdentityOwnershipTransferred"
- ): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityRegistered"): EventFragment;
-}
-
-export type IKVSetEvent = TypedEvent<
- [string, string, string, string] & {
- identity: string;
- key: string;
- value: string;
- version: string;
- }
->;
-
-export type IdentityDeployerChangedEvent = TypedEvent<
- [string, string, boolean] & {
- identity: string;
- deployer: string;
- allowed: boolean;
- }
->;
-
-export type IdentityOwnershipTransferredEvent = TypedEvent<
- [string, string, string, BigNumber] & {
- handle: string;
- oldOwner: string;
- newOwner: string;
- date: BigNumber;
- }
->;
-
-export type IdentityRegisteredEvent = TypedEvent<
- [string, string, [string, string] & { part1: string; part2: string }] & {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
->;
-
-export class IIdentity extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IIdentityInterface;
-
- functions: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(
- anyCase: string,
- overrides?: CallOverrides
- ): Promise<[string] & { canonicalCase: string }>;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<
- [[string, string] & { part1: string; part2: string }] & {
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
-
- getDevMode(overrides?: CallOverrides): Promise<[boolean]>;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise<[string] & { identity: string }>;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise<[BigNumber]>;
-
- getOracleAddress(overrides?: CallOverrides): Promise<[string]>;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string] & { owner: string }>;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise<[string] & { value: string }>;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise<[boolean]>;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string, string] & { part1: string; part2: string }>;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(owner: string, overrides?: CallOverrides): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- callStatic: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(overrides?: CallOverrides): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string, string] & { part1: string; part2: string }>;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: CallOverrides
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: CallOverrides
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: CallOverrides
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- setDevMode(value: boolean, overrides?: CallOverrides): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: CallOverrides
- ): Promise;
-
- setOracleAddress(addr: string, overrides?: CallOverrides): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: CallOverrides
- ): Promise;
- };
-
- filters: {
- "IKVSet(string,string,string,string)"(
- identity?: null,
- key?: null,
- value?: null,
- version?: null
- ): TypedEventFilter<
- [string, string, string, string],
- { identity: string; key: string; value: string; version: string }
- >;
-
- IKVSet(
- identity?: null,
- key?: null,
- value?: null,
- version?: null
- ): TypedEventFilter<
- [string, string, string, string],
- { identity: string; key: string; value: string; version: string }
- >;
-
- "IdentityDeployerChanged(string,address,bool)"(
- identity?: null,
- deployer?: null,
- allowed?: null
- ): TypedEventFilter<
- [string, string, boolean],
- { identity: string; deployer: string; allowed: boolean }
- >;
-
- IdentityDeployerChanged(
- identity?: null,
- deployer?: null,
- allowed?: null
- ): TypedEventFilter<
- [string, string, boolean],
- { identity: string; deployer: string; allowed: boolean }
- >;
-
- "IdentityOwnershipTransferred(string,address,address,uint256)"(
- handle?: string | null,
- oldOwner?: string | null,
- newOwner?: string | null,
- date?: null
- ): TypedEventFilter<
- [string, string, string, BigNumber],
- { handle: string; oldOwner: string; newOwner: string; date: BigNumber }
- >;
-
- IdentityOwnershipTransferred(
- handle?: string | null,
- oldOwner?: string | null,
- newOwner?: string | null,
- date?: null
- ): TypedEventFilter<
- [string, string, string, BigNumber],
- { handle: string; oldOwner: string; newOwner: string; date: BigNumber }
- >;
-
- "IdentityRegistered(string,address,tuple)"(
- handle?: null,
- identityOwner?: null,
- commPublicKey?: null
- ): TypedEventFilter<
- [string, string, [string, string] & { part1: string; part2: string }],
- {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
-
- IdentityRegistered(
- handle?: null,
- identityOwner?: null,
- commPublicKey?: null
- ): TypedEventFilter<
- [string, string, [string, string] & { part1: string; part2: string }],
- {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
- };
-
- estimateGas: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-
- populateTransaction: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(
- anyCase: string,
- overrides?: CallOverrides
- ): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(
- overrides?: CallOverrides
- ): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-}
diff --git a/typechain/Identity.d.ts b/typechain/Identity.d.ts
deleted file mode 100644
index 30f4c08..0000000
--- a/typechain/Identity.d.ts
+++ /dev/null
@@ -1,1401 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- Overrides,
- PayableOverrides,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IdentityInterface extends ethers.utils.Interface {
- functions: {
- "addIdentityDeployer(string,address)": FunctionFragment;
- "canonical(string)": FunctionFragment;
- "finishMigrations()": FunctionFragment;
- "getCommPublicKeyByIdentity(string)": FunctionFragment;
- "getDevMode()": FunctionFragment;
- "getIdentityByOwner(address)": FunctionFragment;
- "getMaxHandleLength()": FunctionFragment;
- "getOracleAddress()": FunctionFragment;
- "getOwnerByIdentity(string)": FunctionFragment;
- "identityList(uint256)": FunctionFragment;
- "identityToCommPublicKey(string)": FunctionFragment;
- "identityToOwner(string)": FunctionFragment;
- "ikv(string,string)": FunctionFragment;
- "ikvGet(string,string)": FunctionFragment;
- "ikvImportKV(string,string,string,string)": FunctionFragment;
- "ikvList(string,uint256)": FunctionFragment;
- "ikvPut(string,string,string,string)": FunctionFragment;
- "initialize()": FunctionFragment;
- "isIdentityDeployer(string,address)": FunctionFragment;
- "lowercaseToCanonicalIdentities(string)": FunctionFragment;
- "migrationApplied()": FunctionFragment;
- "owner()": FunctionFragment;
- "ownerToIdentity(address)": FunctionFragment;
- "proxiableUUID()": FunctionFragment;
- "register(string,address,bytes32,bytes32)": FunctionFragment;
- "registerVerified(string,address,bytes32,bytes32,bytes32,uint8,bytes32,bytes32)": FunctionFragment;
- "removeIdentityDeployer(string,address)": FunctionFragment;
- "renounceOwnership()": FunctionFragment;
- "setDevMode(bool)": FunctionFragment;
- "setMaxHandleLength(uint256)": FunctionFragment;
- "setOracleAddress(address)": FunctionFragment;
- "transferIdentityOwnership(string,address)": FunctionFragment;
- "transferOwnership(address)": FunctionFragment;
- "upgradeTo(address)": FunctionFragment;
- "upgradeToAndCall(address,bytes)": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "addIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "canonical", values: [string]): string;
- encodeFunctionData(
- functionFragment: "finishMigrations",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getCommPublicKeyByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getDevMode",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getIdentityByOwner",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getMaxHandleLength",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOracleAddress",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOwnerByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "identityList",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "identityToCommPublicKey",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "identityToOwner",
- values: [string]
- ): string;
- encodeFunctionData(functionFragment: "ikv", values: [string, string]): string;
- encodeFunctionData(
- functionFragment: "ikvGet",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvImportKV",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvList",
- values: [string, BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvPut",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "initialize",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "isIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "lowercaseToCanonicalIdentities",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "migrationApplied",
- values?: undefined
- ): string;
- encodeFunctionData(functionFragment: "owner", values?: undefined): string;
- encodeFunctionData(
- functionFragment: "ownerToIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "proxiableUUID",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "register",
- values: [string, string, BytesLike, BytesLike]
- ): string;
- encodeFunctionData(
- functionFragment: "registerVerified",
- values: [
- string,
- string,
- BytesLike,
- BytesLike,
- BytesLike,
- BigNumberish,
- BytesLike,
- BytesLike
- ]
- ): string;
- encodeFunctionData(
- functionFragment: "removeIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "renounceOwnership",
- values?: undefined
- ): string;
- encodeFunctionData(functionFragment: "setDevMode", values: [boolean]): string;
- encodeFunctionData(
- functionFragment: "setMaxHandleLength",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "setOracleAddress",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferIdentityOwnership",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferOwnership",
- values: [string]
- ): string;
- encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
- encodeFunctionData(
- functionFragment: "upgradeToAndCall",
- values: [string, BytesLike]
- ): string;
-
- decodeFunctionResult(
- functionFragment: "addIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "canonical", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "finishMigrations",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getCommPublicKeyByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "getDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "getIdentityByOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOwnerByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityList",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityToCommPublicKey",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityToOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikv", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "ikvGet", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ikvImportKV",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvList", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "ikvPut", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "isIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "lowercaseToCanonicalIdentities",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "migrationApplied",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ownerToIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "proxiableUUID",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "register", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "registerVerified",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "removeIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "renounceOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "setDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "setMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "setOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferIdentityOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "upgradeToAndCall",
- data: BytesLike
- ): Result;
-
- events: {
- "AdminChanged(address,address)": EventFragment;
- "BeaconUpgraded(address)": EventFragment;
- "IKVSet(string,string,string,string)": EventFragment;
- "IdentityDeployerChanged(string,address,bool)": EventFragment;
- "IdentityOwnershipTransferred(string,address,address,uint256)": EventFragment;
- "IdentityRegistered(string,address,tuple)": EventFragment;
- "OwnershipTransferred(address,address)": EventFragment;
- "Upgraded(address)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IKVSet"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityDeployerChanged"): EventFragment;
- getEvent(
- nameOrSignatureOrTopic: "IdentityOwnershipTransferred"
- ): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityRegistered"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
-}
-
-export type AdminChangedEvent = TypedEvent<
- [string, string] & { previousAdmin: string; newAdmin: string }
->;
-
-export type BeaconUpgradedEvent = TypedEvent<[string] & { beacon: string }>;
-
-export type IKVSetEvent = TypedEvent<
- [string, string, string, string] & {
- identity: string;
- key: string;
- value: string;
- version: string;
- }
->;
-
-export type IdentityDeployerChangedEvent = TypedEvent<
- [string, string, boolean] & {
- identity: string;
- deployer: string;
- allowed: boolean;
- }
->;
-
-export type IdentityOwnershipTransferredEvent = TypedEvent<
- [string, string, string, BigNumber] & {
- handle: string;
- oldOwner: string;
- newOwner: string;
- date: BigNumber;
- }
->;
-
-export type IdentityRegisteredEvent = TypedEvent<
- [string, string, [string, string] & { part1: string; part2: string }] & {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
->;
-
-export type OwnershipTransferredEvent = TypedEvent<
- [string, string] & { previousOwner: string; newOwner: string }
->;
-
-export type UpgradedEvent = TypedEvent<[string] & { implementation: string }>;
-
-export class Identity extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter