diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1b3cf2b..f0bb29e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -52,7 +52,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.18.2' - name: Install pnpm and dependencies run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0054ba4..178b618 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: '16.17.1' + node-version: '18.18.2' - name: Install pnpm and dependencies run: | diff --git a/docs/governance/1IPs.mdx b/docs/governance/1IPs.mdx index 82eab75..5306929 100644 --- a/docs/governance/1IPs.mdx +++ b/docs/governance/1IPs.mdx @@ -36,7 +36,8 @@ All 1IPs that have successfully passed the Phase-4 vote. These 1IPs have already -

Simple Summary

+
+

Simple Summary

The StableLab team requests a grant to write the first draft of the 1inch DAO Constitution to help support the DAO as it progresses towards decentralization.

Motivation

As active contributors to the 1inch DAO, this grant seeks to extend StableLab’s work to offer deeper insights into how 1inch DAO can improve.

@@ -93,7 +94,8 @@ All 1IPs that have successfully passed the Phase-4 vote. These 1IPs have already -

Author

+
+

Author

@RoundElephant

References

    @@ -159,7 +161,8 @@ All 1IPs that have successfully passed the Phase-4 vote. These 1IPs have already -

    Author: carlosjmelgar

    +
    +

    Author: carlosjmelgar

    Simple Summary

    This Gitcoin grants round funds public goods, but also creates an enhanced connection between Grantees and funding partners within the LatAm Featured Round by establishing an eligibility criteria that requires grantees to create educational content, host workshops and adopt 1inch products.

    Abstract

    @@ -218,8 +221,7 @@ All 1IPs that have successfully passed the Phase-4 vote. These 1IPs have already

    +10% base platform fee

-

Additional fees may apply if 1inch team would like Gitcoin to absorb some of the tasks related to eligibility process and grantee management relating to milestones set. -

+

Additional fees may apply if 1inch team would like Gitcoin to absorb some of the tasks related to eligibility process and grantee management relating to milestones set.

@@ -251,7 +253,10 @@ All 1IPs that have successfully passed the Phase-4 vote. These 1IPs have already -

Authors: DAOplomats.org

+
+
+
+

Authors: DAOplomats.org

Simple Summary

This proposal suggests amending the Recognized delegates program to make it more inclusive while maintaining quality standards

Abstract

@@ -311,7 +316,8 @@ Delegation threshold

The 1inchDAO should consider building a reputation dashboard so that anyone can track the voting history and performance of delegates. We suggest that the program continues for a minimum of 6 months as outlined in the original proposal and for a maximum until the budget runs out The DAO should consider hiring a Governance Operations Specialist who can keep a track on the performance of delegates, schedule payments and highlight code of conduct violations

-
+
+
@@ -342,7 +348,8 @@ The DAO should consider hiring a Governance Operations Specialist who can keep a -

Author: era1301

+
+

Author: era1301

Simple Summary

The 1inch Network has been an active participant in the crypto community, having organized 25 events and 27 side events last year and 6 events in the last quarter of 2023. These events have resulted in tens of thousands of user acquisitions. This proposal is now seeking funding to participate in 8 more events during Q3 & Q4 2023 as sponsors. All the events are crypto-related conferences or hackathons focused on developing new decentralized finance (DeFi) solutions and expanding the DeFi and Web3 ecosystem. This proposal seeks funding for 1inch Network to participate in 8 events during Q3 & Q4 2023 as sponsors. All the events are crypto related conferences or hackathons focused on developing new decentralized finance (DeFi) solutions and expanding the DeFi and Web3 ecosystem. @@ -557,7 +564,8 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -

References

+
+

References

[1IP-19] Increase the Number of Whitelisted Fusion Mode Resolver to 10

Simple Summary

This proposal seeks to introduce a dynamic Fusion mode resolver whitelist in the 1inch Network. This whitelist would be determined by whether a resolver has received delegations of 10% or more of the total Unicorn Power in the network.

@@ -604,7 +612,12 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -
By daoplomats.eth

This proposal outlines the launch of 1inch’s first community program aimed at gathering 1inch supporters, users, and creative individuals to support and expand the brand’s reach in order to make Web3 and DeFi more accessible to the masses. The proposed program requests $100,000 USDC for a three-month trial period, with specific key performance indicators (KPIs) to measure the program’s success.

+
+By daoplomats.eth +
+
+
+

This proposal outlines the launch of 1inch’s first community program aimed at gathering 1inch supporters, users, and creative individuals to support and expand the brand’s reach in order to make Web3 and DeFi more accessible to the masses. The proposed program requests $100,000 USDC for a three-month trial period, with specific key performance indicators (KPIs) to measure the program’s success.

KPIs

