Skip to content

Commit fbd02bd

Browse files
Christopher-SteversChristopher-Stevers
authored
Merge pull request #139 from OpenQDev/docker-shared-modules
updated to share node modules via docker
2 parents d363e59 + ffaa053 commit fbd02bd

File tree

4 files changed

+99
-90
lines changed

4 files changed

+99
-90
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules/
2+
.git/

‎.env.contracts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
OPENQ_PROXY_ADDRESS=0xBa1027c275f28bEE2B9aD2c6820A82E5e7f5171a
2-
OPENQ_IMPLEMENTATION_ADDRESS=0x7AB8F4680e1d5f85e3291ecF8B058411E72438c4
3-
CLAIM_MANAGER_PROXY_ADDRESS=0xbC79945dBd4dCaB554a8d8945dB9CC96C0F92796
4-
CLAIM_MANAGER_IMPLEMENTATION_ADDRESS=0xf519e5A8abC553f3Eef987634Cf44BE5873dc0B9
5-
DEPOSIT_MANAGER_PROXY_ADDRESS=0x57322A376aF677486312Ff555219f1C12Df857C7
6-
DEPOSIT_MANAGER_IMPLEMENTATION_ADDRESS=0xd0E6b01Ce1CE76FdD7f3d3102FFCA1767e3B29ce
7-
OPENQ_BOUNTY_FACTORY_ADDRESS=0xb2A2c9699720Dc8Bd4CCC4c4979cD1727932f026
8-
KYC_ADDRESS=0x205E10d3c4C87E26eB66B1B270b71b7708494dB9
9-
OPENQ_TOKEN_WHITELIST_ADDRESS=0x22773927c16E7A79C45167c712d12984961EdEFF
1+
OPENQ_PROXY_ADDRESS=0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9
2+
OPENQ_IMPLEMENTATION_ADDRESS=0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9
3+
CLAIM_MANAGER_PROXY_ADDRESS=0x0165878A594ca255338adfa4d48449f69242Eb8F
4+
CLAIM_MANAGER_IMPLEMENTATION_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
5+
DEPOSIT_MANAGER_PROXY_ADDRESS=0x610178dA211FEF7D417bC0e6FeD39F05609AD788
6+
DEPOSIT_MANAGER_IMPLEMENTATION_ADDRESS=0x8A791620dd6260079BF849Dc5567aDC3F2FdC318
7+
OPENQ_BOUNTY_FACTORY_ADDRESS=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
8+
KYC_ADDRESS=0xa513E6E4b8f2a923D98304ec87F64353C4D5C853
9+
ATOMIC_BOUNTY_BEACON_ADDRESS=0x0B306BF915C4d645ff596e518fAf3F9669b97016
10+
TIERED_FIXED_BOUNTY_BEACON_ADDRESS=0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1
11+
OPENQ_TOKEN_WHITELIST_ADDRESS=0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e
1012
OPENQ_DEPLOY_BLOCK_NUMBER=1
11-
ATOMIC_BOUNTY_IMPLEMENTATION=0x8b764cba62482BCD565846499c890FFc8ba6929C
12-
TIERED_FIXED_BOUNTY_IMPLEMENTATION=0xcafB2eeAf473a1132944eD2598470f95cd10D975
13-
MOCK_LINK_TOKEN_ADDRESS=0x326C977E6efc84E512bB9C30f76E30c160eD06FB
14-
MOCK_DAI_TOKEN_ADDRESS=0xfe4F5145f6e09952a5ba9e956ED0C25e3Fa4c7F1
15-
ATOMIC_BOUNTY_BEACON_ADDRESS=0x3303F65504BC3cA23d1e44304A51c025e22D00Fc
16-
TIERED_FIXED_BOUNTY_BEACON_ADDRESS=0xb0aC0f38179e33560738cd1066Bc78b1eE6eAa95
13+
ATOMIC_BOUNTY_IMPLEMENTATION=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
14+
TIERED_FIXED_BOUNTY_IMPLEMENTATION=0x9A676e781A523b5d0C0e43731313A708CB607508
15+
MOCK_LINK_TOKEN_ADDRESS=0x5FbDB2315678afecb367f032d93F642f64180aa3
16+
MOCK_DAI_TOKEN_ADDRESS=0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
17+
MOCK_DAI_BLACKLISTED_TOKEN_ADDRESS=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /app
44
RUN apk update && apk upgrade && \
55
apk add --no-cache bash git curl
66
COPY package.json .
7-
RUN yarn
7+
RUN yarn global add hardhat
88
COPY . .
99
CMD curl --connect-timeout 5 \
1010
--retry-connrefused \

‎package.json‎

