Merge branch 'basicswap' into 'master'

ofrnxmr feat. BasicSwapDEX - take over the world pt 2

See merge request monero-project/ccs-proposals!457

jeffro256-full-time-2024Q3.md

@@ -0,0 +1,67 @@
+---
+layout: fr
+title: jeffro256 full-time development 2024Q3
+author: jeffro256
+date: June 14, 2024
+amount: 146
+milestones:
+  - name: Month 1
+    funds: 33% (48.0)
+    done:
+    status: unfinished
+  - name: Month 2
+    funds: 33% (49.0)
+    done:
+    status: unfinished
+  - name: Month 3
+    funds: 33% (49.0)
+    done:
+    status: unfinished
+payouts:
+  - date:
+    amount:
+  - date:
+    amount:
+  - date:
+    amount:
+---
+
+## What
+
+In the last three months, the likely direction of the future of the Monero protocol changed
+drastically with all the work done to bring FCMPs to RingCT. At my last CCS proposal, I
+proposed that I would be working on the Seraphis wallet and consensus integrations. Then
+I shifted gears to implementing [Jamtis-RCT](https://gist.github.com/tevador/d3656a217c0177c160b9b6219d9ebb96#).
+I propose to refine this codebase and produce and LWS-client demo, in order to have these
+set of features complete before the FCMP++ upgrade, assuming all goes well. This codebase
+can currently construct `cryptonote::transaction`s with Jamtis info encode in the `extra` field,
+and then successfully scan that data. Here is a non-exhaustive list of points that need
+work with this library:
+
+- Legacy address integration and testing
+- Optimization: post-primary-view-tag scanning is about 20% slower than expected
+- Testing against actual FCMP++ composition proofs
+- Multi-threaded compute
+- A live, over-the-wire LWS demo for evaluating the filter-assist/hidden enote trade-offs
+
+I would also like to work on replacing `wallet2` internals with the Seraphis library 'legacy handling'
+code, as discussed at this Github issue: https://github.com/seraphis-migration/wallet3/issues/64. A few people
+are already working on it, but it will need a lot of manpower to bring it to fruition.
+
+
+## Who
+
+I have been contributing to the Monero core repository for [over two years](https://github.com/monero-project/monero/pulls?page=2&q=is%3Apr+author%3Ajeffro256) with a total of [68 merged commits to master](https://github.com/monero-project/monero/commits?author=jeffro256) thus far. I also began working on the Seraphis migration project, so you can see some of my contributions [here](https://github.com/seraphis-migration/monero/pulls?q=is%3Apr+author%3Ajeffro256) and [here](https://github.com/UkoeHB/monero/pulls?q=is%3Apr+author%3Ajeffro256). Some more notable contributions from this last quarter:
+
+- Implemented [Jamtis-RCT](https://gist.github.com/tevador/d3656a217c0177c160b9b6219d9ebb96#) into the Seraphis library [here](https://github.com/jeffro256/monero/tree/jamtis_rct). This branch provides support for storing Jamtis scanning data into `tx_extra`, and performs a unit test where a pruned transaction is constructed addressed to Jamtis payment proposals, and then successfully scanned for both plain and self-send enote types. The way this branch was written merges the code paths for doing Jamtis on RingCT and Seraphis together. It could use some cleaning up, and the Seraphis multisig tests need to be updated, but otherwise all Seraphis tests are passing.
+- Some other Seraphis stuff including a unified transaction format for Cryptonote, RingCT, and Squashed-Seraphis transactions.
+
+Previous Proposals:
+- https://repo.getmonero.org/monero-project/ccs-proposals/-/merge_requests/319
+- https://repo.getmonero.org/monero-project/ccs-proposals/-/merge_requests/390
+- https://repo.getmonero.org/monero-project/ccs-proposals/-/merge_requests/421
+- https://repo.getmonero.org/monero-project/ccs-proposals/-/merge_requests/436
+
+## Payment
+
+I propose to work 40 hours/week for 3 months so `40 (hours/week) * 3 (months) * weeks_per_month = 40 (hours/week) * 3 (months) * (365 / 12 / 7) (weeks/month) = 521` hours total on-paper, though I usually work more than that. The proposal is broken into 3 milestones, one for each month. I am setting my hourly rate at 46 USD/hour (+1 USD/hour higher than last quarter), and at a market price of 163.97 USD/XMR, that makes for a total of 146.2 XMR. Price was calculated as 14-day simple average of opening prices on [CoinGecko](https://www.coingecko.com/en/coins/monero/historical_data) from 2024-06-01 to 2024-06-14 (day of writing), same as last quarter.

ofrnxmr_basicswap.md

@@ -0,0 +1,154 @@
+---
+layout: fr
+title: ofrnxmr feat. BasicSwapDEX - take over the world pt 2
+author: ofrnxmr
+date: 
+amount: 2300
+milestones: 
+  - name: M0 - 3 months, min. 3 people (prepaid)
+    funds: 650 XMR
+    done:
+    status: unfinished
+  - name: M1-F - Frontend GUI v3.0.0 - v5.0.0 (prepaid)
+    funds: 400 XMR
+    done:
+    status: unfinished
+  - name: M1-B - Backend v0.13 - v0.15 (prepaid)
+    funds: 500 XMR
+    done:
+    status: unfinished
+  - name: M2 - Delivery of 1.0 (postpaid)
+    funds: 450 XMR
+    done:
+    status: unfinished
+    milestones: 
+  - name: M3 - 1yr maintenance (ongoing)
+    funds: 300 XMR
+    done:
+    status: unfinished
+payouts:
+  - date:
+    amount:
+  - date:
+    amount:
+  - date:
+    amount:
+  - date:
+    amount:
+  - date:
+    amount:
+---
+  Welcome ladies and gentleman, kids and pets.
+
+Lets skip the intro.
+
+  BasicSwapDEX is, as far as i know, Moneros's only Bidirectional Atomic swap service, and the only one that allows swapping monero with coins not named Bitcoin, such Litecoin. 
+
+  BasicSwapDEX has been mainnet for a while now, but is a beta / POC. With this CCS I hope empower and steward BasicSwapDex to production quality software within 1 year. Some milestones are to be paid to ofrnxmr in advance, to avoid haveno debacles. Id also request that all funds to be held by ccs coordinator (not luigi or core).
+	 
+##### M0 = accelerate work / probation.
+- Paid at funding. Covers the first 3 months. The full 650xmr to be paid to ofrnxmr to distribute as follows:
+  - 200xmr to ofrnxmr
+  - 100xmr to ofrnxmr to pay for bounties, extra help, and/or bonuses to backend/frontend devs
+  - 200xmr to BasicSwap Team - Backend
+  - 150xmr to BasicSwap Team - Frontend
+
+##### M1-F - Frontend GUI v3.0.0 - v5.0.0
+- Paid start of month 4
+  - 300xmr earmarked for frontend development (paid out by ofrnxmr as work is completed)
+  - 100xmr to ofrnxmr to pay for bounties, extra help, and/or bonuses to backend/frontend devs	
+
+##### M1-B - Backend v0.13 - v0.15
+- Paid start of month 4
+  - 400xmr earmarked for backend development (paid out by ofrnxmr as work is completed)
+  - 100xmr to ofrnxmr to pay for bounties, extra help, and/or bonuses to backend/frontend devs
+
+##### M2 - Delivery of 1.0
+- Paid after M1-F and M1-B are completed to satisfaction, and 1.0 is shipped 
+  - 175xmr for frontend dev(s)
+  - 275xmr for backend dev(s)
+
+##### M3 = Maintenance
+- Payout in Month 13 at the earliest, to be redistributed on a monthly basis 
+  - 10xmr to backend devs
+  - 10xmr to frontend devs
+  - 5xmr to ofrnxmr
+
+
+#### Scope (wherever technically possibly)
+- **_M0 = Catchup work. Begin preparing for M1 milestones._**
+  - [Some things yet to be completed](https://repo.getmonero.org/monero-project/ccs-proposals/-/merge_requests/457#note_24394)
+- **_M1-B - Backend v0.13 - v0.15_**
+  - Secure the backend
+  - Better code reviews
+  - Fix and enhance user APIs
+  - Add provider / swapper APIs
+  - Web frontend APIs
+  - Enable swaps between incompatible coins. [Example: XMR <> FIRO]
+  - Integrations of atomic protocals such as those from BCH and ETH
+  - Disconnect SMSG from Particl blockchain
+  - Create and use a local price oracle
+  - Bridge orderbooks from other services such as Samourai 
+  - EVM wallet compatibility
+  - Necessary changes to enable frontend features
+- **_M1-F - Frontend GUI v3.0.0 - v5.0.0_**
+  - CEX-like UI and UX (aside from speed)
+    - Orderbook
+    - Market depth
+    - Order types ie. Market, limit, stop, trailing, profit taker
+  - Private orderbook UI
+  - Overall UI and UX updates
+    - Mobile friendly
+    - Better notifications
+    - Improve / simplify in progress and histroical bid details
+  - Historical swap exports
+  - Drop _reliance_ on centralized price APIs
+  - Add wallet (rpc) functionality to the wallets themselves
+- **_M2 - Delivery of 1.0_**
+  - M1-X Completed to satisfaction
+  - Ship 1.0 installation packages as (example), a Flatpak, appimage
+- **_M3 - 1yr Maintenance_**
+  - Addressing concerns in an efficient manner
+  - Continued improvement of the codebase
+
+The scope of work is quite large. You can follow Particl dev report (going back to january) for current, ongoing and planned work, which is ever evolving.
+
+Should any part of this CCS fail, I may choose to redirect remaining funds to fork the project or to acquire devs willing/able to complete it.
+
+In the event of total failure, all unused funds will be donated to a 2/3 multisig (The elusive "jetfund") with the COMMUNITY Coordinator and 1 other [TBD] party, to be used **as the community decides**....Though, im ofrnxmr. I'm not _fill in name of scammer_. I will see this through to completion.
+
+##### Coverage
+- M0 = Month 0-3
+- M1-X = Month 4 'til Completion of M1-X milestones
+- M2 = Completion of M1-X milestones til Month 12
+- M3 = 12 Months. Earliest pay may begin is Month 13
+
+##### Things to note:
+The Particl blockchain - of which SMSG currently transmits the orderbook across.
+1. Is POS.
+2. Has a 50% emission tax.
+3. Uses on chain voting. 
+
+I personally don't like or agree with the centralization involved with combining those 3 items into a blockchain. 
+Having BasicSwapDEX secured by such a system is less than ideal.
+
+The good? SMSG doesnt rely on the consensus model of Particl.
+
+This emission goes towards the "Particl Treasury". Particl has their own CCS system that typically draws from the treasury to pay for development. [this Particl CCS.](https://github.com/particl/ccs-proposals/pull/19) The market price of Particl is too low to sustain development, which ultimately hurts Monero, as we are the leading blockchain that requires the types of solutions that Particl brings to the table.
+
+If you want to secure the smsg network, you are (currently) forced to run a Particl node. If you do choose to stake to secure the particl network, youre forced to donate 50% of total emission. If you dont stake, you have no control over the direction of the project(s). The emission can be used vote - on chain - to whichever direction the recipient of the emission taxes decide to vote - leading to centralization and ultimately control over the project(s). A downward spiral in the value of the blockchain.
+
+**TLDR: This CCS allows the Monero community to lead the space to a goal of having a FOSS, trustless, unregulatable, P2P, decentralized, liquid economy, with _0 fees, 0 dev taxes_ and _0 targets_.**
+
+**I would hope (and assume) that non-monero communities who are under constant threat for having cypherpunk ideals (_cough_ BTC, BCH, ETH, and whoever is next on the hitlist) will also support and donate to this endeavor.**
+
+##### In contrast to other DEX solutions
+- Bisq requires Bitcoin
+- Haveno, a fork of Bisq, is _not_ trustless and has a fee/profit-necessary human factor similar to LocalMonero: arbitrition. It also requires trusting whomever launched the network that you chose to join.
+- Serai is trustless, but liquidity pools are profit driven and require SRI.*
+- KamodoDEX implemented geo-blocking in the past (and doesnt support XMR)
+- Samourai and UnstoppableSwaps are unidirectional and only support BTC <> XMR
+
+All of these have either already been subjected to regulatory pressure, are prime targets, or are not full solutions.
+
+*In addition, I believe Serai's functionality requires the public sharing of monero view-keys while also utilizing txextra, which both on their own and together will reduce the privacy of non-serai monero transactions. _I may be incorrect / outdated in regards to Serai + view keys + txextra._ If FCMP precedes serai, it may alleviate some of these issues as well.

plowsof-ccs-coordinator-4.md

@@ -7,20 +7,20 @@ amount: 80.07
 milestones:
   - name: 2 meetings + hours worked
     funds: 26.69 XMR
-    done:
-    status: unfinished
+    done: 2 June 2024
+    status: finished
   - name: 2 meetings + hours worked
     funds: 26.69 XMR
-    done:
-    status: unfinished
+    done: 2 June 2024
+    status: finished
   - name: 2 meetings + hours worked
     funds: 26.69 XMR
     done:
     status: unfinished
 payouts:
-  - date:
+  - date: 24 June 2024
     amount: 26.69
-  - date:
+  - date: 24 June 2024
     amount: 26.69
   - date:
     amount: 26.69

revuo-monero-maintenance-2024-q3.md

@@ -0,0 +1,55 @@
+---
+layout: fr
+title: Revuo Monero maintenance (2024 Q3)
+author: rottenwheel
+date: June 3, 2024
+amount: 8
+milestones:
+  - name: July
+    funds: 3
+    done:
+    status: unfinished
+  - name: August
+    funds: 3
+    done:
+    status: unfinished
+  - name: September
+    funds: 2
+    done:
+    status: unfinished
+payouts:
+  - date:
+    amount:
+  - date:
+    amount:
+  - date:
+    amount:
+---
+
+# What
+
+I will maintain Revuo Monero (https://www.revuo-xmr.com/) for the next 3 months (2024 Q3): July, August and September. There is a chance I may skip one week to tend to real life issues, in such case, next issue will just cover 2 weeks instead of 1.
+
+Tasks:
+
+- Daily/weekly: search, curate, structure and post new reports/stories.
+- As Needed: outreach (engage with the community on Matrix, XMPP, emails).
+- As Needed: make sure the website is live and working as expected (server maintenance, billing, etc.)
+
+# Who
+
+rottenwheel, I joined the Monero community some time in 2017 by jumping into IRC, attending some Workgroup meetings, volunteering at the Monero village at DEFCON 28 in 2019 (https://redlib.zaggy.nl/r/Monero/comments/cqegma/monero_village_defcon_2019_report/), participating in community events and being involved with other community-driven, smaller projects.
+
+As a proof of work for this specific proposal, I have, since January 2022 until now, written almost 200 issues, 195 of which were published in current Revuo's self-hosted website. That does not take into account the following enhancements.
+
+Up to this point, all efforts behind Revuo Monero's comeback after Diego "rehrar" Salazar was let go and Revuo Monero's publication was paused for a few months, include but are not limited to:
+
+- Light/dark theme with a toggle button (mostly in CSS/HTML, minimizing the reliance in JavaScript as much as possible; site loads everything just fine in Tor browser with strict security mode on.)
+- Support and Source Code sections added.
+- RSS and Support icons.
+- Google fonts removed.
+- Twitter and Nostr profiles set up and posting new issues every week automatically. Twitter: https://nitter.poast.org/revuoxmr; Nostr: https://primal.net/p/npub1tn8spk9zhxrctg2qym3gj8r7eq2wk6z3phrl8304wc54vt9qam4qvzw6jx
+
+# Proposal
+
+I will publish weekly issues (4 per month) at a rate of $100 / issue. At $157.5 / XMR this makes 8 XMR (~7.6++) (100 * 4 * 3 = $1200) to be split in 3 monthly milestones. Rounding current 7.6++ XMR to 8 XMR to cover for price votatility between Work In Progress phase and progressive milestone(s) payouts.