Skip to content

Commit

Permalink
Merge branch 'w3f:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
hgergov authored Nov 27, 2023
2 parents 4d88ead + d69057f commit 1f70cbc
Show file tree
Hide file tree
Showing 37 changed files with 3,202 additions and 172 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

- [x] The [application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md) has been copied and aptly renamed (`project_name.md`).
- [ ] I have read the [application guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant_guidelines_per_category.md).
- [ ] Payment details have been provided (bank details via email _or_ Polkadot (USDC & USDT) or BTC address in the application).
- [ ] Payment details have been provided (bank details via email _or_ Polkadot (USDC & USDT) address in the application).
- [ ] The software delivered for this grant will be released under an open-source license specified in the application.
- [ ] The initial PR contains only one commit (squash and force-push if needed).
- [ ] The grant will only be announced once the first milestone [has been accepted](https://github.com/w3f/Grant-Milestone-Delivery#process) (see the [announcement guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/announcement-guidelines.md)).
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/check_application_document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,6 @@ on:
types: [opened, synchronize]

jobs:
discussion_private:
if: |
github.event.action == 'opened' &&
contains(github.event.pull_request.body, 'Project Abstract') && (
!contains(github.event.pull_request.body, '- [ ] I prefer the discussion') ||
(
contains(github.event.pull_request.body, '- [ ] I prefer the discussion') &&
!contains(github.event.pull_request.body, '@_______:matrix.org')
)
)
runs-on: ubuntu-latest
steps:
- name: Add 'discussion private' label if the application is private
uses: actions/github-script@v6
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["discussion private"]
})
get_filename:
if: contains(github.event.pull_request.body, 'Project Abstract')
runs-on: ubuntu-latest
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/private-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Check for private discussion

on:
workflow_dispatch:
pull_request:
types: [opened, edited]

