From d7f3cd9f8e0ef3ef37c5f82666224f97777aa09c Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 10:33:29 +0800
Subject: [PATCH 01/20] Create DaoSwap.md

---
 applications/DaoSwap.md | 233 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 233 insertions(+)
 create mode 100644 applications/DaoSwap.md

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
new file mode 100644
index 00000000..892af1ba
--- /dev/null
+++ b/applications/DaoSwap.md
@@ -0,0 +1,233 @@
+# EOS Network Foundation Grant Proposal
+
+- **Project Name:** Vault Protocol
+- **Team Name:** Defibox
+- **EOS Payment Address:** liquid.defi
+- **[Level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels):** 3
+- **Pomelo Grant(s):** https://pomelo.io/grants/vault
+- **Project is Open-Source:** Yes*
+- **Project was part of Token sale:** No
+- **Repository where Project resides:** https://github.com/defiboxswap/DefiboxVault-interface
+> Please only answer Yes or No to the Open-Source or Token sale questions.  Do not explain more on that line.  You may delete this line and all lines that begin with `>` from your application.
+
+## Contact
+
+- **Contact Name:** Raven
+- **Contact Email:** raven@defibox.io
+- **Website:** https://eos.defibox.io/vault
+
+> ⚠️ *The combination of your GitHub account submitting the application and the EOS account address above will be your unique identifier during the program. Please keep them safe.*
+
+
+## Open source - Timelines
+
+**Stage One (completed) "Version Beta v0.1.0"**
+
+> https://github.com/defiboxswap/DefiboxVault-interface
+
+- [x] Includes *.hpp interface
+- [x] Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [x] General documentation README.md
+- [x] Protocol Design (diagram)
+
+**Stage Two (not completed)**
+
+- [ ] Protocol Design Definition (translated in English/Korean/Chinese)
+- [ ] SC development (production)
+- [ ] User documentation
+- [ ] Automatic Contracts Tests
+
+**Stage Three (re-evaluation 2nd Security Audit from Certik) “Version v1.0.0”**
+
+- [ ] All smart contract source code will be made available (*.cpp)
+
+## Project Overview
+
+> If this is an application for a follow-up grant (the continuation of an earlier, successful ENF grant), please provide name and/or pull request of said grant on the first line of this section.
+
+### Overview
+
+> Please provide the following:
+
+- **Name:** Vault, a decentralized single-token staking protocol
+- **Brief Description:** The Vault protocol is the first single-token lossless yield protocol launched by Defibox. Users can earn corresponding token income by depositing tokens. The assets can be flexibly deposited and withdrawn with open and transparent on chain data. Vault income mainly comes from Defibox protocol income, Yield+ rewards, BP income, REX income, etc. At the same time, in order to improve the utility, the protocol will issue a standard EOS token called sToken, which represents a deposit certificate. sToken can be used in multiple DeFi protocols to obtain more benefits.
+- **Relationship to EOSIO:** a public use that provides a variety of staking strategies to EOS users and project teams for more yields. Code will be open source for contribution to EOSIO repository.
+- **Reason for Interest:** It provides a variety of staking strategies to EOS users and project teams for more yields. It will brings TVL and income to Defibox team while giving benefits to participants. Ecosystem Boost: attract inactive EOS tokens which will prosper ecosystem
+
+
+### Ecosystem Fit
+
+> Help us locate your project in the EOSIO landscape and what problems it tries to solve by answering each of these questions:
+
+- Where and how does your project fit into the ecosystem? 
+Users can earn corresponding token income by depositing tokens. The assets can be flexibly deposited and withdrawn with open and transparent on chain data. Vault income mainly comes from Defibox protocol income, Yield+ rewards, BP income, REX income, etc. At the same time, in order to improve the utility, the protocol will issue a standard EOS token called sToken, which represents a deposit certificate. sToken can be used in multiple DeFi protocols to obtain more benefits.
+
+- Who is your target audience (chain/dapp/wallet/UI developers, designers, your own user base, some dapp's userbase, yourself)? 
+EOS users including any dapp user and project teams
+
+- What need(s) does your project meet?
+For generating yield and income when holding EOS
+
+- Are there any other projects similar to yours in the EOSIO ecosystem?
+Yes, BSS from Defibox
+  
+  - If so, how is your project different?
+Vault is widely supporting all the users on EOS while BSS is only available for Defibox users who have BOX tokens.
+
+## Team
+
+### Team members：16
+
+- **Team Leader:** Eason
+
+
+### Legal Structure
+- **Registered Legal Entity:** METABOXTECHNOLOGYPTE.LTD.
+- **Registered Address:** 160 ROBINSONROAD #14-04 SINGAPORE (068914)
+
+### Team Experience
+
+> Please describe the team's relevant experience. If your project involves development work, we would appreciate it if you singled out a few interesting projects or contributions made by team members in the past. For research-related grants, references to past publications and projects in a related domain are helpful. If you applied for a Pomelo grant in the past, please be sure you listed them in the section above and mention them in detail in this section.
+Defibox team is a full-time team that covers front-end, back-end, contract, operations, testing, and business on EOS, WAX and BSC. We have developed Swap, USN, Lending and many other DeFi protocols on EOS. We have been the leading DeFi on EOS in terms of TVL and running safely over 2 years. Besides this, we also co-developed major projects like Yield+ portal, etc.
+
+> If anyone on your team has applied for a grant at the EOS Network Foundation previously, please list the name of the project and legal entity here.
+
+
+### Team Org Repos
+
+https://github.com/defiboxswap
+
+
+> Please also provide the GitHub accounts of all team members. If they contain no activity, references to projects hosted elsewhere or live are also fine.
+
+
+
+### Milestone Summary
+
+- **Total Estimated Duration:** 3 months (remaining 3 weeks)
+- **Full-Time Equivalent (FTE):** 5 FTE
+- **Total Costs:** 80,000 USD
+
+- **Deliverables:**
+
+ | Deliverable      | Status    | Cost    |
+ | ---------- | :-----------:  | :-----------: |
+ | Protocol Design - Diagram     | Completed     | $3,000     |
+ | Protocol Design - Definitions (EN/KO/CN)     | Not completed     | $5,000     |
+ | SC development (prototype)     | Completed     | $12,000     |
+ | SC development (production)     | Not completed     | $12,000     |
+ | Developer documentation     | Completed     | $4,000     |
+ | User documentation     | Not completed     | $6,000     |
+ | Automatic Contracts Tests     | Not completed     | $14,000     |
+ | Certik Audit     | Completed     | $24,000     |
+
+
+## Additional Information
+
+**How did you hear about the Grants Program?** EOS Network Foundation Website
+
+
+------------------------------------------------------------------------------------------------------------------------------
+
+
+
+# Chinese Translation 中文翻译
+
+- **项目名称：**  金库协议 (Vault)
+- **团队名称：**  Defibox
+- **EOS支付地址：**  liquid.defi
+- **等级：** 3
+- **Pomelo资助：** https://pomelo.io/grants/vault
+- **项目是开源的：** 是*
+- **项目是代币销售的一部分：** 否
+- **项目资源库：** https://github.com/defiboxswap/DefiboxVault-interface
+
+### 联系人
+- **联系人姓名：** Raven
+- **联系邮箱：** raven@defibox.io
+- **网站：** https://eos.defibox.io/vault
+
+## 开源 - 时间表
+
+**第一阶段（已完成）“Beta 版 v0.1.0”**
+
+> https://github.com/defiboxswap/DefiboxVault-interface
+
+- [x] 包括 *.hpp 接口
+- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
+- [x] 通用文档 README.md
+- [x] 协议设计（图表）
+
+**第二阶段（未完成）**
+
+- [ ] 协议设计定义（翻译成英文/韩文/中文）
+- [ ] SC 开发（生产）
+- [ ] 用户文档
+- [ ] 自动合约测试
+
+**第三阶段（Certik 重新评估第二次安全审计）“版本 v1.0.0”**
+
+- [ ] 将提供所有智能合约源代码 (*.cpp)
+
+### 项目概况
+**概述**
+- **名称：金库协议**
+
+- **简介：** Vault协议是Defibox推出的第一个单代币无损收益协议。用户可以通过存入代币获得相应的代币收益。资产可灵活存取，链上数据公开透明。 Vault收益主要来自Defibox协议收益、Yield+奖励、BP收益、REX收益等。同时，为了提高效用，协议会发行一个标准的EOS代币sToken，代表存单。 sToken 可以在多种 DeFi 协议中使用以获得更多收益。
+- **与EOSIO的关系：** 一种公共设施，为 EOS用户和项目团队提供各种质押策略以获得更多收益，并提供开源，这将有助于EOSIO代码资源库。
+- **感兴趣的原因：** 它为 EOS 用户和项目团队提供了多种质押策略以获得更多收益。它将为 Defibox 团队带来锁仓量和收入，同时让参与者受益。生态系统提升：吸引不活跃的EOS代币，这将繁荣生态系统。
+
+
+### 生态系统
+- **您的项目在哪里以及如何融入生态系统？**
+-用户可以通过存入代币获得相应的代币收益。资产可灵活存取，链上数据公开透明。 Valut收益主要来自Defibox协议收益、Yield+奖励、BP收益、REX收益等。同时，为了提高效用，协议会发行一个标准的EOS代币sToken，代表存单。 sToken可以在多种DeFi协议中使用以获得更多收益。
+
+- **谁是你的目标受众（链/dapp/钱包/UI 开发人员、设计师、你自己的用户群、一些 dapp 的用户群、你自己）？**
+-EOS 用户，包括任何dapp用户和项目团队
+
+- **您的项目满足什么需求？**
+-持有EOS用于产生收益和收入
+
+- **在EOSIO生态系统中还有其他类似的项目吗？**
+-有，类似项目有Defibox的BSS
+
+- **如果是这样，您的项目有何不同？**
+-Vault广泛支持EOS上的所有用户，而BSS仅适用于拥有BOX代币的Defibox用户。
+
+### 团队
+- **团队成员：** 16
+- **团队负责人：** Eason
+
+**法律结构**
+- **注册法律实体：** METABOXTECHNOLOGYPTE.LTD.
+- **注册地址：** 160 ROBINSONROAD #14-04 SINGAPORE (068914)
+
+**团队经验**
+-Defibox是一只涵盖EOS、WAX、BSC上前端、后端、合约、运营、测试、商务的专业团队。我们在EOS上开发了Swap、USN、Lending 和许多其他 DeFi 协议。就锁仓量而言，我们一直是EOS上领先的DeFi，并且安全运行了 2 年多。 除此之外，我们还共同开发了Yield+等重大项目。
+
+**团队组织**
+-https://github.com/defiboxswap
+
+
+**里程碑总结**
+- **总预计持续时间：**3 个月 （剩余3周）
+- **全职当量 (FTE)：**5 FTE
+- **总成本：** 80,000 美元
+
+- **可交付成果：**
+ 
+ | 可交付成果      | 状态    | 成本    |
+ | ---------- | :-----------:  | :-----------: |
+ | 协议设计 - 原型图     | 完成     | $3,000     |
+ | 协议设计 - 原型图（中/英/韩）    | 未完成     | $5,000     |
+ | 智能合约开发（原型）     | 完成     | $12,000     |
+ | 智能合约开发（生产）    | 未完成     | $12,000     |
+ | 开发者文档     | 完成     | $4,000     |
+ | 用户文档     | 未完成     | $6,000     |
+ | 自动合约测试     | 未完成     | $14,000     |
+ | Certik审计     | 完成     | $24,000     |
+
+
+**附加信息**
+
+**您是如何得知赠款计划的？：** EOS网络基金会网站

From dc695bd3961cbfae77b957b602f3965a5fc303f4 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 10:40:56 +0800
Subject: [PATCH 02/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 892af1ba..c3723e1a 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -133,19 +133,19 @@ https://github.com/defiboxswap
 
 # Chinese Translation 中文翻译
 
-- **项目名称：**  金库协议 (Vault)
-- **团队名称：**  Defibox
-- **EOS支付地址：**  liquid.defi
+- **项目名称：**  DaoSwap
+- **团队名称：**  MIXD
+- **EOS支付地址：**  daoyieldoooo
 - **等级：** 3
 - **Pomelo资助：** https://pomelo.io/grants/vault
 - **项目是开源的：** 是*
 - **项目是代币销售的一部分：** 否
-- **项目资源库：** https://github.com/defiboxswap/DefiboxVault-interface
+- **项目资源库：** https://github.com/eosdaoswap/daoswapooooo
 
 ### 联系人
-- **联系人姓名：** Raven
-- **联系邮箱：** raven@defibox.io
-- **网站：** https://eos.defibox.io/vault
+- **联系人姓名：** Smith.Di
+- **联系邮箱：** uabcontafed@gmail.com
+- **网站：** https://swapdao.app
 
 ## 开源 - 时间表
 

From 45be893ee482b4a2c015f9080e91b6dfb9cc851d Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 10:49:02 +0800
Subject: [PATCH 03/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index c3723e1a..e8110991 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -140,7 +140,7 @@ https://github.com/defiboxswap
 - **Pomelo资助：** https://pomelo.io/grants/vault
 - **项目是开源的：** 是*
 - **项目是代币销售的一部分：** 否
-- **项目资源库：** https://github.com/eosdaoswap/daoswapooooo
+- **项目资源库：** https://github.com/eosdaoswap
 
 ### 联系人
 - **联系人姓名：** Smith.Di
@@ -151,7 +151,7 @@ https://github.com/defiboxswap
 
 **第一阶段（已完成）“Beta 版 v0.1.0”**
 
-> https://github.com/defiboxswap/DefiboxVault-interface
+> https://github.com/eosdaoswap/daoswapooooo
 
 - [x] 包括 *.hpp 接口
 - [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）

From eba53cacacfbb5d8ccbece1e5b1d743e13a9631a Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 15:38:51 +0800
Subject: [PATCH 04/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 79 +++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index e8110991..194d6c0b 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -134,10 +134,10 @@ https://github.com/defiboxswap
 # Chinese Translation 中文翻译
 
 - **项目名称：**  DaoSwap
-- **团队名称：**  MIXD
+- **团队名称：**  MIXDAO
 - **EOS支付地址：**  daoyieldoooo
 - **等级：** 3
-- **Pomelo资助：** https://pomelo.io/grants/vault
+- **Pomelo资助：** https://pomelo.io/grants/redpacket123
 - **项目是开源的：** 是*
 - **项目是代币销售的一部分：** 否
 - **项目资源库：** https://github.com/eosdaoswap
@@ -149,38 +149,41 @@ https://github.com/defiboxswap
 
 ## 开源 - 时间表
 
-**第一阶段（已完成）“Beta 版 v0.1.0”**
+**第一阶段（已完成）“daoswap项目”**
 
 > https://github.com/eosdaoswap/daoswapooooo
 
-- [x] 包括 *.hpp 接口
+- [x] 提供daoswap项目智能合约源代码 接口
 - [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
 - [x] 通用文档 README.md
-- [x] 协议设计（图表）
+- [x] 合约审计
 
-**第二阶段（未完成）**
+**第二阶段（未完成）“柚子红包项目”**
 
-- [ ] 协议设计定义（翻译成英文/韩文/中文）
-- [ ] SC 开发（生产）
-- [ ] 用户文档
-- [ ] 自动合约测试
+- [x] 提供柚子红包项目智能合约源代码 接口
+- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
+- [x] 通用文档 README.md
+- [x] 合约审计
 
-**第三阶段（Certik 重新评估第二次安全审计）“版本 v1.0.0”**
+**第三阶段（未完成）“匿名银行项目”**
 
-- [ ] 将提供所有智能合约源代码 (*.cpp)
+- [x] 提供匿名银行项目智能合约源代码 接口
+- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
+- [x] 通用文档 README.md
+- [x] 合约审计
 
 ### 项目概况
 **概述**
-- **名称：金库协议**
+- **名称：DaoSwap**
 
-- **简介：** Vault协议是Defibox推出的第一个单代币无损收益协议。用户可以通过存入代币获得相应的代币收益。资产可灵活存取，链上数据公开透明。 Vault收益主要来自Defibox协议收益、Yield+奖励、BP收益、REX收益等。同时，为了提高效用，协议会发行一个标准的EOS代币sToken，代表存单。 sToken 可以在多种 DeFi 协议中使用以获得更多收益。
-- **与EOSIO的关系：** 一种公共设施，为 EOS用户和项目团队提供各种质押策略以获得更多收益，并提供开源，这将有助于EOSIO代码资源库。
-- **感兴趣的原因：** 它为 EOS 用户和项目团队提供了多种质押策略以获得更多收益。它将为 Defibox 团队带来锁仓量和收入，同时让参与者受益。生态系统提升：吸引不活跃的EOS代币，这将繁荣生态系统。
+- **简介：** DaoSwap是一个去中心化的项目平台，为EOS用户和项目团队提供多种服务，比如交易、挖矿、理财、注册账号、购买CPU、购买内存、免资源转账、发红包、匿名银行、NFT交易等功能；其中匿名银行和柚子红包是其创新的项目，比如发红包是中国人社交的重要行为，通过发红包可以有效提高用户活跃度，而柚子红包是柚子上第一个红包DAPP，为EOS的应用探索做出努力，拓展了EOS的智能合约以及NFT应用范围，它借鉴微信红包的思想，把其功能在区块链上进行了一个实现。由于EOS的丝滑交易状态使得在区块链上抢红包的效果媲美在微信上抢红包。我们抢红包技术拥有广泛的可用性，未来技术成熟以后会开源给社区，让所有有抢红包需求的dapp 可以利用这个技术进行特制的抢红包服务。而匿名银行，我们开发匿名智能合约，通过加一层额外的匿名性和隐私性来实现这一目标，使得用户交易不可追踪，达到保护用户隐私的效果。我们的隐私转账技术拥有广泛的可用性，未来技术成熟以后会开源给社区，让所有有隐私转账需求的dapp 可以利用这个技术进行特制的隐私服务升级；
+- **与EOSIO的关系：** 一种公共设施，为 EOS用户和项目团队提供更多的服务，并提供多种交互以获得更多收益，并提供开源，这将有助于EOSIO代码资源库。
+- **感兴趣的原因：** 它为 EOS 用户和项目团队提供了更多的服务以获得更多收益。它将为 MIXDAO 团队带来锁仓量和收入，同时让参与者受益。生态系统提升：吸引不活跃的EOS代币，这将繁荣生态系统。
 
 
 ### 生态系统
 - **您的项目在哪里以及如何融入生态系统？**
--用户可以通过存入代币获得相应的代币收益。资产可灵活存取，链上数据公开透明。 Valut收益主要来自Defibox协议收益、Yield+奖励、BP收益、REX收益等。同时，为了提高效用，协议会发行一个标准的EOS代币sToken，代表存单。 sToken可以在多种DeFi协议中使用以获得更多收益。
+-为项目团队提供柚子红包、匿名银行、做市挖矿等服务，不需要项目团队重复开发直接开箱即用，对EOS用户提供柚子红包，匿名银行、做市挖矿、注册账号、购买CPU、免资源转账等服务，让EOS用户一站式体验多种EOS交互体验。
 
 - **谁是你的目标受众（链/dapp/钱包/UI 开发人员、设计师、你自己的用户群、一些 dapp 的用户群、你自己）？**
 -EOS 用户，包括任何dapp用户和项目团队
@@ -189,44 +192,50 @@ https://github.com/defiboxswap
 -持有EOS用于产生收益和收入
 
 - **在EOSIO生态系统中还有其他类似的项目吗？**
--有，类似项目有Defibox的BSS
+-无
 
 - **如果是这样，您的项目有何不同？**
--Vault广泛支持EOS上的所有用户，而BSS仅适用于拥有BOX代币的Defibox用户。
+-无
 
 ### 团队
-- **团队成员：** 16
-- **团队负责人：** Eason
+- **团队成员：** 12
+- **团队负责人：** rowney
 
 **法律结构**
-- **注册法律实体：** METABOXTECHNOLOGYPTE.LTD.
-- **注册地址：** 160 ROBINSONROAD #14-04 SINGAPORE (068914)
+- **注册法律实体：** .
+- **注册地址：** 
 
 **团队经验**
--Defibox是一只涵盖EOS、WAX、BSC上前端、后端、合约、运营、测试、商务的专业团队。我们在EOS上开发了Swap、USN、Lending 和许多其他 DeFi 协议。就锁仓量而言，我们一直是EOS上领先的DeFi，并且安全运行了 2 年多。 除此之外，我们还共同开发了Yield+等重大项目。
+-DaoSwap是EOS生态上两个发展超过2年时间的DAO组织PKDAO和木瓜社区联合开发的产物，正是因为有了DAO与DAO之间的整合，所以我们称融合后的新组织为MIX-DAO，它还可以融合更多的社区和项目进来。MIXD从一开始就不会属于任何一个技术团队或DAO组织，它属于每名DEX的真实用户。
 
 **团队组织**
--https://github.com/defiboxswap
+-https://github.com/eosdaoswap
 
 
 **里程碑总结**
 - **总预计持续时间：**3 个月 （剩余3周）
 - **全职当量 (FTE)：**5 FTE
-- **总成本：** 80,000 美元
+- **总成本：** 50,000 美元
 
 - **可交付成果：**
  
  | 可交付成果      | 状态    | 成本    |
  | ---------- | :-----------:  | :-----------: |
- | 协议设计 - 原型图     | 完成     | $3,000     |
- | 协议设计 - 原型图（中/英/韩）    | 未完成     | $5,000     |
- | 智能合约开发（原型）     | 完成     | $12,000     |
- | 智能合约开发（生产）    | 未完成     | $12,000     |
- | 开发者文档     | 完成     | $4,000     |
- | 用户文档     | 未完成     | $6,000     |
- | 自动合约测试     | 未完成     | $14,000     |
- | Certik审计     | 完成     | $24,000     |
-
+ | DAOSWAP智能合约开发（原型）     | 完成     | $12,000     |
+ | DAOSWAP智能合约开发（生产）    | 未完成     | $12,000     |
+ | DAOSWAP开发者文档     | 完成     | $4,000     |
+ | DAOSWAP用户文档     | 未完成     | $6,000     |
+ | DAOSWAP审计     | 完成     | $8,500     |
+ | 柚子红包智能合约开发（原型）     | 完成     | $12,000     |
+ | 柚子红包智能合约开发（生产）    | 未完成     | $12,000     |
+ | 柚子红包开发者文档     | 完成     | $4,000     |
+ | 柚子红包用户文档     | 未完成     | $6,000     |
+ | 柚子红包审计     | 完成     | $8,500     |
+ | 匿名银行智能合约开发（原型）     | 完成     | $12,000     |
+ | 匿名银行智能合约开发（生产）    | 未完成     | $12,000     |
+ | 匿名银行开发者文档     | 完成     | $4,000     |
+ | 匿名银行用户文档     | 未完成     | $6,000     |
+ | 匿名银行审计     | 完成     | $8,500     |
 
 **附加信息**
 

From 28be2f96164e5a693f65fdb30c00b2fde97c97f4 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 15:41:53 +0800
Subject: [PATCH 05/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 194d6c0b..2310c54a 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -222,20 +222,20 @@ https://github.com/defiboxswap
  | 可交付成果      | 状态    | 成本    |
  | ---------- | :-----------:  | :-----------: |
  | DAOSWAP智能合约开发（原型）     | 完成     | $12,000     |
- | DAOSWAP智能合约开发（生产）    | 未完成     | $12,000     |
- | DAOSWAP开发者文档     | 完成     | $4,000     |
+ | DAOSWAP智能合约开发（生产）    | 完成     | $12,000     |
+ | DAOSWAP开发者文档     | 未完成     | $4,000     |
  | DAOSWAP用户文档     | 未完成     | $6,000     |
  | DAOSWAP审计     | 完成     | $8,500     |
  | 柚子红包智能合约开发（原型）     | 完成     | $12,000     |
- | 柚子红包智能合约开发（生产）    | 未完成     | $12,000     |
- | 柚子红包开发者文档     | 完成     | $4,000     |
+ | 柚子红包智能合约开发（生产）    | 完成     | $12,000     |
+ | 柚子红包开发者文档     | 未完成     | $4,000     |
  | 柚子红包用户文档     | 未完成     | $6,000     |
- | 柚子红包审计     | 完成     | $8,500     |
+ | 柚子红包审计     | 未完成     | $8,500     |
  | 匿名银行智能合约开发（原型）     | 完成     | $12,000     |
- | 匿名银行智能合约开发（生产）    | 未完成     | $12,000     |
- | 匿名银行开发者文档     | 完成     | $4,000     |
+ | 匿名银行智能合约开发（生产）    | 完成     | $12,000     |
+ | 匿名银行开发者文档     | 未完成     | $4,000     |
  | 匿名银行用户文档     | 未完成     | $6,000     |
- | 匿名银行审计     | 完成     | $8,500     |
+ | 匿名银行审计     | 未完成     | $8,500     |
 
 **附加信息**
 

From a9d865e820ed98160d4d519beb2a0f60283c0cbc Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 15:49:24 +0800
Subject: [PATCH 06/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 2310c54a..43538d82 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -202,8 +202,8 @@ https://github.com/defiboxswap
 - **团队负责人：** rowney
 
 **法律结构**
-- **注册法律实体：** .
-- **注册地址：** 
+- **注册法律实体：** 海南粉红梦幻投资有限公司
+- **注册地址：** 海南省海口市琼山区振发一横路金科嘉园D栋623
 
 **团队经验**
 -DaoSwap是EOS生态上两个发展超过2年时间的DAO组织PKDAO和木瓜社区联合开发的产物，正是因为有了DAO与DAO之间的整合，所以我们称融合后的新组织为MIX-DAO，它还可以融合更多的社区和项目进来。MIXD从一开始就不会属于任何一个技术团队或DAO组织，它属于每名DEX的真实用户。
@@ -213,28 +213,28 @@ https://github.com/defiboxswap
 
 
 **里程碑总结**
-- **总预计持续时间：**3 个月 （剩余3周）
-- **全职当量 (FTE)：**5 FTE
-- **总成本：** 50,000 美元
+- **总预计持续时间：**4 个月 
+- **全职当量 (FTE)：**6 FTE
+- **总成本：** 90,000 美元
 
 - **可交付成果：**
  
  | 可交付成果      | 状态    | 成本    |
  | ---------- | :-----------:  | :-----------: |
- | DAOSWAP智能合约开发（原型）     | 完成     | $12,000     |
- | DAOSWAP智能合约开发（生产）    | 完成     | $12,000     |
- | DAOSWAP开发者文档     | 未完成     | $4,000     |
- | DAOSWAP用户文档     | 未完成     | $6,000     |
+ | DAOSWAP智能合约开发（原型）     | 完成     | $8,000     |
+ | DAOSWAP智能合约开发（生产）    | 完成     | $8,000     |
+ | DAOSWAP开发者文档     | 未完成     | $3,000     |
+ | DAOSWAP用户文档     | 未完成     | $2,500     |
  | DAOSWAP审计     | 完成     | $8,500     |
- | 柚子红包智能合约开发（原型）     | 完成     | $12,000     |
- | 柚子红包智能合约开发（生产）    | 完成     | $12,000     |
- | 柚子红包开发者文档     | 未完成     | $4,000     |
- | 柚子红包用户文档     | 未完成     | $6,000     |
+ | 柚子红包智能合约开发（原型）     | 完成     | $8,000     |
+ | 柚子红包智能合约开发（生产）    | 完成     | $8,000     |
+ | 柚子红包开发者文档     | 未完成     | $3,000     |
+ | 柚子红包用户文档     | 未完成     | $2,500     |
  | 柚子红包审计     | 未完成     | $8,500     |
- | 匿名银行智能合约开发（原型）     | 完成     | $12,000     |
- | 匿名银行智能合约开发（生产）    | 完成     | $12,000     |
- | 匿名银行开发者文档     | 未完成     | $4,000     |
- | 匿名银行用户文档     | 未完成     | $6,000     |
+ | 匿名银行智能合约开发（原型）     | 完成     | $8,000     |
+ | 匿名银行智能合约开发（生产）    | 完成     | $8,000     |
+ | 匿名银行开发者文档     | 未完成     | $3,000     |
+ | 匿名银行用户文档     | 未完成     | $2,500     |
  | 匿名银行审计     | 未完成     | $8,500     |
 
 **附加信息**

From d0d68b706de4d5b01998c48c679c701ac7e7d33a Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 16:08:57 +0800
Subject: [PATCH 07/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 43538d82..2f804c54 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -133,11 +133,11 @@ https://github.com/defiboxswap
 
 # Chinese Translation 中文翻译
 
-- **项目名称：**  DaoSwap
-- **团队名称：**  MIXDAO
+- **项目名称：**  PINK粉红梦庄园（PINK）
+- **团队名称：**  PKDAO
 - **EOS支付地址：**  daoyieldoooo
 - **等级：** 3
-- **Pomelo资助：** https://pomelo.io/grants/redpacket123
+- **Pomelo资助：** https://pomelo.io/grants/pinkertoken
 - **项目是开源的：** 是*
 - **项目是代币销售的一部分：** 否
 - **项目资源库：** https://github.com/eosdaoswap
@@ -206,7 +206,7 @@ https://github.com/defiboxswap
 - **注册地址：** 海南省海口市琼山区振发一横路金科嘉园D栋623
 
 **团队经验**
--DaoSwap是EOS生态上两个发展超过2年时间的DAO组织PKDAO和木瓜社区联合开发的产物，正是因为有了DAO与DAO之间的整合，所以我们称融合后的新组织为MIX-DAO，它还可以融合更多的社区和项目进来。MIXD从一开始就不会属于任何一个技术团队或DAO组织，它属于每名DEX的真实用户。
+-PKDAO是粉红梦庄园项目的DAO组织，在EOS生态上运营了3年，一直致力于EOS生态公共产品的开发与创新，是目前EOS链最活跃的团体之一。
 
 **团队组织**
 -https://github.com/eosdaoswap
@@ -215,24 +215,24 @@ https://github.com/defiboxswap
 **里程碑总结**
 - **总预计持续时间：**4 个月 
 - **全职当量 (FTE)：**6 FTE
-- **总成本：** 90,000 美元
+- **总成本：** 80,000 美元
 
 - **可交付成果：**
  
  | 可交付成果      | 状态    | 成本    |
  | ---------- | :-----------:  | :-----------: |
- | DAOSWAP智能合约开发（原型）     | 完成     | $8,000     |
+ | DAOSWAP智能合约开发（原型）     | 完成     | $6,000     |
  | DAOSWAP智能合约开发（生产）    | 完成     | $8,000     |
  | DAOSWAP开发者文档     | 未完成     | $3,000     |
  | DAOSWAP用户文档     | 未完成     | $2,500     |
  | DAOSWAP审计     | 完成     | $8,500     |
- | 柚子红包智能合约开发（原型）     | 完成     | $8,000     |
- | 柚子红包智能合约开发（生产）    | 完成     | $8,000     |
+ | 柚子红包智能合约开发（原型）     | 完成     | $6,000     |
+ | 柚子红包智能合约开发（生产）    | 完成     | $6,000     |
  | 柚子红包开发者文档     | 未完成     | $3,000     |
  | 柚子红包用户文档     | 未完成     | $2,500     |
  | 柚子红包审计     | 未完成     | $8,500     |
- | 匿名银行智能合约开发（原型）     | 完成     | $8,000     |
- | 匿名银行智能合约开发（生产）    | 完成     | $8,000     |
+ | 匿名银行智能合约开发（原型）     | 完成     | $6,000     |
+ | 匿名银行智能合约开发（生产）    | 完成     | $6,000     |
  | 匿名银行开发者文档     | 未完成     | $3,000     |
  | 匿名银行用户文档     | 未完成     | $2,500     |
  | 匿名银行审计     | 未完成     | $8,500     |

From 3d172cdaa525f75cdb2a8671b89fb5d617c848eb Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 16:37:34 +0800
Subject: [PATCH 08/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 2f804c54..14740da3 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -134,7 +134,7 @@ https://github.com/defiboxswap
 # Chinese Translation 中文翻译
 
 - **项目名称：**  PINK粉红梦庄园（PINK）
-- **团队名称：**  PKDAO
+- **团队名称：**  MIXDAO
 - **EOS支付地址：**  daoyieldoooo
 - **等级：** 3
 - **Pomelo资助：** https://pomelo.io/grants/pinkertoken
@@ -206,7 +206,7 @@ https://github.com/defiboxswap
 - **注册地址：** 海南省海口市琼山区振发一横路金科嘉园D栋623
 
 **团队经验**
--PKDAO是粉红梦庄园项目的DAO组织，在EOS生态上运营了3年，一直致力于EOS生态公共产品的开发与创新，是目前EOS链最活跃的团体之一。
+-MIXDAO是粉红梦庄园项目的DAO组织，在EOS生态上运营了3年，一直致力于EOS生态公共产品的开发与创新，是目前EOS链最活跃的团体之一，定期开展腾讯会议来宣传EOS生态。
 
 **团队组织**
 -https://github.com/eosdaoswap

From 4c9fd158d88e84f913ae1161f20c7892bd21e938 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 16:57:46 +0800
Subject: [PATCH 09/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 94 +++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 41 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 14740da3..137fe0eb 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -1,20 +1,20 @@
 # EOS Network Foundation Grant Proposal
 
-- **Project Name:** Vault Protocol
-- **Team Name:** Defibox
-- **EOS Payment Address:** liquid.defi
+- **Project Name:** PINK Pink Dream Estate (PINK)
+- **Team Name:** MIXDAO
+- **EOS Payment Address:** daoyieldoooo
 - **[Level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels):** 3
-- **Pomelo Grant(s):** https://pomelo.io/grants/vault
+- **Pomelo Grant(s):** https://pomelo.io/grants/pinkertoken
 - **Project is Open-Source:** Yes*
 - **Project was part of Token sale:** No
-- **Repository where Project resides:** https://github.com/defiboxswap/DefiboxVault-interface
+- **Repository where Project resides:** https://github.com/eosdaoswap
 > Please only answer Yes or No to the Open-Source or Token sale questions.  Do not explain more on that line.  You may delete this line and all lines that begin with `>` from your application.
 
 ## Contact
 
-- **Contact Name:** Raven
-- **Contact Email:** raven@defibox.io
-- **Website:** https://eos.defibox.io/vault
+- **Contact Name:** Smith.Di
+- **Contact Email:** uabcontafed@gmail.com
+- **Website:** https://swapdao.app
 
 > ⚠️ *The combination of your GitHub account submitting the application and the EOS account address above will be your unique identifier during the program. Please keep them safe.*
 
@@ -23,23 +23,25 @@
 
 **Stage One (completed) "Version Beta v0.1.0"**
 
-> https://github.com/defiboxswap/DefiboxVault-interface
-
-- [x] Includes *.hpp interface
+> https://github.com/eosdaoswap/daoswapooooo
+- [x] "DaoSwap" smart contract source code will be made available (*.cpp)
 - [x] Prebuilt WASM binaries *.wasm & *.abi (with version control)
 - [x] General documentation README.md
-- [x] Protocol Design (diagram)
+- [x] Contract audit
 
 **Stage Two (not completed)**
 
-- [ ] Protocol Design Definition (translated in English/Korean/Chinese)
-- [ ] SC development (production)
-- [ ] User documentation
-- [ ] Automatic Contracts Tests
+- [ ] “Red Envelope” smart contract source code will be made available (*.cpp)
+- [ ] Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [ ] General documentation README.md
+- [ ] Contract audit
 
-**Stage Three (re-evaluation 2nd Security Audit from Certik) “Version v1.0.0”**
+**Stage Three (not completed) **
 
-- [ ] All smart contract source code will be made available (*.cpp)
+- [ ] “Anonymous Bank” smart contract source code will be made available (*.cpp)
+- [ ] Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [ ] General documentation README.md
+- [ ] Contract audit
 
 ## Project Overview
 
@@ -49,10 +51,12 @@
 
 > Please provide the following:
 
-- **Name:** Vault, a decentralized single-token staking protocol
-- **Brief Description:** The Vault protocol is the first single-token lossless yield protocol launched by Defibox. Users can earn corresponding token income by depositing tokens. The assets can be flexibly deposited and withdrawn with open and transparent on chain data. Vault income mainly comes from Defibox protocol income, Yield+ rewards, BP income, REX income, etc. At the same time, in order to improve the utility, the protocol will issue a standard EOS token called sToken, which represents a deposit certificate. sToken can be used in multiple DeFi protocols to obtain more benefits.
-- **Relationship to EOSIO:** a public use that provides a variety of staking strategies to EOS users and project teams for more yields. Code will be open source for contribution to EOSIO repository.
-- **Reason for Interest:** It provides a variety of staking strategies to EOS users and project teams for more yields. It will brings TVL and income to Defibox team while giving benefits to participants. Ecosystem Boost: attract inactive EOS tokens which will prosper ecosystem
+- **Name:** DaoSwap
+- **Brief Description:** DaoSwap is a decentralized project platform that provides EOS users and project teams with various services, such as trading, mining, wealth management, account registration, CPU purchase, memory purchase, resource free transfer, red envelope sending, anonymous banking, NFT trading, and other functions; Among them, anonymous banks and pomelo red envelopes are their innovative projects. For example, sending red envelopes is an important social behavior of Chinese people, which can effectively improve user activity. pomelo red envelopes are the first red envelope DAPP on pomelo, making efforts to explore the application of EOS and expanding the scope of EOS's smart contracts and NFT applications. It draws on the idea of WeChat red envelopes and implements its functions on the blockchain. Due to the smooth trading status of EOS, the effect of grabbing red envelopes on blockchain is comparable to grabbing red envelopes on WeChat. Our red envelope grabbing technology has a wide range of usability. In the future, when the technology matures, it will be open source to the community, allowing all DAPPs with red envelope grabbing needs to use this technology for customized red envelope grabbing services. For anonymous banks, we develop anonymous smart contracts to achieve this goal by adding an additional layer of anonymity and privacy, making user transactions untraceable and protecting user privacy. Our privacy transfer technology has wide availability and will be open source to the community when the technology matures in the future, allowing all DAPPs with privacy transfer needs to use this technology for customized privacy service upgrades.
+- **Relationship to EOSIO:** A public facility that provides more services for EOS users and project teams, provides multiple interactions to generate more revenue, and provides open source, which will contribute to the EOSIO code repository.
+- **Reason for Interest:** It provides more services for EOS users and project teams to generate more revenue. It will bring lock-in volume and revenue to the MIXDAO team, while benefiting participants. Ecosystem improvement: attract inactive EOS tokens, which will prosper the ecosystem.
+
+
 
 
 ### Ecosystem Fit
@@ -60,7 +64,7 @@
 > Help us locate your project in the EOSIO landscape and what problems it tries to solve by answering each of these questions:
 
 - Where and how does your project fit into the ecosystem? 
-Users can earn corresponding token income by depositing tokens. The assets can be flexibly deposited and withdrawn with open and transparent on chain data. Vault income mainly comes from Defibox protocol income, Yield+ rewards, BP income, REX income, etc. At the same time, in order to improve the utility, the protocol will issue a standard EOS token called sToken, which represents a deposit certificate. sToken can be used in multiple DeFi protocols to obtain more benefits.
+Provide project teams with services such as pomelo red envelopes, anonymous banking, and market mining, without the need for repeated development by the project team. Provide EOS users with pomelo red envelopes, anonymous banking, market mining, account registration, CPU purchase, and resource free transfer services, allowing EOS users to experience multiple EOS interactive experiences in a one-stop manner.
 
 - Who is your target audience (chain/dapp/wallet/UI developers, designers, your own user base, some dapp's userbase, yourself)? 
 EOS users including any dapp user and project teams
@@ -69,33 +73,34 @@ EOS users including any dapp user and project teams
 For generating yield and income when holding EOS
 
 - Are there any other projects similar to yours in the EOSIO ecosystem?
-Yes, BSS from Defibox
+NO
   
   - If so, how is your project different?
-Vault is widely supporting all the users on EOS while BSS is only available for Defibox users who have BOX tokens.
+NO
 
 ## Team
 
-### Team members：16
+### Team members：12
 
-- **Team Leader:** Eason
+- **Team Leader:** Rowney
 
 
 ### Legal Structure
-- **Registered Legal Entity:** METABOXTECHNOLOGYPTE.LTD.
-- **Registered Address:** 160 ROBINSONROAD #14-04 SINGAPORE (068914)
+- **Registered Legal Entity:** Hainan Pink Dream Investment Co., Ltd.
+- **Registered Address:** 623, Building D, Jinke Jiayuan, Zhenfa Yiheng Road, Qiongshan District, Haikou City, Hainan Province
+
 
 ### Team Experience
 
 > Please describe the team's relevant experience. If your project involves development work, we would appreciate it if you singled out a few interesting projects or contributions made by team members in the past. For research-related grants, references to past publications and projects in a related domain are helpful. If you applied for a Pomelo grant in the past, please be sure you listed them in the section above and mention them in detail in this section.
-Defibox team is a full-time team that covers front-end, back-end, contract, operations, testing, and business on EOS, WAX and BSC. We have developed Swap, USN, Lending and many other DeFi protocols on EOS. We have been the leading DeFi on EOS in terms of TVL and running safely over 2 years. Besides this, we also co-developed major projects like Yield+ portal, etc.
+MIXDAO is the DAO organization of the Pink Dream Manor project, which has been operating on the EOS ecosystem for 3 years. It has been committed to the development and innovation of EOS ecological public products and is currently one of the most active groups in the EOS chain. It regularly holds Tencent meetings to promote the EOS ecosystem.
 
 > If anyone on your team has applied for a grant at the EOS Network Foundation previously, please list the name of the project and legal entity here.
 
 
 ### Team Org Repos
 
-https://github.com/defiboxswap
+https://github.com/eosdaoswap
 
 
 > Please also provide the GitHub accounts of all team members. If they contain no activity, references to projects hosted elsewhere or live are also fine.
@@ -104,22 +109,29 @@ https://github.com/defiboxswap
 
 ### Milestone Summary
 
-- **Total Estimated Duration:** 3 months (remaining 3 weeks)
-- **Full-Time Equivalent (FTE):** 5 FTE
+- **Total Estimated Duration:** 4 months (remaining 3 weeks)
+- **Full-Time Equivalent (FTE):** 6 FTE
 - **Total Costs:** 80,000 USD
 
 - **Deliverables:**
 
  | Deliverable      | Status    | Cost    |
  | ---------- | :-----------:  | :-----------: |
- | Protocol Design - Diagram     | Completed     | $3,000     |
- | Protocol Design - Definitions (EN/KO/CN)     | Not completed     | $5,000     |
- | SC development (prototype)     | Completed     | $12,000     |
- | SC development (production)     | Not completed     | $12,000     |
- | Developer documentation     | Completed     | $4,000     |
- | User documentation     | Not completed     | $6,000     |
- | Automatic Contracts Tests     | Not completed     | $14,000     |
- | Certik Audit     | Completed     | $24,000     |
+ | SC development (prototype)     | Completed     | $6,000     |
+ | SC development (production)     | Completed     | $8,000     |
+ | Developer documentation     | Not completed     | $3,000     |
+ | User documentation     | Not completed     | $2,500     |
+ | Sentnl Audit     | Completed     | $8,500     |
+ | SC development (prototype)     | Completed     | $6,000     |
+ | SC development (production)     | Completed     | $6,000     |
+ | Developer documentation     | Not completed     | $3,000     |
+ | User documentation     | Not completed     | $2,500     |
+ | Sentnl Audit     | Not completed     | $8,500     |
+ | SC development (prototype)     | Completed     | $6,000     |
+ | SC development (production)     | Completed     | $6,000     |
+ | Developer documentation     | Not completed     | $3,000     |
+ | User documentation     | Not completed     | $2,500     |
+ | Sentnl Audit     | Not completed     | $8,500     |
 
 
 ## Additional Information

From b16b8522c2fd07aa01124ff8196b1ed1c152b4fc Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:02:07 +0800
Subject: [PATCH 10/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 137fe0eb..c6edad91 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -25,23 +25,23 @@
 
 > https://github.com/eosdaoswap/daoswapooooo
 - [x] "DaoSwap" smart contract source code will be made available (*.cpp)
-- [x] Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [x] General documentation README.md
-- [x] Contract audit
+- [x]  "DaoSwap" Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [x]  "DaoSwap" General documentation README.md
+- [x]  "DaoSwap" Contract audit
 
 **Stage Two (not completed)**
 
 - [ ] “Red Envelope” smart contract source code will be made available (*.cpp)
-- [ ] Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [ ] General documentation README.md
-- [ ] Contract audit
+- [ ] “Red Envelope”  Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [ ] “Red Envelope”  General documentation README.md
+- [ ] “Red Envelope”  Contract audit
 
 **Stage Three (not completed) **
 
 - [ ] “Anonymous Bank” smart contract source code will be made available (*.cpp)
-- [ ] Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [ ] General documentation README.md
-- [ ] Contract audit
+- [ ] “Anonymous Bank” Prebuilt WASM binaries *.wasm & *.abi (with version control)
+- [ ] “Anonymous Bank” General documentation README.md
+- [ ] “Anonymous Bank” Contract audit
 
 ## Project Overview
 
@@ -168,21 +168,21 @@ https://github.com/eosdaoswap
 - [x] 提供daoswap项目智能合约源代码 接口
 - [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
 - [x] 通用文档 README.md
-- [x] 合约审计
+- [x] Sentnl 合约审计
 
 **第二阶段（未完成）“柚子红包项目”**
 
 - [x] 提供柚子红包项目智能合约源代码 接口
 - [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
 - [x] 通用文档 README.md
-- [x] 合约审计
+- [x] Sentnl 合约审计
 
 **第三阶段（未完成）“匿名银行项目”**
 
 - [x] 提供匿名银行项目智能合约源代码 接口
 - [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
 - [x] 通用文档 README.md
-- [x] 合约审计
+- [x] Sentnl 合约审计
 
 ### 项目概况
 **概述**

From f76522a6a9a1d67fcfe549a3f71fa37cbc237f14 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:04:40 +0800
Subject: [PATCH 11/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index c6edad91..acdb37f5 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -211,7 +211,7 @@ https://github.com/eosdaoswap
 
 ### 团队
 - **团队成员：** 12
-- **团队负责人：** rowney
+- **团队负责人：** Rowney
 
 **法律结构**
 - **注册法律实体：** 海南粉红梦幻投资有限公司

From cb68f7b0223d2a41ab52a0dc41b114ba62670d14 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:01:37 +0800
Subject: [PATCH 12/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index acdb37f5..d9cc7435 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -109,7 +109,7 @@ https://github.com/eosdaoswap
 
 ### Milestone Summary
 
-- **Total Estimated Duration:** 4 months (remaining 3 weeks)
+- **Total Estimated Duration:** 4 months (remaining 7 weeks)
 - **Full-Time Equivalent (FTE):** 6 FTE
 - **Total Costs:** 80,000 USD
 
@@ -117,21 +117,21 @@ https://github.com/eosdaoswap
 
  | Deliverable      | Status    | Cost    |
  | ---------- | :-----------:  | :-----------: |
- | SC development (prototype)     | Completed     | $6,000     |
- | SC development (production)     | Completed     | $8,000     |
- | Developer documentation     | Not completed     | $3,000     |
- | User documentation     | Not completed     | $2,500     |
- | Sentnl Audit     | Completed     | $8,500     |
- | SC development (prototype)     | Completed     | $6,000     |
- | SC development (production)     | Completed     | $6,000     |
- | Developer documentation     | Not completed     | $3,000     |
- | User documentation     | Not completed     | $2,500     |
- | Sentnl Audit     | Not completed     | $8,500     |
- | SC development (prototype)     | Completed     | $6,000     |
- | SC development (production)     | Completed     | $6,000     |
- | Developer documentation     | Not completed     | $3,000     |
- | User documentation     | Not completed     | $2,500     |
- | Sentnl Audit     | Not completed     | $8,500     |
+ | DAOSWAP SC development (prototype)     | Completed     | $6,000     |
+ | DAOSWAP SC development (production)     | Completed     | $8,000     |
+ | DAOSWAP Developer documentation     | Not completed     | $3,000     |
+ | DAOSWAP User documentation     | Not completed     | $2,500     |
+ | DAOSWAP Sentnl Audit     | Completed     | $8,500     |
+ | Red Envelope SC development (prototype)     | Completed     | $6,000     |
+ | Red Envelope SC development (production)     | Not completed     | $6,000     |
+ | Red Envelope Developer documentation     | Not completed     | $3,000     |
+ | Red Envelope User documentation     | Not completed     | $2,500     |
+ | Red Envelope Sentnl Audit     | Not completed     | $8,500     |
+ | Anonymous Bank SC development (prototype)     | Completed     | $6,000     |
+ | Anonymous Bank SC development (production)     | Not completed     | $6,000     |
+ | Anonymous Bank Developer documentation     | Not completed     | $3,000     |
+ | Anonymous Bank User documentation     | Not completed     | $2,500     |
+ | Anonymous Bank Sentnl Audit     | Not completed     | $8,500     |
 
 
 ## Additional Information
@@ -172,17 +172,17 @@ https://github.com/eosdaoswap
 
 **第二阶段（未完成）“柚子红包项目”**
 
-- [x] 提供柚子红包项目智能合约源代码 接口
-- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
-- [x] 通用文档 README.md
-- [x] Sentnl 合约审计
+- [ ] 提供柚子红包项目智能合约源代码 接口
+- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
+- [ ] 通用文档 README.md
+- [ ] Sentnl 合约审计
 
 **第三阶段（未完成）“匿名银行项目”**
 
-- [x] 提供匿名银行项目智能合约源代码 接口
-- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
-- [x] 通用文档 README.md
-- [x] Sentnl 合约审计
+- [ ] 提供匿名银行项目智能合约源代码 接口
+- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
+- [ ] 通用文档 README.md
+- [ ] Sentnl 合约审计
 
 ### 项目概况
 **概述**
@@ -225,7 +225,7 @@ https://github.com/eosdaoswap
 
 
 **里程碑总结**
-- **总预计持续时间：**4 个月 
+- **总预计持续时间：**4 个月 （剩余7周）
 - **全职当量 (FTE)：**6 FTE
 - **总成本：** 80,000 美元
 

From 941dfc9553e16d9affc2c7fc9c36018a11c03ea6 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:04:20 +0800
Subject: [PATCH 13/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index d9cc7435..9d662891 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -239,12 +239,12 @@ https://github.com/eosdaoswap
  | DAOSWAP用户文档     | 未完成     | $2,500     |
  | DAOSWAP审计     | 完成     | $8,500     |
  | 柚子红包智能合约开发（原型）     | 完成     | $6,000     |
- | 柚子红包智能合约开发（生产）    | 完成     | $6,000     |
+ | 柚子红包智能合约开发（生产）    | 未完成     | $6,000     |
  | 柚子红包开发者文档     | 未完成     | $3,000     |
  | 柚子红包用户文档     | 未完成     | $2,500     |
  | 柚子红包审计     | 未完成     | $8,500     |
  | 匿名银行智能合约开发（原型）     | 完成     | $6,000     |
- | 匿名银行智能合约开发（生产）    | 完成     | $6,000     |
+ | 匿名银行智能合约开发（生产）    | 未完成     | $6,000     |
  | 匿名银行开发者文档     | 未完成     | $3,000     |
  | 匿名银行用户文档     | 未完成     | $2,500     |
  | 匿名银行审计     | 未完成     | $8,500     |

From 20cfb8d66e2a27771c475049b22aa0f987a7a556 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:10:02 +0800
Subject: [PATCH 14/20] Update DaoSwap.md

Modify milestones and other matters
---
 applications/DaoSwap.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 9d662891..2d59f909 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -31,17 +31,17 @@
 
 **Stage Two (not completed)**
 
-- [ ] “Red Envelope” smart contract source code will be made available (*.cpp)
-- [ ] “Red Envelope”  Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [ ] “Red Envelope”  General documentation README.md
-- [ ] “Red Envelope”  Contract audit
+- [ ] “Red Envelope” smart contract source code will be made available (*.cpp) (remaining 1 weeks)
+- [ ] “Red Envelope”  Prebuilt WASM binaries *.wasm & *.abi (with version control) (remaining 1 weeks)
+- [ ] “Red Envelope”  General documentation README.md (remaining 3 days)
+- [ ] “Red Envelope”  Contract audit (remaining 2 days)
 
 **Stage Three (not completed) **
 
-- [ ] “Anonymous Bank” smart contract source code will be made available (*.cpp)
-- [ ] “Anonymous Bank” Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [ ] “Anonymous Bank” General documentation README.md
-- [ ] “Anonymous Bank” Contract audit
+- [ ] “Anonymous Bank” smart contract source code will be made available (*.cpp) (remaining 1 weeks)
+- [ ] “Anonymous Bank” Prebuilt WASM binaries *.wasm & *.abi (with version control) (remaining 1 weeks)
+- [ ] “Anonymous Bank” General documentation README.md (remaining 3 days)
+- [ ] “Anonymous Bank” Contract audit (remaining 2 days)
 
 ## Project Overview
 
@@ -172,17 +172,17 @@ https://github.com/eosdaoswap
 
 **第二阶段（未完成）“柚子红包项目”**
 
-- [ ] 提供柚子红包项目智能合约源代码 接口
-- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
-- [ ] 通用文档 README.md
-- [ ] Sentnl 合约审计
+- [ ] 提供柚子红包项目智能合约源代码 接口   (还需要1周)
+- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）  (还需要1周)
+- [ ] 通用文档 README.md (还需要3天)
+- [ ] Sentnl 合约审计 (还需要2天)
 
 **第三阶段（未完成）“匿名银行项目”**
 
-- [ ] 提供匿名银行项目智能合约源代码 接口
-- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
-- [ ] 通用文档 README.md
-- [ ] Sentnl 合约审计
+- [ ] 提供匿名银行项目智能合约源代码 接口  (还需要1周)
+- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）  (还需要1周)
+- [ ] 通用文档 README.md  (还需要3天)
+- [ ] Sentnl 合约审计  (还需要2天)
 
 ### 项目概况
 **概述**

From be1c2d2f3d30ee89a73b930c0af74722b52b9377 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Sun, 11 Jun 2023 21:44:31 +0800
Subject: [PATCH 15/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 275 ++++++++++++++++++++++++----------------
 1 file changed, 165 insertions(+), 110 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 2d59f909..8f6eb766 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -1,7 +1,7 @@
 # EOS Network Foundation Grant Proposal
 
 - **Project Name:** PINK Pink Dream Estate (PINK)
-- **Team Name:** MIXDAO
+- **Team Name:** MIXDAO Team
 - **EOS Payment Address:** daoyieldoooo
 - **[Level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels):** 3
 - **Pomelo Grant(s):** https://pomelo.io/grants/pinkertoken
@@ -19,29 +19,12 @@
 > ⚠️ *The combination of your GitHub account submitting the application and the EOS account address above will be your unique identifier during the program. Please keep them safe.*
 
 
-## Open source - Timelines
+## Open source 
 
-**Stage One (completed) "Version Beta v0.1.0"**
+> Red envelope project ：https://github.com/eosdaoswap/redpacket
+> SWAP project ：https://github.com/eosdaoswap/daoswapooooo
+> Anonymous project：Plan to open source within 8 weeks
 
-> https://github.com/eosdaoswap/daoswapooooo
-- [x] "DaoSwap" smart contract source code will be made available (*.cpp)
-- [x]  "DaoSwap" Prebuilt WASM binaries *.wasm & *.abi (with version control)
-- [x]  "DaoSwap" General documentation README.md
-- [x]  "DaoSwap" Contract audit
-
-**Stage Two (not completed)**
-
-- [ ] “Red Envelope” smart contract source code will be made available (*.cpp) (remaining 1 weeks)
-- [ ] “Red Envelope”  Prebuilt WASM binaries *.wasm & *.abi (with version control) (remaining 1 weeks)
-- [ ] “Red Envelope”  General documentation README.md (remaining 3 days)
-- [ ] “Red Envelope”  Contract audit (remaining 2 days)
-
-**Stage Three (not completed) **
-
-- [ ] “Anonymous Bank” smart contract source code will be made available (*.cpp) (remaining 1 weeks)
-- [ ] “Anonymous Bank” Prebuilt WASM binaries *.wasm & *.abi (with version control) (remaining 1 weeks)
-- [ ] “Anonymous Bank” General documentation README.md (remaining 3 days)
-- [ ] “Anonymous Bank” Contract audit (remaining 2 days)
 
 ## Project Overview
 
@@ -52,9 +35,12 @@
 > Please provide the following:
 
 - **Name:** DaoSwap
-- **Brief Description:** DaoSwap is a decentralized project platform that provides EOS users and project teams with various services, such as trading, mining, wealth management, account registration, CPU purchase, memory purchase, resource free transfer, red envelope sending, anonymous banking, NFT trading, and other functions; Among them, anonymous banks and pomelo red envelopes are their innovative projects. For example, sending red envelopes is an important social behavior of Chinese people, which can effectively improve user activity. pomelo red envelopes are the first red envelope DAPP on pomelo, making efforts to explore the application of EOS and expanding the scope of EOS's smart contracts and NFT applications. It draws on the idea of WeChat red envelopes and implements its functions on the blockchain. Due to the smooth trading status of EOS, the effect of grabbing red envelopes on blockchain is comparable to grabbing red envelopes on WeChat. Our red envelope grabbing technology has a wide range of usability. In the future, when the technology matures, it will be open source to the community, allowing all DAPPs with red envelope grabbing needs to use this technology for customized red envelope grabbing services. For anonymous banks, we develop anonymous smart contracts to achieve this goal by adding an additional layer of anonymity and privacy, making user transactions untraceable and protecting user privacy. Our privacy transfer technology has wide availability and will be open source to the community when the technology matures in the future, allowing all DAPPs with privacy transfer needs to use this technology for customized privacy service upgrades.
-- **Relationship to EOSIO:** A public facility that provides more services for EOS users and project teams, provides multiple interactions to generate more revenue, and provides open source, which will contribute to the EOSIO code repository.
-- **Reason for Interest:** It provides more services for EOS users and project teams to generate more revenue. It will bring lock-in volume and revenue to the MIXDAO team, while benefiting participants. Ecosystem improvement: attract inactive EOS tokens, which will prosper the ecosystem.
+- **Brief Description:** DaoSwap is a decentralized project platform that provides EOS users and project teams with various services, such as trading, mining, market making, warehouse locking, wealth management, account registration, CPU purchase, memory purchase, resource free transfer, red envelope sending, anonymous banking, NFT trading, and other functions; Among them, SWAP has added a lockdown function compared to other decentralized exchanges, increasing project stability and user loyalty; Anonymous banks and pomelo red envelopes are their innovative projects. For example, sending red envelopes is an important social behavior among Chinese people, which can effectively improve user activity. The pomelo red envelope is the first red envelope DAPP on pomelo, making efforts to explore the application of EOS and expanding the scope of EOS's smart contracts and NFT applications. It draws on the idea of WeChat red envelopes and implements its functions on the blockchain. Due to the smooth trading status of EOS, the effect of grabbing red envelopes on blockchain is comparable to grabbing red envelopes on WeChat. Our red envelope grabbing technology has wide availability and is currently open source to the community, allowing all DAPPs with red envelope grabbing needs to use this technology for customized red envelope grabbing services. And for anonymous banks, we develop anonymous smart contracts to achieve this goal by adding an additional layer of anonymity and privacy, making user transactions untraceable and achieving the effect of protecting user privacy. Our privacy transfer technology has wide availability, allowing all DAPPs with privacy transfer needs to use this technology for customized privacy services.
+
+- **Relationship to EOSIO:** A public facility that provides more services for EOS users and project teams, such as registering accounts, purchasing content, free transfers, sending red envelopes, anonymous transfers, etc., and provides open source services, which will help the EOSIO code resource library.
+
+- **Reason for Interest:** 
+It provides more services for EOS users and project teams to gain more revenue and services. It will bring lock-in volume and revenue to the MIXDAO team, while benefiting participants. Ecosystem improvement: attract inactive EOS tokens, which will prosper the ecosystem.
 
 
 
@@ -73,10 +59,10 @@ EOS users including any dapp user and project teams
 For generating yield and income when holding EOS
 
 - Are there any other projects similar to yours in the EOSIO ecosystem?
-NO
+There are no similar projects in the EOSIO ecosystem for pomelo red envelopes and anonymous banking services, and these two projects are an innovation; DAOSWAP has similar projects, such as DFS
   
-  - If so, how is your project different?
-NO
+- If so, how is your project different?
+DAOSWAP has functions such as market making lockdown and market making red envelopes, which other platforms do not have
 
 ## Team
 
@@ -86,14 +72,14 @@ NO
 
 
 ### Legal Structure
-- **Registered Legal Entity:** Hainan Pink Dream Investment Co., Ltd.
-- **Registered Address:** 623, Building D, Jinke Jiayuan, Zhenfa Yiheng Road, Qiongshan District, Haikou City, Hainan Province
+- **Registered Legal Entity:** (sent mail)
+- **Registered Address:** (sent mail)
 
 
 ### Team Experience
 
 > Please describe the team's relevant experience. If your project involves development work, we would appreciate it if you singled out a few interesting projects or contributions made by team members in the past. For research-related grants, references to past publications and projects in a related domain are helpful. If you applied for a Pomelo grant in the past, please be sure you listed them in the section above and mention them in detail in this section.
-MIXDAO is the DAO organization of the Pink Dream Manor project, which has been operating on the EOS ecosystem for 3 years. It has been committed to the development and innovation of EOS ecological public products and is currently one of the most active groups in the EOS chain. It regularly holds Tencent meetings to promote the EOS ecosystem.
+MIXDAO is the DAO organization of the Pink Dream Manor project and an early ecological participant in EOS. Currently, it is still deeply involved in ecological construction. The team has been operating in the EOS ecosystem for many years and has been committed to the development and innovation of EOS ecological public products. It is currently one of the most active groups in the EOS chain, regularly holding Tencent meetings to promote EOS ecology, and mentioning PINK community in the Chinese community is well-known.
 
 > If anyone on your team has applied for a grant at the EOS Network Foundation previously, please list the name of the project and legal entity here.
 
@@ -107,37 +93,81 @@ https://github.com/eosdaoswap
 
 
 
+## Development Roadmap
+
 ### Milestone Summary
 
-- **Total Estimated Duration:** 4 months (remaining 7 weeks)
+- **Total Estimated Duration:** 10 weeks
 - **Full-Time Equivalent (FTE):** 6 FTE
 - **Total Costs:** 80,000 USD
 
-- **Deliverables:**
-
- | Deliverable      | Status    | Cost    |
- | ---------- | :-----------:  | :-----------: |
- | DAOSWAP SC development (prototype)     | Completed     | $6,000     |
- | DAOSWAP SC development (production)     | Completed     | $8,000     |
- | DAOSWAP Developer documentation     | Not completed     | $3,000     |
- | DAOSWAP User documentation     | Not completed     | $2,500     |
- | DAOSWAP Sentnl Audit     | Completed     | $8,500     |
- | Red Envelope SC development (prototype)     | Completed     | $6,000     |
- | Red Envelope SC development (production)     | Not completed     | $6,000     |
- | Red Envelope Developer documentation     | Not completed     | $3,000     |
- | Red Envelope User documentation     | Not completed     | $2,500     |
- | Red Envelope Sentnl Audit     | Not completed     | $8,500     |
- | Anonymous Bank SC development (prototype)     | Completed     | $6,000     |
- | Anonymous Bank SC development (production)     | Not completed     | $6,000     |
- | Anonymous Bank Developer documentation     | Not completed     | $3,000     |
- | Anonymous Bank User documentation     | Not completed     | $2,500     |
- | Anonymous Bank Sentnl Audit     | Not completed     | $8,500     |
+### Milestone 1 — DAOSWAP features are complete
+
+- **Estimated Duration:** 2 weeks
+- **Estimated launch time:** July 2023
+- **FTE:** 6
+- **Costs:** 20,000 USD
+
+| # | Deliverables | Details |
+| --- | --- | --- |
+| 1. |  Complete basic functions  | Improve the friendliness of users when registering with EOS accounts, purchasing NET resources, purchasing memory, and transferring funds for free, making user operations more convenient。  |  
+| 2. | Complete lock function | Improve the market making lockdown function, allowing users to have a clear understanding of the details of upcoming lockups and ensuring the transparency of lockup information.  |  
+| 3. |  Complete market functions  |  Increase the buying and selling of tokens as well as fee charts, allowing users to better understand the trend of tokens through intuitive charts。  |  
+| 4. | Complete mining functions |  Add rewards for multiple tokens, such as adding rewards for specific tokens for specific time periods on top of existing mining pools 。|  
+| 5. | Perfect market making function |  Improve user market making logs to provide users with a clear understanding of each market making and profit situation。  |  
+| 6. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document。 | 
+| 7. |  Frontend interface development  |  Develop front-end interfaces through UI design, improve functionality, and interface with wallets。 |  
+| 8. |  Server deployment and launch  |  Deploy the upgraded DAOSWAP service online and go live on time  |
+| 9. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities  |
+
+
+### Milestone 2 — Red Envelopes features are complete
+
+- **Estimated Duration:** 4 weeks
+- **Estimated launch time:** August 2023
+- **FTE:** 6
+- **Costs:** 30,000 USD
+
+| # | Deliverables | Details |
+| --- | --- | --- |
+| 1. |  Add conditions for grabbing red envelopes  |  Increase the conditions for grabbing red envelopes, such as setting the conditions for grabbing red envelopes based on market making time and lockdown time.   |  
+| 2. |  Add voting red envelopes  |  After participating in the EOS main chain voting, users can participate in red envelope grabbing to improve the voting participation of the EOS main chain. | 
+| 3. |  Add red envelopes for newcomers  |  For example, only users who do not hold a certain token can grab red envelopes, allowing the project team to obtain more new users through this feature. | 
+| 4. | White List Red Envelope |  Through various methods such as linking, users can quickly become whitelisted users of a certain activity and participate in red envelope grabbing. |  
+| 5. |  Timed red envelope  |  The project team can set a fixed red envelope at once, such as sending red envelopes on time at 8 pm every day for ten consecutive days, so that the project team does not have to send red envelopes every day  |  
+| 6. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document.  | 
+| 7. |  Frontend interface development  | Develop front-end interfaces through UI design, improve functionality, and interface with wallets.  |  
+| 8. |  Server deployment and launch  |  Deploy the upgraded grapefruit red envelope service online and go live on time  |
+| 9. |  Contract audit  |  Audit the pomelo red envelope contract to ensure its security and provide basic services for EOS community design |
+| 10. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities  |
+
+### Milestone 3 — Anonymous Bank Upgrade, Audit, and Open Source
+
+- **Estimated Duration:** 4 weeks
+- **Estimated launch time:** September 2023
+- **FTE:** 6
+- **Costs:** 30,000 USD
+
+| # | Deliverables | Details |
+| --- | --- | --- |
+| 1. |  Anonymous contract upgrade  |  We will upgrade from the existing Anonymous Bank 1.0, optimize anonymous algorithms and memory usage, and combine them with the DAOSWAP contract to improve its anonymity.   |  
+| 2. | Hackathon |  Conduct a hacker marathon activity on the upgraded anonymous bank, and launch an anonymous algorithm reward challenge in the community. Anonymous testing is considered complete until no one discovers a vulnerability. Multiple small-scale anonymous tests have been initiated in the early stages. |  
+| 3. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document.  | 
+| 4. |  Frontend interface development  |  Develop front-end interfaces through UI design, improve functionality, and interface with wallets.  |  
+| 5. |  Server deployment and launch  |  Deploy all services related to anonymous banks online and go live on time  |
+| 6. |  Contract audit  |  Audit anonymous bank contracts to ensure their security, and then open source to provide basic services for EOS community design |
+| 7. |  Monthly active user goals  |  Monthly active users reaching over 1000 after launch through market operations activities  |
+
+
 
 
 ## Additional Information
 
 **How did you hear about the Grants Program?** EOS Network Foundation Website
 
+## Our Dream 
+
+Dex, as one of the few blockchain application products that can be implemented, is no longer a problem in terms of technology implementation. However, whether it can bring higher efficiency to users, reduce their usage costs, meet their various needs, and whether it has commercial sustainability will determine its future development. To have lasting vitality, a product must not only conform to the trend of the times, but also have cultural connotations. As one of the products in the blockchain field, DEX must have a certain cultural connotation to connect these users in order to survive and grow in the long term. So behind a well-developed DEX in the future, there will definitely be a strong community and community culture. Economic incentives alone cannot last long. Each DEX must condense its own community culture, which may be a vision, a sentiment, or the origin or continuation of a story. Only with such cultural connotations can it survive and become better and better. We are willing to work hard, we are also willing to give, and we are doing the same! In addition, we are also willing to innovate on EOS, such as pomelo red envelopes, anonymous banks, etc.
 
 ------------------------------------------------------------------------------------------------------------------------------
 
@@ -146,11 +176,11 @@ https://github.com/eosdaoswap
 # Chinese Translation 中文翻译
 
 - **项目名称：**  PINK粉红梦庄园（PINK）
-- **团队名称：**  MIXDAO
+- **团队名称：**  MIXDAO团队
 - **EOS支付地址：**  daoyieldoooo
 - **等级：** 3
 - **Pomelo资助：** https://pomelo.io/grants/pinkertoken
-- **项目是开源的：** 是*
+- **项目是开源的：** 是 *
 - **项目是代币销售的一部分：** 否
 - **项目资源库：** https://github.com/eosdaoswap
 
@@ -159,43 +189,23 @@ https://github.com/eosdaoswap
 - **联系邮箱：** uabcontafed@gmail.com
 - **网站：** https://swapdao.app
 
-## 开源 - 时间表
-
-**第一阶段（已完成）“daoswap项目”**
-
-> https://github.com/eosdaoswap/daoswapooooo
-
-- [x] 提供daoswap项目智能合约源代码 接口
-- [x] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）
-- [x] 通用文档 README.md
-- [x] Sentnl 合约审计
-
-**第二阶段（未完成）“柚子红包项目”**
-
-- [ ] 提供柚子红包项目智能合约源代码 接口   (还需要1周)
-- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）  (还需要1周)
-- [ ] 通用文档 README.md (还需要3天)
-- [ ] Sentnl 合约审计 (还需要2天)
-
-**第三阶段（未完成）“匿名银行项目”**
-
-- [ ] 提供匿名银行项目智能合约源代码 接口  (还需要1周)
-- [ ] 预构建的 WASM 二进制文件 *.wasm 和 *.abi（带版本控制）  (还需要1周)
-- [ ] 通用文档 README.md  (还需要3天)
-- [ ] Sentnl 合约审计  (还需要2天)
+## 项目开源 
+- **红包项目开源地址：** https://github.com/eosdaoswap/redpacket
+- **SWAP项目开源地址：** https://github.com/eosdaoswap/daoswapooooo
+- **匿名项目开源地址：** 计划8周内完成开源
 
 ### 项目概况
 **概述**
 - **名称：DaoSwap**
 
-- **简介：** DaoSwap是一个去中心化的项目平台，为EOS用户和项目团队提供多种服务，比如交易、挖矿、理财、注册账号、购买CPU、购买内存、免资源转账、发红包、匿名银行、NFT交易等功能；其中匿名银行和柚子红包是其创新的项目，比如发红包是中国人社交的重要行为，通过发红包可以有效提高用户活跃度，而柚子红包是柚子上第一个红包DAPP，为EOS的应用探索做出努力，拓展了EOS的智能合约以及NFT应用范围，它借鉴微信红包的思想，把其功能在区块链上进行了一个实现。由于EOS的丝滑交易状态使得在区块链上抢红包的效果媲美在微信上抢红包。我们抢红包技术拥有广泛的可用性，未来技术成熟以后会开源给社区，让所有有抢红包需求的dapp 可以利用这个技术进行特制的抢红包服务。而匿名银行，我们开发匿名智能合约，通过加一层额外的匿名性和隐私性来实现这一目标，使得用户交易不可追踪，达到保护用户隐私的效果。我们的隐私转账技术拥有广泛的可用性，未来技术成熟以后会开源给社区，让所有有隐私转账需求的dapp 可以利用这个技术进行特制的隐私服务升级；
-- **与EOSIO的关系：** 一种公共设施，为 EOS用户和项目团队提供更多的服务，并提供多种交互以获得更多收益，并提供开源，这将有助于EOSIO代码资源库。
-- **感兴趣的原因：** 它为 EOS 用户和项目团队提供了更多的服务以获得更多收益。它将为 MIXDAO 团队带来锁仓量和收入，同时让参与者受益。生态系统提升：吸引不活跃的EOS代币，这将繁荣生态系统。
+- **简介：** DaoSwap是一个去中心化的项目平台，为EOS用户和项目团队提供多种服务，比如交易、挖矿、做市、锁仓、理财、注册账号、购买CPU、购买内存、免资源转账、发红包、匿名银行、NFT交易等功能；其中SWAP相对其他去中心化交易所增加了锁仓功能，加大项目的稳定性和用户的忠诚度；匿名银行和柚子红包是其创新的项目，比如发红包是中国人社交的重要行为，通过发红包可以有效提高用户活跃度，而柚子红包是柚子上第一个红包DAPP，为EOS的应用探索做出努力，拓展了EOS的智能合约以及NFT应用范围，它借鉴微信红包的思想，把其功能在区块链上进行了一个实现。由于EOS的丝滑交易状态使得在区块链上抢红包的效果媲美在微信上抢红包。我们抢红包技术拥有广泛的可用性，目前已开源给社区，让所有有抢红包需求的dapp 可以利用这个技术进行特制的抢红包服务。而匿名银行，我们开发匿名智能合约，通过加一层额外的匿名性和隐私性来实现这一目标，使得用户交易不可追踪，达到保护用户隐私的效果。我们的隐私转账技术拥有广泛的可用性，让所有有隐私转账需求的dapp 可以利用这个技术进行特制的隐私服务；
+- **与EOSIO的关系：** 一种公共设施，为 EOS用户和项目团队提供更多的服务，比如注册账号，购买内容，免费转账，发红包，匿名转账等，并提供开源，这将有助于EOSIO代码资源库。
+- **感兴趣的原因：** 它为 EOS 用户和项目团队提供了更多的服务以获得更多收益和服务。它将为 MIXDAO 团队带来锁仓量和收入，同时让参与者受益。生态系统提升：吸引不活跃的EOS代币，这将繁荣生态系统。
 
 
 ### 生态系统
 - **您的项目在哪里以及如何融入生态系统？**
--为项目团队提供柚子红包、匿名银行、做市挖矿等服务，不需要项目团队重复开发直接开箱即用，对EOS用户提供柚子红包，匿名银行、做市挖矿、注册账号、购买CPU、免资源转账等服务，让EOS用户一站式体验多种EOS交互体验。
+-为项目团队提供柚子红包、匿名银行、做市挖矿等服务，不需要项目团队重复开发直接开箱即用，对EOS用户提供柚子红包，匿名银行、做市挖矿、做市锁仓、注册账号、购买CPU、购买内存、免资源转账等服务，让EOS用户一站式体验多种EOS交互体验。
 
 - **谁是你的目标受众（链/dapp/钱包/UI 开发人员、设计师、你自己的用户群、一些 dapp 的用户群、你自己）？**
 -EOS 用户，包括任何dapp用户和项目团队
@@ -204,51 +214,96 @@ https://github.com/eosdaoswap
 -持有EOS用于产生收益和收入
 
 - **在EOSIO生态系统中还有其他类似的项目吗？**
--无
+-柚子红包和匿名银行服务在EOSIO生态系统中没有类似的项目，这两个项目是一项创新；DAOSWAP有类似的项目，比如DFS
 
 - **如果是这样，您的项目有何不同？**
--无
+-DAOSWAP有做市锁仓，做市红包等功能，其他平台没有
 
 ### 团队
 - **团队成员：** 12
 - **团队负责人：** Rowney
 
 **法律结构**
-- **注册法律实体：** 海南粉红梦幻投资有限公司
-- **注册地址：** 海南省海口市琼山区振发一横路金科嘉园D栋623
+- **注册法律实体：** （已发送邮件）
+- **注册地址：** （已发送邮件）
 
 **团队经验**
--MIXDAO是粉红梦庄园项目的DAO组织，在EOS生态上运营了3年，一直致力于EOS生态公共产品的开发与创新，是目前EOS链最活跃的团体之一，定期开展腾讯会议来宣传EOS生态。
+-MIXDAO是粉红梦庄园项目的DAO组织，是EOS的早期生态参与者，目前仍在深度参与生态建设。团队在EOS生态上运营了多年，一直致力于EOS生态公共产品的开发与创新，是目前EOS链最活跃的团体之一，定期开展腾讯会议来宣传EOS生态，在中文社区提及PINK社区无人不晓。
 
 **团队组织**
 -https://github.com/eosdaoswap
 
 
-**里程碑总结**
-- **总预计持续时间：**4 个月 （剩余7周）
-- **全职当量 (FTE)：**6 FTE
-- **总成本：** 80,000 美元
-
-- **可交付成果：**
- 
- | 可交付成果      | 状态    | 成本    |
- | ---------- | :-----------:  | :-----------: |
- | DAOSWAP智能合约开发（原型）     | 完成     | $6,000     |
- | DAOSWAP智能合约开发（生产）    | 完成     | $8,000     |
- | DAOSWAP开发者文档     | 未完成     | $3,000     |
- | DAOSWAP用户文档     | 未完成     | $2,500     |
- | DAOSWAP审计     | 完成     | $8,500     |
- | 柚子红包智能合约开发（原型）     | 完成     | $6,000     |
- | 柚子红包智能合约开发（生产）    | 未完成     | $6,000     |
- | 柚子红包开发者文档     | 未完成     | $3,000     |
- | 柚子红包用户文档     | 未完成     | $2,500     |
- | 柚子红包审计     | 未完成     | $8,500     |
- | 匿名银行智能合约开发（原型）     | 完成     | $6,000     |
- | 匿名银行智能合约开发（生产）    | 未完成     | $6,000     |
- | 匿名银行开发者文档     | 未完成     | $3,000     |
- | 匿名银行用户文档     | 未完成     | $2,500     |
- | 匿名银行审计     | 未完成     | $8,500     |
+## 开发路线图
+
+### 里程碑总结
+
+- **总共周期:** 10 周
+- **全职当量 (FTE):** 6 FTE
+- **总计花费:** 80,000 USD
+
+### 里程碑1 — DAOSWAP功能完善
+
+- **预估周期:** 2 周
+- **预估上线时间:** 2023年7月
+- **FTE:**  6
+- **花费:** 20,000 USD
+
+| 序号 | 可交付成果 | 明细 |
+| -----: | ----------- | ------------- |
+| 1. | 基础功能完善 | 提高用户在使用EOS账号注册、购买NET资源、购买内存、免费转账的友好程度，让用户操作更为便利。  |  
+| 2. | 锁仓功能完善 | 完善做市锁仓功能，让用户清楚了解即将到期的锁仓明细，确保锁仓信息的透明性。  |  
+| 3. | 行情功能完善 | 增加代币的买入和卖出以及手续费图表，让用户通过直观的图表更好的了解代币的趋势情况。  |  
+| 4. | 挖矿功能完善 | 增加多个代币的奖励，比如在现有矿池基础上增加特定时间段的特定代币的奖励 。|  
+| 5. | 做市功能完善 | 完善用户做市日志，让用户清楚了解每次做市及盈利情况。  |  
+| 6. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
+| 7. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
+| 8. | 服务器部署和上线 | 对升级完成的DAOSWAP服务部署到线上并准时上线 |
+| 9. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户 |
+
+
+### 里程碑2 — 柚子红包功能完善
+
+- **预估周期:** 4 周
+- **预估上线时间:** 2023年8月
+- **FTE:**  6
+- **花费:** 30,000 USD
+
+| 序号 | 可交付成果 | 明细 |
+| -----: | ----------- | ------------- |
+| 1. | 增加抢红包条件 | 增加抢红包条件，比如根据做市时间、锁仓时间来设定抢红包的条件等。  |  
+| 2. | 增加投票红包 | 用户参与EOS主链投票后可以参与抢红包，提高EOS主链的投票参与度。| 
+| 3. | 增加新人红包 | 比如没有持有某个token的用户才能抢红包,让项目团队通过此功能获取更多的新用户 。| 
+| 4. | 白名单红包 | 通过链接等多种方式，让用户快速的成为某场活动的白名单用户，参与抢红包。 |  
+| 5. | 定时红包 | 项目方可以一次性设定定时红包，比如每天晚上8点准时发红包，连续发十天，这样就不用项目方每天发红包 |  
+| 6. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
+| 7. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
+| 8. | 服务器部署和上线 | 对升级完成的柚子红包服务部署到线上并准时上线 |
+| 9. | 合约审计 | 对柚子红包合约进行审计，确保其安全性 ，为EOS社区设计提供基础服务|
+| 10. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户 |
+
+
+### 里程碑3 — 匿名银行升级、审计及开源
+
+- **预估周期:** 4 周
+- **预估上线时间:** 2023年9月
+- **FTE:**  6
+- **花费:** 30,000 USD
+
+| 序号 | 可交付成果 | 明细 |
+| -----: | ----------- | ------------- |
+| 1. | 匿名合约升级 | 我们将在现有的匿名银行1.0的基础上进行升级，优化匿名算法和内存的使用并与DAOSWAP合约结合，提高其匿名性。  |  
+| 2. | 黑客马拉松 | 对升级完成的匿名银行进行黑客马拉松活动，在社区发起匿名算法奖励挑战，直到没有人发现漏洞才算完成匿名测试，前期已发起多次小规模的匿名测试 。|  
+| 3. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
+| 4. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
+| 5. | 服务器部署和上线 | 将所有与匿名银行的服务部署到线上并准时上线 |
+| 6. | 合约审计 | 对匿名银行合约进行审计，确保其安全性，然后进行开源  ，为EOS社区设计提供基础服务|
+| 7. | 月活用户目标 | 通过市场运营活动在上线后达到1,000以上的月活用户 |
 
 **附加信息**
 
 **您是如何得知赠款计划的？：** EOS网络基金会网站
+
+### 我们的梦想
+
+Dex作为目前少数能落地的区块链应用产品，在技术实现上已不成问题，但能否为用户带来更高的效率，能否降低用户的使用成本，满足用户的各方面需求，以及是否有商业上的可持续性将决定其未来的发展。一个产品要想有持久的生命力，除了顺应时代发展的大势外，其本身一定要有文化内涵。DEX作为区块链领域的产品之一，要想长久生存并发展壮大，我想它一定也得有一定的文化内涵将这些用户联系在一起。所以未来发展得好的DEX背后一定会有一个强大的社区以及社区文化，光凭经济利益的激励势必不能长久，每个DEX都要凝聚出自己的社区文化，它可能是一种远景，可能是一种情怀，又或者是一个故事的源起或待续，只有有了这样的文化内涵才能一直存活下去，并越来越好。我们愿意努力，我们也愿意付出，我们也正在这么做！除此之外我们也愿意在EOS做一些创新比如柚子红包，匿名银行等。

From dfc9ba85a3047918ec42c43fc5ab42eddb1ce649 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Sun, 11 Jun 2023 21:48:34 +0800
Subject: [PATCH 16/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 8f6eb766..8bf87cbd 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -21,9 +21,9 @@
 
 ## Open source 
 
-> Red envelope project ：https://github.com/eosdaoswap/redpacket
-> SWAP project ：https://github.com/eosdaoswap/daoswapooooo
-> Anonymous project：Plan to open source within 8 weeks
+- Red envelope project ：https://github.com/eosdaoswap/redpacket
+- SWAP project ：https://github.com/eosdaoswap/daoswapooooo
+- Anonymous project：Plan to open source within 8 weeks
 
 
 ## Project Overview

From fe5b95297e95520905920a019b3797b679a4ea88 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Sun, 11 Jun 2023 21:50:52 +0800
Subject: [PATCH 17/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 8bf87cbd..92dbd22a 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -21,9 +21,9 @@
 
 ## Open source 
 
-- Red envelope project ：https://github.com/eosdaoswap/redpacket
-- SWAP project ：https://github.com/eosdaoswap/daoswapooooo
-- Anonymous project：Plan to open source within 8 weeks
+- **Red envelope project:** https://github.com/eosdaoswap/redpacket
+- **SWAP project:** https://github.com/eosdaoswap/daoswapooooo
+- **Anonymous project:** Plan to open source within 8 weeks
 
 
 ## Project Overview

From 0e218e0430c36772e7aa3701ce0c8a3de8cc75ea Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Sun, 11 Jun 2023 21:57:57 +0800
Subject: [PATCH 18/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 48 ++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 92dbd22a..22ee9942 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -110,15 +110,15 @@ https://github.com/eosdaoswap
 
 | # | Deliverables | Details |
 | --- | --- | --- |
-| 1. |  Complete basic functions  | Improve the friendliness of users when registering with EOS accounts, purchasing NET resources, purchasing memory, and transferring funds for free, making user operations more convenient。  |  
+| 1. |  Complete basic functions  | Improve the friendliness of users when registering with EOS accounts, purchasing NET resources, purchasing memory, and transferring funds for free, making user operations more convenient.  |  
 | 2. | Complete lock function | Improve the market making lockdown function, allowing users to have a clear understanding of the details of upcoming lockups and ensuring the transparency of lockup information.  |  
-| 3. |  Complete market functions  |  Increase the buying and selling of tokens as well as fee charts, allowing users to better understand the trend of tokens through intuitive charts。  |  
-| 4. | Complete mining functions |  Add rewards for multiple tokens, such as adding rewards for specific tokens for specific time periods on top of existing mining pools 。|  
-| 5. | Perfect market making function |  Improve user market making logs to provide users with a clear understanding of each market making and profit situation。  |  
-| 6. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document。 | 
-| 7. |  Frontend interface development  |  Develop front-end interfaces through UI design, improve functionality, and interface with wallets。 |  
-| 8. |  Server deployment and launch  |  Deploy the upgraded DAOSWAP service online and go live on time  |
-| 9. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities  |
+| 3. |  Complete market functions  |  Increase the buying and selling of tokens as well as fee charts, allowing users to better understand the trend of tokens through intuitive charts.  |  
+| 4. | Complete mining functions |  Add rewards for multiple tokens, such as adding rewards for specific tokens for specific time periods on top of existing mining pools .|  
+| 5. | Perfect market making function |  Improve user market making logs to provide users with a clear understanding of each market making and profit situation.  |  
+| 6. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document. | 
+| 7. |  Frontend interface development  |  Develop front-end interfaces through UI design, improve functionality, and interface with wallets. |  
+| 8. |  Server deployment and launch  |  Deploy the upgraded DAOSWAP service online and go live on time . |
+| 9. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities . |
 
 
 ### Milestone 2 — Red Envelopes features are complete
@@ -134,12 +134,12 @@ https://github.com/eosdaoswap
 | 2. |  Add voting red envelopes  |  After participating in the EOS main chain voting, users can participate in red envelope grabbing to improve the voting participation of the EOS main chain. | 
 | 3. |  Add red envelopes for newcomers  |  For example, only users who do not hold a certain token can grab red envelopes, allowing the project team to obtain more new users through this feature. | 
 | 4. | White List Red Envelope |  Through various methods such as linking, users can quickly become whitelisted users of a certain activity and participate in red envelope grabbing. |  
-| 5. |  Timed red envelope  |  The project team can set a fixed red envelope at once, such as sending red envelopes on time at 8 pm every day for ten consecutive days, so that the project team does not have to send red envelopes every day  |  
+| 5. |  Timed red envelope  |  The project team can set a fixed red envelope at once, such as sending red envelopes on time at 8 pm every day for ten consecutive days, so that the project team does not have to send red envelopes every day . |  
 | 6. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document.  | 
 | 7. |  Frontend interface development  | Develop front-end interfaces through UI design, improve functionality, and interface with wallets.  |  
-| 8. |  Server deployment and launch  |  Deploy the upgraded grapefruit red envelope service online and go live on time  |
-| 9. |  Contract audit  |  Audit the pomelo red envelope contract to ensure its security and provide basic services for EOS community design |
-| 10. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities  |
+| 8. |  Server deployment and launch  |  Deploy the upgraded grapefruit red envelope service online and go live on time .|
+| 9. |  Contract audit  |  Audit the pomelo red envelope contract to ensure its security and provide basic services for EOS community design .|
+| 10. |  Monthly active user goals  |  Monthly active users who have reached over 2000 after going live through market operations activities . |
 
 ### Milestone 3 — Anonymous Bank Upgrade, Audit, and Open Source
 
@@ -154,9 +154,9 @@ https://github.com/eosdaoswap
 | 2. | Hackathon |  Conduct a hacker marathon activity on the upgraded anonymous bank, and launch an anonymous algorithm reward challenge in the community. Anonymous testing is considered complete until no one discovers a vulnerability. Multiple small-scale anonymous tests have been initiated in the early stages. |  
 | 3. |  UI design 	|  The designer completes the front-end UI design work based on the requirements document.  | 
 | 4. |  Frontend interface development  |  Develop front-end interfaces through UI design, improve functionality, and interface with wallets.  |  
-| 5. |  Server deployment and launch  |  Deploy all services related to anonymous banks online and go live on time  |
-| 6. |  Contract audit  |  Audit anonymous bank contracts to ensure their security, and then open source to provide basic services for EOS community design |
-| 7. |  Monthly active user goals  |  Monthly active users reaching over 1000 after launch through market operations activities  |
+| 5. |  Server deployment and launch  |  Deploy all services related to anonymous banks online and go live on time .|
+| 6. |  Contract audit  |  Audit anonymous bank contracts to ensure their security, and then open source to provide basic services for EOS community design .|
+| 7. |  Monthly active user goals  |  Monthly active users reaching over 1000 after launch through market operations activities . |
 
 
 
@@ -258,8 +258,8 @@ Dex, as one of the few blockchain application products that can be implemented,
 | 5. | 做市功能完善 | 完善用户做市日志，让用户清楚了解每次做市及盈利情况。  |  
 | 6. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
 | 7. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
-| 8. | 服务器部署和上线 | 对升级完成的DAOSWAP服务部署到线上并准时上线 |
-| 9. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户 |
+| 8. | 服务器部署和上线 | 对升级完成的DAOSWAP服务部署到线上并准时上线 。|
+| 9. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户 。|
 
 
 ### 里程碑2 — 柚子红包功能完善
@@ -275,12 +275,12 @@ Dex, as one of the few blockchain application products that can be implemented,
 | 2. | 增加投票红包 | 用户参与EOS主链投票后可以参与抢红包，提高EOS主链的投票参与度。| 
 | 3. | 增加新人红包 | 比如没有持有某个token的用户才能抢红包,让项目团队通过此功能获取更多的新用户 。| 
 | 4. | 白名单红包 | 通过链接等多种方式，让用户快速的成为某场活动的白名单用户，参与抢红包。 |  
-| 5. | 定时红包 | 项目方可以一次性设定定时红包，比如每天晚上8点准时发红包，连续发十天，这样就不用项目方每天发红包 |  
+| 5. | 定时红包 | 项目方可以一次性设定定时红包，比如每天晚上8点准时发红包，连续发十天，这样就不用项目方每天发红包 。|  
 | 6. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
 | 7. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
-| 8. | 服务器部署和上线 | 对升级完成的柚子红包服务部署到线上并准时上线 |
-| 9. | 合约审计 | 对柚子红包合约进行审计，确保其安全性 ，为EOS社区设计提供基础服务|
-| 10. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户 |
+| 8. | 服务器部署和上线 | 对升级完成的柚子红包服务部署到线上并准时上线 。 |
+| 9. | 合约审计 | 对柚子红包合约进行审计，确保其安全性 ，为EOS社区设计提供基础服务。|
+| 10. | 月活用户目标 | 通过市场运营活动在上线后达到2,000以上的月活用户。 |
 
 
 ### 里程碑3 — 匿名银行升级、审计及开源
@@ -296,9 +296,9 @@ Dex, as one of the few blockchain application products that can be implemented,
 | 2. | 黑客马拉松 | 对升级完成的匿名银行进行黑客马拉松活动，在社区发起匿名算法奖励挑战，直到没有人发现漏洞才算完成匿名测试，前期已发起多次小规模的匿名测试 。|  
 | 3. | UI设计	| 设计师根据需求文件完成前端UI设计工作。 | 
 | 4. | 前端界面开发 | 通过UI设计来开发前台界面，完善功能，并对接钱包。 |  
-| 5. | 服务器部署和上线 | 将所有与匿名银行的服务部署到线上并准时上线 |
-| 6. | 合约审计 | 对匿名银行合约进行审计，确保其安全性，然后进行开源  ，为EOS社区设计提供基础服务|
-| 7. | 月活用户目标 | 通过市场运营活动在上线后达到1,000以上的月活用户 |
+| 5. | 服务器部署和上线 | 将所有与匿名银行的服务部署到线上并准时上线 。|
+| 6. | 合约审计 | 对匿名银行合约进行审计，确保其安全性，然后进行开源  ，为EOS社区设计提供基础服务 。|
+| 7. | 月活用户目标 | 通过市场运营活动在上线后达到1,000以上的月活用户 。 |
 
 **附加信息**
 

From 044f1e69f2227ac06deb4ae9c68c9872397b7540 Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Sun, 11 Jun 2023 22:15:48 +0800
Subject: [PATCH 19/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 22ee9942..847d6174 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -59,7 +59,7 @@ EOS users including any dapp user and project teams
 For generating yield and income when holding EOS
 
 - Are there any other projects similar to yours in the EOSIO ecosystem?
-There are no similar projects in the EOSIO ecosystem for pomelo red envelopes and anonymous banking services, and these two projects are an innovation; DAOSWAP has similar projects, such as DFS
+There are no similar projects in the EOSIO ecosystem for pomelo red envelopes and anonymous banking services, and these two projects are an innovation; SWAP has similar projects, such as DeFis
   
 - If so, how is your project different?
 DAOSWAP has functions such as market making lockdown and market making red envelopes, which other platforms do not have
@@ -214,7 +214,7 @@ Dex, as one of the few blockchain application products that can be implemented,
 -持有EOS用于产生收益和收入
 
 - **在EOSIO生态系统中还有其他类似的项目吗？**
--柚子红包和匿名银行服务在EOSIO生态系统中没有类似的项目，这两个项目是一项创新；DAOSWAP有类似的项目，比如DFS
+-柚子红包和匿名银行服务在EOSIO生态系统中没有类似的项目，这两个项目是一项创新；SWAP有类似的项目，比如DeFis
 
 - **如果是这样，您的项目有何不同？**
 -DAOSWAP有做市锁仓，做市红包等功能，其他平台没有

From 2cae30b37228e4c31333c5e259a798c35c3e60ab Mon Sep 17 00:00:00 2001
From: eosdaoswap <132586648+eosdaoswap@users.noreply.github.com>
Date: Mon, 12 Jun 2023 23:09:31 +0800
Subject: [PATCH 20/20] Update DaoSwap.md

---
 applications/DaoSwap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/DaoSwap.md b/applications/DaoSwap.md
index 847d6174..6630e46c 100644
--- a/applications/DaoSwap.md
+++ b/applications/DaoSwap.md
@@ -3,7 +3,7 @@
 - **Project Name:** PINK Pink Dream Estate (PINK)
 - **Team Name:** MIXDAO Team
 - **EOS Payment Address:** daoyieldoooo
-- **[Level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels):** 3
+- **[Level](https://github.com/eosnetworkfoundation/grant-framework#grant-levels):** 2
 - **Pomelo Grant(s):** https://pomelo.io/grants/pinkertoken
 - **Project is Open-Source:** Yes*
 - **Project was part of Token sale:** No
@@ -178,7 +178,7 @@ Dex, as one of the few blockchain application products that can be implemented,
 - **项目名称：**  PINK粉红梦庄园（PINK）
 - **团队名称：**  MIXDAO团队
 - **EOS支付地址：**  daoyieldoooo
-- **等级：** 3
+- **等级：** 2
 - **Pomelo资助：** https://pomelo.io/grants/pinkertoken
 - **项目是开源的：** 是 *
 - **项目是代币销售的一部分：** 否