The following KPIs will be tracked during the trial program:

    @@ -678,20 +691,18 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp

    In terms of incentives per track, the following ranges are proposed:

    • Community Management: $50-$400 1INCH tokens per month based on the depth of conversations, level of moderation, and metrics of online engagement activities hosted by the community manager.
      • -
    • Content: +
    • Content:
      • $2-$10 1INCH tokens for Twitter content creation, depending on quality and engagement.
      • $5-$20 1INCH tokens for articles and blog posts, based on the value added, difficulty, views, and length.
      • $5-$300 1INCH tokens for creative content, depending on quality, resources required, and engagement.
      • $5-$15 1INCH tokens per translation piece, varying in length and difficulty.
      - -
    • Events: +
    • Events:
      • $20-$50 1INCH tokens for local meetups, depending on coordination, attendance, and growth of local online communities.
      • $75-$200 1INCH tokens for planning and organizing large-scale events with 100+ attendees, including preparations like banners, food and beverage, and merchandise.
      -

    Considerations

    Funds will be stored and released from a multi-sig Safe wallet, with a 3/4 ratio for owners and signers of transactions. The members will consist of 1inch contributors and recognized delegates. 1INCH token rewards (ERC20) will be distributed to community builders at the end of each month in batch transactions.

    @@ -706,7 +717,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp
  • Finalize the community builder program NDA with the legal team.

For the full version of the proposal, please refer to the forum linked below.

-
Show Less...
+
+
+
+Show Less... +
@@ -846,7 +861,9 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -

Author: @DAOplomats.eth

+
+
+

Author: @DAOplomats.eth

Simple-summary

This proposal suggests creating a 6-month trial of a funded Recognised Delegates Programme for 1inchDAO.

Abstract

@@ -884,7 +901,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp

The 1inchDAO should consider building a reputation dashboard so that anyone can track delegates' voting history and performance. A platform such as tally.xyz can also make it easy for potential delegators to delegate their tokens.

In terms of budget, we suggest setting aside 100,000 USDC for the pilot. We suggest using a separate operations multi-sig to administer these expenses. Any unused funds should be returned back to the DAO after the end of the trial period.

-
Show Less...
+
+
+
+Show Less... +
@@ -915,7 +936,9 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -

Author: RoundElephant.eth

+
+
+

Author: RoundElephant.eth

References

@@ -962,7 +985,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp

Governance

In the short term, this proposal will mean a complete cessation of revenue being collected by the DAO treasury. However, by focusing on long-term growth and user satisfaction, the 1inch Network can strengthen its position in the market, potentially leading to increased revenue in the future.

-
Show Less...
+
+
+
+Show Less... +
@@ -993,7 +1020,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -

Author: @DAOplomats.eth (@Baer, @jengajojo)

+
+
+
+
+

Author: @DAOplomats.eth (@Baer, @jengajojo)

Simple-summary

This proposal suggests allocating 1M USDC of the current USDC balance into AAVE V3 to generate passive yield.

Motivation

