Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monorepo support #294

Merged
merged 21 commits into from
Feb 7, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b1dc1a8
feat: Move typechain configs to contracts repo.
mprasanjith Nov 17, 2022
bb57ce1
fix: merge
dcrescimbeni Dec 7, 2022
1c3c57c
ci: added deployment scripts for 1.5 contracts
dcrescimbeni Dec 8, 2022
57b9e34
feat: Support monorepo.
mprasanjith Dec 12, 2022
e27e6b7
Merge branch 'feature/monorepo-setup' of github.com:DXgovernance/dxda…
mprasanjith Dec 12, 2022
8ccbd18
Merge branch 'feature/dxgov-guild-deployments' into feature/monorepo-…
MiltonTulli Dec 19, 2022
4c06e7e
fixes to implement subgraph in monorepo
MiltonTulli Dec 22, 2022
0d3cdbd
Merge branch 'v2.0' into feature/monorepo-setup-w-create2
MiltonTulli Jan 6, 2023
832746d
Fix eslint errors & format
MiltonTulli Jan 6, 2023
d910459
Fix deployment modules
MiltonTulli Jan 9, 2023
32b7eb3
Fix eslint warnings
MiltonTulli Jan 9, 2023
d2acc33
fix: replaced DXDVotingMachine references and initial params
dcrescimbeni Jan 9, 2023
47282c5
fix: deleted unwanted change
dcrescimbeni Jan 9, 2023
59ffded
Merge pull request #297 from dcrescimbeni/fix/dao-deploy-script-fixes
dcrescimbeni Jan 10, 2023
4e5e82a
Format & lint files
MiltonTulli Jan 16, 2023
f5f67f3
fix(deployGuild): moved mint action after the guild initialization
dcrescimbeni Jan 30, 2023
6e8dd67
feat: added localhost guild
dcrescimbeni Jan 30, 2023
0478089
fix: syncs blockchain time with current time
dcrescimbeni Jan 30, 2023
4c4f875
Merge pull request #306 from dcrescimbeni/dev/localhost-guild
dcrescimbeni Jan 30, 2023
1d67e91
Remove bytecodes update
MiltonTulli Feb 3, 2023
45b6602
Merge commit '1d67e913' into feature/monorepo-setup-w-create2
MiltonTulli Feb 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: merge
dcrescimbeni committed Dec 7, 2022

Verified

This commit was signed with the committer’s verified signature. The key has expired.
mmarchini mary marchini
commit bb57ce1893c002c955e9885c8a811829d72a1b69
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -14,10 +14,11 @@
],
"scripts": {
"test": "npx hardhat test",
"coverage": "./scripts/coverage.sh",
"typechain": "hardhat typechain",
"coverage": "OVERRIDE_GAS_LIMIT=0xfffffffffff OVERRIDE_GAS_PRICE=1 yarn hardhat coverage",
"build": "rm -rf artifacts cache contracts/hardhat-dependency-compiler && npx hardhat compile",
"typechain": "hardhat typechain",
"deploy": "node scripts/deploy.js",
"docify": "npx hardhat docgen && node ./scripts/build-docs-summary.js",
"solidity-linter": "./scripts/solhint.sh",
"solidity-contract-size": "yarn hardhat size-contracts",
"lint": "eslint .",
@@ -31,7 +32,7 @@
"@babel/eslint-parser": "^7.17.0",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-etherscan": "^3.1.0",
"@nomiclabs/hardhat-truffle5": "^2.0.0",
"@nomiclabs/hardhat-truffle5": "^2.0.7",
"@nomiclabs/hardhat-web3": "^2.0.0",
"@openzeppelin/contract-loader": "^0.6.1",
"@openzeppelin/hardhat-upgrades": "^1.6.0",
@@ -92,13 +93,15 @@
"@truffle/hdwallet-provider": "^1.4.0",
"arb-ethers-web3-bridge": "^0.7.3",
"chai": "^4.2.0",
"eip-712": "^1.0.0",
"ipfs-core": "^0.14.1",
"math": "0.0.3",
"moment": "^2.27.0",
"openzeppelin-solidity": "2.4.0",
"prettier": "^2.0.5",
"prettier-plugin-solidity": "^1.0.0-beta.19",
"truffle-flattener": "^1.4.4"
"solidity-docgen": "^0.6.0-beta.30",
"truffle-flattener": "^1.4.4",
"web3": "^1.8.0"
},
"peerDependencies": {
"ganache-cli": "^6.4.1"
You are viewing a condensed version of this merge commit. You can view the full changes here.