Lines changed: 81 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,82 @@
11
{
2-
"name": "OpenQ-Contracts",
3-
"license": "MIT",
4-
"description": "OpenQ Contracts",
5-
"version": "1.0.0",
6-
"private": true,
7-
"scripts": {
8-
"ethnode": "hardhat node",
9-
"hardhat:clean": "hardhat clean",
10-
"hardhat:compile": "hardhat compile",
11-
"console:local": "hardhat console --network localhost",
12-
"accounts": "hardhat accounts --network localhost",
13-
"test": "hardhat test",
14-
"deploy-single:localhost": "hardhat run --network localhost deploy/eventTesters/BountyCreated.js",
15-
"invoicecomplete:atomic:localhost": "hardhat run --network localhost deploy/eventTesters/InvoiceCompleteSet_atomic.js",
16-
"invoicecomplete:tiered:localhost": "hardhat run --network localhost deploy/eventTesters/InvoiceCompleteSet_tiered.js",
17-
"supportingdocumentscomplete:atomic:localhost": "hardhat run --network localhost deploy/eventTesters/SupportingDocumentsCompleteSet_atomic.js",
18-
"supportingdocumentscomplete:tiered:localhost": "hardhat run --network localhost deploy/eventTesters/SupportingDocumentsCompleteSet_tiered.js",
19-
"deploy:localhost": "yarn deploy-contracts:localhost && yarn configure-whitelist:localhost && yarn deploy-bounties:localhost && yarn fund-bounties:localhost",
20-
"deploy:docker": "yarn deploy-contracts:docker && yarn configure-whitelist:docker && yarn deploy-bounties:docker && yarn fund-bounties:docker",
21-
"deploy:polygon": "yarn deploy-contracts:polygon && yarn configure-whitelist:polygon && yarn verify-contracts:polygon",
22-
"deploy-superfluid:docker": "hardhat run --network docker deploy/deploy_superfluid.js",
23-
"deploy-superfluid:localhost": "hardhat run --network localhost deploy/deploy_superfluid.js",
24-
"deploy-contracts:docker": "hardhat run --network docker deploy/deploy_contracts.js",
25-
"configure-whitelist:docker": "hardhat run --network docker deploy/configure-whitelist.js",
26-
"deploy-bounties:docker": "hardhat run --network docker deploy/deploy_bounties.js",
27-
"fund-bounties:docker": "hardhat run --network docker deploy/fund_bounties.js",
28-
"deploy-contracts:polygon": "hardhat run --network polygon deploy/deploy_contracts.js",
29-
"configure-whitelist:polygon": "hardhat run --network polygon deploy/configure-whitelist.js",
30-
"deploy-bounties:polygon": "hardhat run --network polygon deploy/deploy_bounties.js",
31-
"verify-contracts:polygon": "hardhat run --network polygon deploy/verify_contracts.js",
32-
"deploy-contracts:localhost": "hardhat run --network localhost deploy/deploy_contracts.js",
33-
"configure-whitelist:localhost": "hardhat run --network localhost deploy/configure-whitelist.js",
34-
"deploy-bounties:localhost": "hardhat run --network localhost deploy/deploy_bounties.js",
35-
"fund-bounties:localhost": "hardhat run --network localhost deploy/fund_bounties.js",
36-
"slither": "slither . --exclude-dependencies"
37-
},
38-
"dependencies": {
39-
"@nomiclabs/hardhat-ethers": "2.2.2",
40-
"@nomiclabs/hardhat-etherscan": "3.1.3",
41-
"@nomiclabs/hardhat-waffle": "2.0.3",
42-
"@openzeppelin/contracts": "4.7.3",
43-
"@openzeppelin/contracts-upgradeable": "4.7.3",
44-
"@superfluid-finance/ethereum-contracts": "1.5.0",
45-
"@superfluid-finance/sdk-core": "0.6.1",
46-
"chai": "4.3.7",
47-
"dotenv": "16.0.3",
48-
"ethereum-waffle": "3.4.4",
49-
"ethers": "5.7.2",
50-
"fs": "0.0.1-security",
51-
"graphql": "16.5.0",
52-
"hardhat": "2.12.7",
53-
"hardhat-contract-sizer": "2.6.1",
54-
"hardhat-gas-reporter": "1.0.9",
55-
"hardhat-tracer": "1.2.1",
56-
"path": "0.12.7",
57-
"solidity-docgen": "0.6.0-beta.34",
58-
"truffle-assertions": "0.9.2",
59-
"web3": "1.7.4"
60-
},
61-
"devDependencies": {
62-
"@nomicfoundation/hardhat-chai-matchers": "1.0.6",
63-
"@nomiclabs/hardhat-web3": "2.0.0",
64-
"@typechain/ethers-v5": "10.2.0",
65-
"@typechain/hardhat": "6.1.5",
66-
"eslint": "8.1.0",
67-
"eslint-config-prettier": "6.11.0",
68-
"eslint-plugin-prettier": "3.1.4",
69-
"nodemon": "2.0.20",
70-
"prettier": "2.0.5",
71-
"solidity-coverage": "0.8.2",
72-
"typechain": "8.1.1",
73-
"typescript": "4.7.4"
74-
}
75-
}
2+
"name": "OpenQ-Contracts",
3+
"license": "MIT",
4+
"description": "OpenQ Contracts",
5+
"version": "1.0.0",
6+
"private": true,
7+
"scripts": {
8+
"ethnode": "hardhat node",
9+
"hardhat:clean": "hardhat clean",
10+
"hardhat:compile": "hardhat compile",
11+
"console:local": "hardhat console --network localhost",
12+
"accounts": "hardhat accounts --network localhost",
13+
"test": "hardhat test",
14+
"deploy-single:localhost": "hardhat run --network localhost deploy/eventTesters/BountyCreated.js",
15+
"invoicecomplete:atomic:localhost": "hardhat run --network localhost deploy/eventTesters/InvoiceCompleteSet_atomic.js",
16+
"invoicecomplete:tiered:localhost": "hardhat run --network localhost deploy/eventTesters/InvoiceCompleteSet_tiered.js",
17+
"supportingdocumentscomplete:atomic:localhost": "hardhat run --network localhost deploy/eventTesters/SupportingDocumentsCompleteSet_atomic.js",
18+
"supportingdocumentscomplete:tiered:localhost": "hardhat run --network localhost deploy/eventTesters/SupportingDocumentsCompleteSet_tiered.js",
19+
"deploy:localhost": "yarn deploy-contracts:localhost && yarn configure-whitelist:localhost && yarn deploy-bounties:localhost && yarn fund-bounties:localhost",
20+
"deploy:docker": "yarn deploy-contracts:docker && yarn configure-whitelist:docker && yarn deploy-bounties:docker && yarn fund-bounties:docker",
21+
"deploy:polygon": "yarn deploy-contracts:polygon && yarn configure-whitelist:polygon && yarn verify-contracts:polygon",
22+
"deploy-superfluid:docker": "hardhat run --network docker deploy/deploy_superfluid.js",
23+
"deploy-superfluid:localhost": "hardhat run --network localhost deploy/deploy_superfluid.js",
24+
"deploy-contracts:docker": "hardhat run --network docker deploy/deploy_contracts.js",
25+
"configure-whitelist:docker": "hardhat run --network docker deploy/configure-whitelist.js",
26+
"deploy-bounties:docker": "hardhat run --network docker deploy/deploy_bounties.js",
27+
"fund-bounties:docker": "hardhat run --network docker deploy/fund_bounties.js",
28+
"deploy-contracts:polygon": "hardhat run --network polygon deploy/deploy_contracts.js",
29+
"configure-whitelist:polygon": "hardhat run --network polygon deploy/configure-whitelist.js",
30+
"deploy-bounties:polygon": "hardhat run --network polygon deploy/deploy_bounties.js",
31+
"verify-contracts:polygon": "hardhat run --network polygon deploy/verify_contracts.js",
32+
"deploy-contracts:localhost": "hardhat run --network localhost deploy/deploy_contracts.js",
33+
"configure-whitelist:localhost": "hardhat run --network localhost deploy/configure-whitelist.js",
34+
"deploy-bounties:localhost": "hardhat run --network localhost deploy/deploy_bounties.js",
35+
"fund-bounties:localhost": "hardhat run --network localhost deploy/fund_bounties.js",
36+
"slither": "slither . --exclude-dependencies"
37+
},
38+
"dependencies": {
39+
"@nomiclabs/hardhat-ethers": "2.2.2",
40+
"@nomiclabs/hardhat-etherscan": "3.1.3",
41+
"@nomiclabs/hardhat-waffle": "2.0.3",
42+
"@openzeppelin/contracts": "4.7.3",
43+
"@openzeppelin/contracts-upgradeable": "4.7.3",
44+
"@superfluid-finance/ethereum-contracts": "1.5.0",
45+
"@superfluid-finance/sdk-core": "0.6.1",
46+
"chai": "4.3.7",
47+
"dotenv": "16.0.3",
48+
"ethereum-waffle": "3.4.4",
49+
"ethers": "5.7.2",
50+
"fs": "0.0.1-security",
51+
"graphql": "16.5.0",
52+
"hardhat-contract-sizer": "2.6.1",
53+
"hardhat-gas-reporter": "1.0.9",
54+
"hardhat-tracer": "1.2.1",
55+
"path": "0.12.7",
56+
"solidity-docgen": "0.6.0-beta.34",
57+
"truffle-assertions": "0.9.2",
58+
"web3": "1.7.4"
59+
},
60+
"devDependencies": {
61+
"@nomicfoundation/hardhat-chai-matchers": "1.0.6",
62+
"@nomicfoundation/hardhat-network-helpers": "latest",
63+
"@ethersproject/abi": "latest",
64+
"@ethersproject/providers": "latest",
65+
"@types/chai": "latest",
66+
"@types/mocha": "latest",
67+
"@types/node": "latest",
68+
"ts-node": "latest",
69+
"@nomiclabs/hardhat-web3": "2.0.0",
70+
"@nomiclabs/hardhat-etherscan":"latest",
71+
"@typechain/ethers-v5": "10.2.0",
72+
"@typechain/hardhat": "6.1.5",
73+
"eslint": "8.1.0",
74+
"eslint-config-prettier": "6.11.0",
75+
"eslint-plugin-prettier": "3.1.4",
76+
"nodemon": "2.0.20",
77+
"prettier": "2.0.5",
78+
"solidity-coverage": "0.8.2",
79+
"typechain": "8.1.1",
80+
"typescript": "4.7.4"
81+
}
82+
}

0 commit comments

Comments
 (0)