DAO-402: minime factory and standard bounties as app (#1398)

* add minime factory and move standard bounties as app * fix to stop on publish error
aragon · Oct 22, 2021 · 785fae4 · 785fae4
1 parent 050bac2
commit 785fae4
Show file tree

Hide file tree

Showing 44 changed files with 200 additions and 173 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -68,14 +68,12 @@ jobs:
             fi
         - name: publish
           id: publish
-          env:
-            PUBLISH_LOG: ./publish-deploy.log
           run:  |
             cd apps/${{ needs.checkTag.outputs.app }}
-            npx hardhat publish ${{ needs.checkTag.outputs.version }} --skip-validation --skip-app-build --network ${{ needs.checkTag.outputs.network }} | tee $PUBLISH_LOG
-            echo "::set-output name=cid::$(cat $PUBLISH_LOG | sed -nE 's/^.*ContentURI: *([^ ]*) *.*$/\1/p')"
-            echo "::set-output name=contract::$(cat $PUBLISH_LOG | sed -nE 's/^.*Contract address: *([^ ]*) *.*$/\1/p')"
-            echo "::set-output name=txhash::$(cat $PUBLISH_LOG | sed -nE 's/^.*Tx hash: *([^ ]*) *.*$/\1/p')"
+            PUBLISH_MESSAGE=$(npx hardhat publish ${{ needs.checkTag.outputs.version }} --skip-validation --skip-app-build --network ${{ needs.checkTag.outputs.network }})
+            echo "::set-output name=cid::$(echo $PUBLISH_MESSAGE | sed -nE 's/^.*ContentURI: *([^ ]*) *.*$/\1/p')"
+            echo "::set-output name=contract::$(echo $PUBLISH_MESSAGE | sed -nE 's/^.*Contract address: *([^ ]*) *.*$/\1/p')"
+            echo "::set-output name=txhash::$(echo $PUBLISH_MESSAGE | sed -nE 's/^.*Tx hash: *([^ ]*) *.*$/\1/p')"
         - name: package app
           id: packaging
           env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -98,12 +98,10 @@ jobs:
           fi
       - name: publish
         id: publish
-        env:
-          PUBLISH_LOG: ./publish-release.log
         run:  |
           cd apps/${{ matrix.app }}
-          npx hardhat publish ${{ matrix.level }} --dry-run --skip-validation --skip-app-build --network ${{ matrix.network }} | tee $PUBLISH_LOG
-          echo "::set-output name=version::$(cat $PUBLISH_LOG | sed -nE 's/^.*next version: *([^ ]*) *.*$/\1/p')"
+          PUBLISH_MESSAGE=$(npx hardhat publish ${{ matrix.level }} --dry-run --skip-validation --skip-app-build --network ${{ matrix.network }})
+          echo "::set-output name=version::$(echo $PUBLISH_MESSAGE | sed -nE 's/^.*next version: *([^ ]*) *.*$/\1/p')"
       - name: create tag
         uses: actions/github-script@v5
         env:

diff --git a/apps/minime-factory/arapp.json b/apps/minime-factory/arapp.json
@@ -0,0 +1,51 @@
+{
+  "path": "contracts/MiniMeTokenFactory.sol",
+  "environments": {
+    "default": {
+      "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "rpc"
+    },
+    "harmony": {
+      "registry": "0x5d0d0212199b2c041483226b20f1e4ed6ca4a4de",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "harmony"
+    },
+    "harmonyTest": {
+      "registry": "0xbc7828fa8665c637901ad5abd5c7e647c9ab140f",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "harmonyTest"
+    },
+    "mainnet": {
+      "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "mainnet"
+    },
+    "rinkeby": {
+      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "rinkeby"
+    },
+    "ropsten": {
+      "registry": "0x6afe2cacee211ea9179992f89dc61ff25c61e923",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "ropsten"
+    },
+    "staging": {
+      "registry": "0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "rinkeby"
+    },
+    "mumbai": {
+      "registry": "0x431f0eed904590b176f9ff8c36a1c4ff0ee9b982",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "mumbai"
+    },
+    "matic": {
+      "registry": "0x3c70a0190d09f34519e6e218364451add21b7d4b",
+      "appName": "minime-factory.aragonpm.eth",
+      "network": "matic"
+    }
+  },
+  "roles": []
+}
diff --git a/apps/minime-factory/contracts/MiniMeTokenFactory.sol b/apps/minime-factory/contracts/MiniMeTokenFactory.sol
@@ -0,0 +1,4 @@
+pragma solidity 0.4.24;
+
+import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol";
+
diff --git a/apps/minime-factory/hardhat.config.js b/apps/minime-factory/hardhat.config.js
@@ -0,0 +1 @@
+module.exports = require('@aragon/hardhat-config')
diff --git a/apps/minime-factory/manifest.json b/apps/minime-factory/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "MiniMeTokenFactory",
+  "author": "Aragon Association",
+  "description": "Factory of Minime tokens",
+  "changelog_url": "https://github.com/aragon/aragon-apps/releases",
+  "details_url": "/meta/details.md",
+  "source_url": "https://github.com/aragon/aragon-apps/blob/master/apps/minime-factory",
+  "icons": [
+    { "src": "/meta/icon.svg", "sizes": "56x56" }
+  ]
+}
diff --git a/apps/minime-factory/package.json b/apps/minime-factory/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "@aragon/apps-minime-factory",
+  "version": "1.0.0",
+  "author": "Aragon Association <[email protected]>",
+  "license": "(GPL-3.0-or-later OR AGPL-3.0-or-later)",
+  "files": [
+    "/arapp.json",
+    "/manifest.json",
+    "/hardhat-config.js",
+    "/public",
+    "/contracts"
+  ],
+  "scripts": {
+    "compile": "hardhat compile"
+  },
+  "devDependencies": {
+    "@aragon/hardhat-aragon": "^1.0.0",
+    "@aragon/hardhat-config": "^1.0.0",
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
+    "@nomiclabs/hardhat-etherscan": "^2.1.6",
+    "ethers": "^5.4.7",
+    "hardhat": "^2.6.5"
+  },
+  "dependencies": {
+    "@aragon/apps-shared-minime": "^1.0.2"
+  }
+}
diff --git a/apps/minime-factory/public/meta/details.md b/apps/minime-factory/public/meta/details.md
@@ -0,0 +1,3 @@
+# Minime Token Factory
+
+Lightly modified. See [original](https://github.com/Giveth/minime).
diff --git a/apps/minime-factory/public/meta/icon.svg b/apps/minime-factory/public/meta/icon.svg
diff --git a/apps/standard-bounties/.gitignore b/apps/standard-bounties/.gitignore
@@ -0,0 +1 @@
+artifacts
diff --git a/shared/integrations/StandardBounties/LICENSE → apps/standard-bounties/LICENSE b/shared/integrations/StandardBounties/LICENSE → apps/standard-bounties/LICENSE
diff --git a/...d/integrations/StandardBounties/README.md → apps/standard-bounties/README.md b/...d/integrations/StandardBounties/README.md → apps/standard-bounties/README.md
diff --git a/apps/standard-bounties/arapp.json b/apps/standard-bounties/arapp.json
@@ -0,0 +1,51 @@
+{
+  "path": "contracts/StandardBounties.sol",
+  "environments": {
+    "default": {
+      "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "rpc"
+    },
+    "harmony": {
+      "registry": "0x5d0d0212199b2c041483226b20f1e4ed6ca4a4de",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "harmony"
+    },
+    "harmonyTest": {
+      "registry": "0xbc7828fa8665c637901ad5abd5c7e647c9ab140f",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "harmonyTest"
+    },
+    "mainnet": {
+      "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "mainnet"
+    },
+    "rinkeby": {
+      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "rinkeby"
+    },
+    "ropsten": {
+      "registry": "0x6afe2cacee211ea9179992f89dc61ff25c61e923",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "ropsten"
+    },
+    "staging": {
+      "registry": "0xfe03625ea880a8cba336f9b5ad6e15b0a3b5a939",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "rinkeby"
+    },
+    "mumbai": {
+      "registry": "0x431f0eed904590b176f9ff8c36a1c4ff0ee9b982",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "mumbai"
+    },
+    "matic": {
+      "registry": "0x3c70a0190d09f34519e6e218364451add21b7d4b",
+      "appName": "standard-bounties.aragonpm.eth",
+      "network": "matic"
+    }
+  },
+  "roles": []
+}
diff --git a/...nties/contracts/BountiesMetaTxRelayer.sol → ...nties/contracts/BountiesMetaTxRelayer.sol b/...nties/contracts/BountiesMetaTxRelayer.sol → ...nties/contracts/BountiesMetaTxRelayer.sol
diff --git a/...rdBounties/contracts/StandardBounties.sol → ...d-bounties/contracts/StandardBounties.sol b/...rdBounties/contracts/StandardBounties.sol → ...d-bounties/contracts/StandardBounties.sol
diff --git a/...unties/contracts/inherited/ERC20Token.sol → ...unties/contracts/inherited/ERC20Token.sol b/...unties/contracts/inherited/ERC20Token.sol → ...unties/contracts/inherited/ERC20Token.sol
diff --git a/...nties/contracts/inherited/ERC721Basic.sol → ...nties/contracts/inherited/ERC721Basic.sol b/...nties/contracts/inherited/ERC721Basic.sol → ...nties/contracts/inherited/ERC721Basic.sol
diff --git a/...ontracts/inherited/HumanStandardToken.sol → ...ontracts/inherited/HumanStandardToken.sol b/...ontracts/inherited/HumanStandardToken.sol → ...ontracts/inherited/HumanStandardToken.sol
diff --git a/...unties/contracts/inherited/Migrations.sol → ...unties/contracts/inherited/Migrations.sol b/...unties/contracts/inherited/Migrations.sol → ...unties/contracts/inherited/Migrations.sol
diff --git a/...ardBounties/contracts/inherited/Token.sol → ...rd-bounties/contracts/inherited/Token.sol b/...ardBounties/contracts/inherited/Token.sol → ...rd-bounties/contracts/inherited/Token.sol
diff --git a/...StandardBounties/docs/documentation_v1.md → ...tandard-bounties/docs/documentation_v1.md b/...StandardBounties/docs/documentation_v1.md → ...tandard-bounties/docs/documentation_v1.md
diff --git a/...StandardBounties/docs/documentation_v2.md → ...tandard-bounties/docs/documentation_v2.md b/...StandardBounties/docs/documentation_v2.md → ...tandard-bounties/docs/documentation_v2.md
diff --git a/...s/StandardBounties/docs/gitcoinSchemas.md → .../standard-bounties/docs/gitcoinSchemas.md b/...s/StandardBounties/docs/gitcoinSchemas.md → .../standard-bounties/docs/gitcoinSchemas.md
diff --git a/.../StandardBounties/docs/standardSchemas.md → ...standard-bounties/docs/standardSchemas.md b/.../StandardBounties/docs/standardSchemas.md → ...standard-bounties/docs/standardSchemas.md
diff --git a/...d/integrations/StandardBounties/graph.txt → apps/standard-bounties/graph.txt b/...d/integrations/StandardBounties/graph.txt → apps/standard-bounties/graph.txt
diff --git a/apps/standard-bounties/hardhat.config.js b/apps/standard-bounties/hardhat.config.js
@@ -0,0 +1,4 @@
+const config = require('@aragon/hardhat-config')
+config.solidity.version = '0.5.0'
+
+module.exports = config
diff --git a/...grations/StandardBounties/inheritance.txt → apps/standard-bounties/inheritance.txt b/...grations/StandardBounties/inheritance.txt → apps/standard-bounties/inheritance.txt
diff --git a/apps/standard-bounties/manifest.json b/apps/standard-bounties/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "StandardBounties",
+  "author": "Aragon Association",
+  "description": "A generalized set of contracts to issue bounties",
+  "changelog_url": "https://github.com/aragon/aragon-apps/releases",
+  "details_url": "/meta/details.md",
+  "source_url": "https://github.com/aragon/aragon-apps/blob/master/apps/standard-bounties",
+  "icons": [
+    { "src": "/meta/icon.svg", "sizes": "56x56" }
+  ]
+}
diff --git a/apps/standard-bounties/package.json b/apps/standard-bounties/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@aragon/apps-standard-bounties",
+  "version": "1.0.0",
+  "author": "Aragon Association <[email protected]>",
+  "license": "(GPL-3.0-or-later OR AGPL-3.0-or-later)",
+  "files": [
+    "/arapp.json",
+    "/manifest.json",
+    "/hardhat-config.js",
+    "/public",
+    "/contracts"
+  ],
+  "scripts": {
+    "compile": "hardhat compile"
+  },
+  "devDependencies": {
+    "@aragon/hardhat-aragon": "^1.0.0",
+    "@aragon/hardhat-config": "^1.0.0",
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
+    "@nomiclabs/hardhat-etherscan": "^2.1.6",
+    "ethers": "^5.4.7",
+    "hardhat": "^2.6.5"
+  }
+}
diff --git a/apps/standard-bounties/public/meta/details.md b/apps/standard-bounties/public/meta/details.md
@@ -0,0 +1,3 @@
+# StandardBounties
+A generalized set of contracts to issue bounties for any task, paying in any ERC20, ERC721, or ETH tokens.
+
diff --git a/apps/standard-bounties/public/meta/icon.svg b/apps/standard-bounties/public/meta/icon.svg
diff --git a/...dBounties/test/StandardBountiesInERC20.js → ...-bounties/test/StandardBountiesInERC20.js b/...dBounties/test/StandardBountiesInERC20.js → ...-bounties/test/StandardBountiesInERC20.js
diff --git a/...Bounties/test/StandardBountiesInERC721.js → ...bounties/test/StandardBountiesInERC721.js b/...Bounties/test/StandardBountiesInERC721.js → ...bounties/test/StandardBountiesInERC721.js
diff --git a/...ardBounties/test/StandardBountiesInETH.js → ...rd-bounties/test/StandardBountiesInETH.js b/...ardBounties/test/StandardBountiesInETH.js → ...rd-bounties/test/StandardBountiesInETH.js
diff --git a/...ns/StandardBounties/test/helpers/Utils.js → apps/standard-bounties/test/helpers/Utils.js b/...ns/StandardBounties/test/helpers/Utils.js → apps/standard-bounties/test/helpers/Utils.js
diff --git a/shared/integrations/StandardBounties/.gitignore b/shared/integrations/StandardBounties/.gitignore
diff --git a/shared/integrations/StandardBounties/.solcover.js b/shared/integrations/StandardBounties/.solcover.js
diff --git a/shared/integrations/StandardBounties/.soliumignore b/shared/integrations/StandardBounties/.soliumignore
diff --git a/shared/integrations/StandardBounties/.soliumrc.json b/shared/integrations/StandardBounties/.soliumrc.json
diff --git a/shared/integrations/StandardBounties/migrations/1_initial_migration.js b/shared/integrations/StandardBounties/migrations/1_initial_migration.js
diff --git a/shared/integrations/StandardBounties/migrations/2_deploy_contracts.js b/shared/integrations/StandardBounties/migrations/2_deploy_contracts.js
diff --git a/shared/integrations/StandardBounties/package.json b/shared/integrations/StandardBounties/package.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		pragma solidity 0.4.24;

		import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('@aragon/hardhat-config')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Minime Token Factory

		Lightly modified. See [original](https://github.com/Giveth/minime).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# StandardBounties
		A generalized set of contracts to issue bounties for any task, paying in any ERC20, ERC721, or ETH tokens.