@@ -1023,7 +1054,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp
  • https://docs.aave.com/developers/deployed-contracts/security-and-audits

    • DAOplomats will monitor the position and provide an update to the DAO regularly

    -
    Show Less...
    +
    +
    +
    +Show Less... +
    @@ -1055,7 +1090,10 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp
    -

    Author:

    +
    +
    +
    +

    Author:

    @RoundElephant

    References:

      @@ -1263,7 +1301,11 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp

      This proposal will have no cost to the 1inch DAO Treasury.

      As opposed to st1INCH(v2), st1INCH(v1) does not require a timelock to participate in governance – a bad actor could use this lack of a time-commitment to abuse the 1inch goverance system. This proposal will prevent that as all votes will only be cast by timelocked tokens.

      Once passed, the reality.eth proposal acceptance criteria, and the 1inch DAO governance documentation, will need to be updated to reflect the change to v1INCH voting weight and the proposal validation strategy.

      -
    Show Less...
    +
    +
    +
    +Show Less... +
    @@ -2255,7 +2297,8 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp {" "} Layer 3 - , which was successful in attracting participants. + + , which was successful in attracting participants.

    Specification

    Contents

    @@ -2490,7 +2533,8 @@ Overall, this proposal presents a strategic opportunity for 1inch Network to amp -

    Author: DAOplomats.eth

    +
    +

    Author: DAOplomats.eth

    #Simple Summary @@ -2739,7 +2783,8 @@ The Governance Doc of 1inch DAO should be updated through a GitHub pull request target="_blank" > here - , but here is a summary. + + , but here is a summary.

    Phase 1 (Discussion) & Phase 2 (1IP formalization) have an open-ended @@ -2932,7 +2977,8 @@ The Governance Doc of 1inch DAO should be updated through a GitHub pull request -

    Author: @Bobbay_stablenode

    +
    +

    Author: @Bobbay_stablenode

    References:

    GitHub - 1inch/erc20-pods 7, GitHub - 1inch/farming 5, @@ -3117,19 +3163,23 @@ The Governance Doc of 1inch DAO should be updated through a GitHub pull request > Treasury - . Once enacted, this proposal will instead swap these tokens to 1INCH - as long as the market price of 1INCH is below the $1.30 to $1.70 range + + as long as the market price of 1INCH is below the $1.30 to $1.70 range (see the Specification section for a detailed explanation). All swaps will - be done using the 1inch Aggregation Protocol - to ensure the best pricing. + + to ensure the best pricing.

    Motivation

    Benefits to the 1inch Network DAO include:

    @@ -3804,4 +3854,4 @@ All 1IPs that did not pass the Phase-4 vote. These 1IPs did not meet the minimum
    - \ No newline at end of file + diff --git a/docusaurus.config.js b/docusaurus.config.js index 02e5b06..ac41f42 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -1,8 +1,8 @@ // @ts-check // Note: type annotations allow type checking and IDEs autocompletion -const lightCodeTheme = require('prism-react-renderer/themes/github'); -const darkCodeTheme = require('prism-react-renderer/themes/dracula'); +// const lightCodeTheme = require('prism-react-renderer/themes/github'); +// const darkCodeTheme = require('prism-react-renderer/themes/dracula'); /** @type {import('@docusaurus/types').Config} */ const config = { @@ -54,32 +54,6 @@ const config = { src: '/img/1inch_logo_without_text.svg', }, items: [ - { - label: 'Protocols', - position: 'left', - items: [ - { - label: 'Aggregation Protocol', - href: '/docs/aggregation-protocol/introduction/', - }, - { - label: 'Fusion Swap', - href: '/docs/fusion-swap/introduction/', - }, - { - label: 'Limit Order Protocol', - href: '/docs/limit-order-protocol/introduction/', - }, - { - label: 'Spot Price Aggregator', - href: '/docs/spot-price-aggregator/introduction/', - }, - { - label: 'RabbitHole', - href: '/docs/rabbithole/summary/', - }, - ], - }, { label: 'Governance', position: 'left', @@ -160,8 +134,8 @@ const config = { contextualSearch: false, }, prism: { - theme: lightCodeTheme, - darkTheme: darkCodeTheme, + // theme: lightCodeTheme, + // darkTheme: darkCodeTheme, additionalLanguages: ['solidity'], }, }), diff --git a/package.json b/package.json index 5fc73e6..567d958 100644 --- a/package.json +++ b/package.json @@ -14,17 +14,17 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@docusaurus/core": "2.1.0", - "@docusaurus/preset-classic": "2.1.0", - "@mdx-js/react": "^1.6.21", + "@docusaurus/core": "^3.4.0", + "@docusaurus/preset-classic": "^3.4.0", + "@mdx-js/react": "^3.0.0", "@svgr/webpack": "^5.5.0", "buffer": "^6.0.3", "clsx": "^1.1.1", "docusaurus-plugin-search-local": "1.0.1", "file-loader": "^6.2.0", - "prism-react-renderer": "^1.2.1", - "react": "^17.0.1", - "react-dom": "^17.0.1", + "prism-react-renderer": "^2.3.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "redoc": "^2.0.0-rc.57", "swagger-ui-react": "4.15.5", "url-loader": "^4.1.1" diff --git a/src/components/homepage-footer/HomepageFooter.js b/src/components/homepage-footer/HomepageFooter.js index 8e9036c..c39827a 100644 --- a/src/components/homepage-footer/HomepageFooter.js +++ b/src/components/homepage-footer/HomepageFooter.js @@ -15,23 +15,6 @@ import FooterLogoImage from '../../../static/img/footer-logo.svg' const FooterLinks = { links: [ - { - title: 'Protocols', - links: [ - { - title: 'Liquidity Protocol', - link: 'https://1inch.io/liquidity-protocol/' - }, - { - title: 'Aggregation Protocol', - link: 'https://1inch.io/aggregation-protocol/' - }, - { - title: 'Limit Order Protocol', - link: 'https://1inch.io/limit-order-protocol/' - } - ] - }, { title: 'Governance', links: [ diff --git a/src/pages/index.js b/src/pages/index.js index 4f59165..0c943bd 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,12 +1,10 @@ import React from 'react'; import styles from './index.module.css'; -import HomepageFeatures from '../components/homepage-features/HomepageFeatures'; import HomepageDeveloperLinks from '../components/homepage-developer-links/HomepageDeveloperLinks'; import HomepageFooter from '../components/homepage-footer/HomepageFooter'; import HomePageBackgroundImage from '../../static/img/logo-background.svg'; import Layout from '@theme/Layout'; import Head from "@docusaurus/core/lib/client/exports/Head"; -import useBaseUrl from "@docusaurus/core/lib/client/exports/useBaseUrl"; import HomepagePreFooter from "../components/homepage-prefooter/HomepagePreFooter"; function HomepageHeader() { @@ -41,9 +39,6 @@ export default function Home() {
    -
    - -