jobs:
discussion_private:
if: |
contains(github.event.pull_request.body, 'Project Abstract') && (
!contains(github.event.pull_request.body, '- [ ] I prefer the discussion') ||
(
contains(github.event.pull_request.body, '- [ ] I prefer the discussion') &&
!contains(github.event.pull_request.body, '@_______:matrix.org')
)
)
runs-on: ubuntu-latest
steps:
- name: Add 'discussion private' label if the application is private
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["discussion private"]
})
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ In cases where a niche expert opinion is desirable, one of the committee members
- [Aeron Buchanan](https://github.com/aeronbuchanan)
- [Gautam Dhameja](https://github.com/gautamdhameja)
- [David Hawig](https://github.com/Noc2)
- [Diogo Mendonça](https://github.com/dsm-w3f)
- [Sebastian Müller](https://github.com/semuelle)
- [Bill Laboon](https://github.com/laboon)
- [Keegan Quigley](https://github.com/keeganquigley)
- [Nikhil Ranjan](https://github.com/nikw3f)
- [Raul Romanutti](https://github.com/rrtti)
- [Seraya Takahashi](https://github.com/takahser)
- [Benjamin Weiß](https://github.com/BenWhiteJam)
Expand All @@ -105,18 +103,15 @@ In cases where a niche expert opinion is desirable, one of the committee members
Evaluators are individuals able to evaluate the technology delivered as a result of the Grants Program. The committee has the right to add or remove evaluators on the basis of supermajority.

- [David Hawig](https://github.com/Noc2)
- [Diogo Mendonça](https://github.com/dsm-w3f)
- [Sebastian Müller](https://github.com/semuelle)
- [Keegan Quigley](https://github.com/keeganquigley)
- [Nikhil Ranjan](https://github.com/nikw3f)
- [Seraya Takahashi](https://github.com/takahser)

#### W3F Operations Team<!-- omit in toc -->

The Operations Team takes care of legal documents, invoicing, and remittances.

- [Melanie Diener](https://github.com/meldien)
- [Federica Dubbini](https://github.com/fededubbi)
- [Rouven Pérez](https://github.com/RouvenP)


Expand Down Expand Up @@ -147,7 +142,7 @@ The W3F Grants Program offers different grant levels to help you best, depending

## :pencil: Process

> **:loudspeaker:** Payments can be made in USDT and USDC on the Polkadot [AssetHub](https://wiki.polkadot.network/docs/learn-assets), Bitcoin, and fiat (USD, EUR, CHF). Please indicate your preference in the application [as outlined in our application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md?plain=1#L7). If you want to apply in **private**, you can do so [:arrow_right: here](https://docs.google.com/forms/d/e/1FAIpQLSfMfjiRmDQDRk-4OhNASM6BAKii7rz_B1jWtbCPkUh6N7M2ww/viewform). Note that this is generally a slower process and imposes stricter requirements on applicants.
> **:loudspeaker:** Payments can be made in USDT and USDC on the Polkadot [AssetHub](https://wiki.polkadot.network/docs/learn-assets) and fiat (USD, EUR, CHF). Please indicate your preference in the application [as outlined in our application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md?plain=1#L7). If you want to apply in **private**, you can do so [:arrow_right: here](https://docs.google.com/forms/d/e/1FAIpQLSfMfjiRmDQDRk-4OhNASM6BAKii7rz_B1jWtbCPkUh6N7M2ww/viewform). Note that this is generally a slower process and imposes stricter requirements on applicants.
### 1. Application

Expand Down Expand Up @@ -222,7 +217,7 @@ Please note that:

We give away 500 USD to each referral of a successful grant application by _anyone having previously worked on a Web3 Foundation grant_ or _a [Polkadot Ambassador](https://wiki.polkadot.network/docs/ambassadors)_. Web3 Foundation and Parity employees do not qualify for the program, even if they previously worked on a grant.

In order to be eligible for the referral bonus, the application itself must contain the name of the [Polkadot Ambassador](https://wiki.polkadot.network/docs/ambassadors) or the GitHub account of the grantee as well as the payment address for the referral bonus (see the [application template](applications/application-template.md)). Payment is made in Bitcoin or USDT/USDC on Polkadot AssetHub after delivery and approval of the first milestone.
In order to be eligible for the referral bonus, the application itself must contain the name of the [Polkadot Ambassador](https://wiki.polkadot.network/docs/ambassadors) or the GitHub account of the grantee as well as the payment address for the referral bonus (see the [application template](applications/application-template.md)). Payment is made in USDT/USDC on Polkadot AssetHub after delivery and approval of the first milestone.

## :bulb: Help

Expand Down Expand Up @@ -322,6 +317,7 @@ Below is a list of other grant and bounty programs in the Polkadot/Substrate eco
- [Astar / Shiden Network Builders Program](https://github.com/PlasmNetwork/Builders-Program)
- [Crust Grants Program](https://github.com/crustio/Crust-Grants-Program)
- [Darwinia Grants Program](https://github.com/darwinia-network/collaboration/blob/master/grant/README.md#grant-program)
- [Decentralized Futures Program](https://futures.web3.foundation/)
- [Edgeware Grants and Bounties](https://gov.edgewa.re/discussion/1132-edgeware-proposal-process-and-template)
- [HydraDX Grants and Bounties](https://docs.hydradx.io/spending_fw/)
- [ink!ubator](https://use.ink/ubator/)
Expand Down
1 change: 1 addition & 0 deletions applications/Claps.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- **Team Name:** Taiwan Research-based Biopharmaceutical Manufacturers Association
- **Payment Address:** 0x39D3E0c7AAcfbCa133f08cfb153B4888fd36bA9B (DAI)
- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 2
- **Status:** [Terminated](https://github.com/w3f/Grants-Program/pull/1440#issuecomment-1773610786)

## Overview

Expand Down
Loading

0 comments on commit 1f70cbc

Please sign in to comment.