Skip to content

Commit af68ad0

Browse files
victormimovictormimo
authored
Merge pull request #25 from victormimo/dev
Dev to Main: Diamond
2 parents c920091 + fbdeaa1 commit af68ad0

File tree

161 files changed

+13567
-4778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+13567
-4778
lines changed

‎.env.example

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,14 @@ ETHERSCAN_L1_API_KEY=UPDATE_ME
1919
# Server port
2020
PORT=8293
2121

22+
# FACET ADDRESSES
23+
DIAMOND_CUT_FACET=
24+
ISSUER_FACET=
25+
STAKEHOLDER_FACET=
26+
STOCK_CLASS_FACET=
27+
STOCK_FACET=
28+
CONVERTIBLES_FACET=
29+
EQUITY_COMPENSATION_FACET=
30+
STOCK_PLAN_FACET=
31+
WARRANT_FACET=
32+
STAKEHOLDER_NFT_FACET=

‎.gitignore

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
!.yarn/versions
1010
.pnp.*
1111

12+
1213
# dependencies
1314
node_modules
1415

@@ -23,23 +24,18 @@ yarn-error.log*
2324
# local env files
2425
.env
2526
.env.local
26-
.env.development.local
27-
.env.test.local
28-
.env.production.local
29-
.env.testnet
30-
31-
# vercel
32-
.vercel
33-
34-
**/*.generated.*
35-
**/*.graphql.d.ts
36-
**/*.graphqls.d.ts
27+
.env.dev
28+
.env.prod
3729

3830
!.vscode
3931

40-
# WebStorm
41-
.idea/**/*
4232

4333
# TypeScript
4434
tsconfig.tsbuildinfo
45-
.history
35+
.history
36+
37+
# Private keys
38+
*.pem
39+
.env.*
40+
chain/out
41+
chain/lib/*

‎.gitmodules

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "ocf"]
2-
path = ocf
3-
url = https://github.com/poet-network/tap-ocf.git
41
[submodule "chain/lib/forge-std"]
52
path = chain/lib/forge-std
63
url = https://github.com/foundry-rs/forge-std
@@ -9,4 +6,10 @@
96
url = https://github.com/OpenZeppelin/openzeppelin-contracts
107
[submodule "chain/lib/openzeppelin-contracts-upgradeable"]
118
path = chain/lib/openzeppelin-contracts-upgradeable
12-
url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
9+
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
10+
[submodule "chain/lib/diamond-3-hardhat"]
11+
path = chain/lib/diamond-3-hardhat
12+
url = https://github.com/mudgen/diamond-3-hardhat
13+
[submodule "ocf"]
14+
path = ocf
15+
url = https://github.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF

‎.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarn flightcheck

‎.prettierignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Dependencies
2+
/node_modules
3+
/chain/out
4+
.history
5+
6+
# Build output
7+
/dist
8+
/build
9+
10+
# Coverage reports
11+
/coverage
12+
13+
# Environment files
14+
.env*
15+
16+
# Logs
17+
*.log

‎.prettierrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
{
2-
"tabWidth": 4,
32
"semi": true,
4-
"singleQuote": false,
3+
"tabWidth": 4,
54
"trailingComma": "es5",
65
"bracketSpacing": true,
7-
"jsxBracketSameLine": false,
86
"arrowParens": "always",
97
"printWidth": 150,
108
"endOfLine": "auto",

‎.solhintrc

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"extends": "solhint:recommended",
3+
"rules": {
4+
"compiler-version": [
5+
"error",
6+
"^0.8.0"
7+
],
8+
"func-visibility": [
9+
"error",
10+
{
11+
"ignoreConstructors": true
12+
}
13+
],
14+
"not-rely-on-time": "off",
15+
"no-empty-blocks": "warn",
16+
"max-line-length": [
17+
"warn",
18+
120
19+
],
20+
"reason-string": [
21+
"warn",
22+
{
23+
"maxLength": 64
24+
}
25+
],
26+
"state-visibility": "error",
27+
"var-name-mixedcase": "warn",
28+
"func-name-mixedcase": "warn",
29+
"private-vars-leading-underscore": [
30+
"warn",
31+
{
32+
"strict": false
33+
}
34+
],
35+
"ordering": "warn",
36+
"reentrancy": "error",
37+
"avoid-low-level-calls": "warn"
38+
}
39+
}

‎.vscode/settings.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"solidity.packageDefaultDependenciesDirectory": "chain/lib",
3+
"solidity.packageDefaultDependenciesContractsDirectory": "chain/src",
4+
"solidity.formatter": "prettier",
5+
"solidity.compileUsingRemoteVersion": "v0.8.20",
6+
"solidity.remappings": ["@openzeppelin/=chain/lib/openzeppelin-contracts/", "@diamond/=chain/src/lib/diamond/"],
7+
"solidity.linter": "solium",
8+
"solidity.enabledAsYouTypeCompilationErrorCheck": true,
9+
"editor.formatOnSave": true,
10+
"[solidity]": {
11+
"editor.defaultFormatter": "JuanBlanco.solidity",
12+
"editor.codeActionsOnSave": {
13+
"source.fixAll": "always"
14+
}
15+
}
16+
}

‎Dockerfile.dev

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ FROM node:18
44
# Set the working directory
55
WORKDIR /app
66

7-
# COPY ./chain/out ./chain/out
87
COPY . .
98

109
# Install dependencies and setup
1110
RUN yarn install
1211

1312
EXPOSE 8080
1413
# Specify the command to run on container start
15-
CMD ["npx", "ts-node", "src/server.js"]
16-
14+
CMD ["yarn", "dev"]

‎Dockerfile.prod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ COPY . .
99

1010
# Install dependencies and setup
1111
RUN yarn install
12-
RUN git submodule update --init --recursive
1312

1413
EXPOSE 8080
1514
# Specify the command to run on container start
16-
CMD ["npx", "tsx", "src/server.js", "--finalized-only"]
15+
CMD ["yarn", "prod"]

0 commit comments

Comments
 (0)