Skip to content

Update org references #1146

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update org references #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Contributing

1. Fork and clone the repo
1. Follow [README](https://github.com/makerdao/governance-portal-v2#readme) instructions for setting up repo locally
1. Follow [README](https://github.com/skyecosystem/governance-portal-v2#readme) instructions for setting up repo locally
1. Create a branch for your PR with `git checkout -b your-branch-name`

> To keep `master` branch pointing to remote repository and make
> pull requests from branches on your fork. To do this, run:
>
> ```sh
> git remote add upstream https://github.com/makerdao/governance-portal-v2.git
> git remote add upstream https://github.com/skyecosystem/governance-portal-v2.git
> git fetch upstream
> git branch --set-upstream-to=upstream/master master
> ```
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To get started, clone the repository to the desired directory and then navigate

```bash
# clones repo
git clone https://github.com/makerdao/governance-portal-v2.git
git clone https://github.com/skyecosystem/governance-portal-v2.git

# changes directory to cloned project folder
cd governance-portal-v2
Expand Down Expand Up @@ -57,7 +57,7 @@ The tag and versioning should be done on develop, and then merged to master thro

The portal seeks to rely on on-chain data as much as possible and to minimize reliance on data stored on centralized servers. However, due to the large volume of data that is relevant to Maker governance, fetching this data from on-chain is both time and resource-intensive. In order to improve the user's experience, some reliance on third-party services has been added, and we recommend a few configuration steps for optimal use. These services include:

- [GitHub](https://github.com/makerdao/community/tree/master/governance) for storing markdown related to [polls](https://github.com/makerdao/community/tree/master/governance/polls), [executives](https://github.com/makerdao/community/tree/master/governance/votes), and [aligned delegates](https://github.com/makerdao/community/tree/master/governance/delegates)
- [GitHub](https://github.com/skyecosystem/community/tree/master/governance) for storing markdown related to [polls](https://github.com/skyecosystem/community/tree/master/governance/polls), [executives](https://github.com/skyecosystem/community/tree/master/governance/votes), and [aligned delegates](https://github.com/skyecosystem/community/tree/master/governance/delegates)

#### Network providers

Expand Down
42 changes: 21 additions & 21 deletions docs/POLL_PARAMETERS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Poll Parameters

The governance portal reads and parses the poll parameters defined on each poll on the [MakerDAO community repo](https://github.com/makerdao/community/tree/master/governance/polls).
The governance portal reads and parses the poll parameters defined on each poll on the [MakerDAO community repo](https://github.com/skyecosystem/community/tree/master/governance/polls).

Each poll file includes some markdown on the header, currently (July 2022) there are 2 kinds of poll parameters, the legacy ones and the new ones that describe the voting options in more detail.
The legacy poll parameters only determine if a poll is ranked-choice (IRV) or plurality. The new poll parameters have more options.
Expand Down Expand Up @@ -84,26 +84,26 @@ Victory conditions is an array of values that determine the winning condition of

Currently we support plurality, majority, approval, instant-runoff (IRV), "and", and comparison (comparison acts as a safe check).

| victory_conditions | summary |
| ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------- |
| majority | Condition returns true for the option with more than 50% of the total vote-weight - false for others |
| plurality | Condition returns true for the option with more vote weight than any other option - false for others |
| instant-runoff | Condition returns true for the option winning when applying the IRV algorithm - false for others |
| "comparison" | Condition returns true for <option(s)> if expression <option/value><comparator><option/value> evaluates to true - false for others |
| no-victor | Condition returns false for every option (marking a poll that is not supposed to result in a winning option) |
| default-<option> | Condition returns true for <option> if no other option returns true on all other victory conditions |
| approval | Condition returns true for the option with the most approval - false for others |
| victory_conditions | summary |
| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------- |
| majority | Condition returns true for the option with more than 50% of the total vote-weight - false for others |
| plurality | Condition returns true for the option with more vote weight than any other option - false for others |
| instant-runoff | Condition returns true for the option winning when applying the IRV algorithm - false for others |
| "comparison" | Condition returns true for <option(s)> if expression <option/value><comparator><option/value> evaluates to true - false for others |
| no-victor | Condition returns false for every option (marking a poll that is not supposed to result in a winning option) |
| default-<option> | Condition returns true for <option> if no other option returns true on all other victory conditions |
| approval | Condition returns true for the option with the most approval - false for others |

### Result display:

| result_display |   |
| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
| single-vote-breakdown | Displays current breakdown UI for Plurality |
| instant-runoff-breakdown | Displays current breakdown UI for Ranked Choice |
| condition-summary (Not implemented) | Displays a table that lists each victory condition and shows whether it evaluates to true or false for each option |
| result_display |   |
| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
| single-vote-breakdown | Displays current breakdown UI for Plurality |
| instant-runoff-breakdown | Displays current breakdown UI for Ranked Choice |
| condition-summary (Not implemented) | Displays a table that lists each victory condition and shows whether it evaluates to true or false for each option |
| score-<option/value><operator><option/value> (Not implemented) | Displays an output score where score = <option/value><operator><option/value> |
| approval-breakdown | Displays current breakdown UI for Plurality - but with approval scores. |
| weight-breakdown (Not implemented) | Displays current breakdown UI for Plurality - but with weighted scores. |
| approval-breakdown | Displays current breakdown UI for Plurality - but with approval scores. |
| weight-breakdown (Not implemented) | Displays current breakdown UI for Plurality - but with weighted scores. |

### New plurality voting:

Expand Down Expand Up @@ -138,10 +138,10 @@ summary: something
discussion_link: link
parameters:
input_format: rank-free
victory_conditions:
victory_conditions:
- { type : instant-runoff }
result_display: instant-runoff-breakdown
version: v2.0.0
version: v2.0.0
options:
0: Option 1
1: Option 2
Expand All @@ -161,8 +161,8 @@ Approval voting allows user to select multiple options but should only allow the
Example:

- input_format
type: approval
options: [1,2,3] : Determine that the user can only select multiple 1,2,3. Option number 4 or 0 will be exclusive.
type: approval
options: [1,2,3] : Determine that the user can only select multiple 1,2,3. Option number 4 or 0 will be exclusive.
- { type: 'approval', options: [1,2,3] } : Determine the options that will count as "approved", in theory it should match the input format options.

```
Expand Down
4 changes: 2 additions & 2 deletions modules/delegates/api/getDelegatesRepositoryInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ export type RepositoryInfo = {

export function getDelegatesRepositoryInformation(network: SupportedNetworks): RepositoryInfo {
const repoMainnet = {
owner: 'makerdao',
owner: 'skyecosystem',
repo: 'community',
page: 'governance/delegates'
};

const repoTest = {
owner: 'makerdao-dux',
owner: 'skyecosystem',
repo: 'voting-delegates',
page: 'delegates'
};
Expand Down
2 changes: 1 addition & 1 deletion modules/executive/api/fetchExecutives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function getGithubExecutives(network: SupportedNetworks): Promise<C
const proposalIndex = await (await fetch(EXEC_PROPOSAL_INDEX)).json();

const githubRepo = {
owner: 'makerdao',
owner: 'skyecosystem',
repo: 'community',
page: 'governance/votes'
};
Expand Down
2 changes: 1 addition & 1 deletion modules/executive/executive.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
*/

export const EXEC_PROPOSAL_INDEX =
'https://raw.githubusercontent.com/makerdao/community/master/governance/votes/active/proposals.json';
'https://raw.githubusercontent.com/skyecosystem/community/master/governance/votes/active/proposals.json';

export const EXEC_PAGE_SIZE = 10;
2 changes: 1 addition & 1 deletion modules/home/components/ResourcesLanding/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const resources: LandingResource[] = [
},
{
title: 'MakerDAO GitHub',
url: 'https://github.com/makerdao/',
url: 'https://github.com/skyecosystem/',
category: ResourceCategory.DEVELOPERS,
bg: ResourceBackground.DEVELOPERS,
color: ResourceColor.DEVELOPERS,
Expand Down
Loading