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

Initial Commit #1

Merged
187 commits merged into from
Jul 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
1603922
Origin Base v0.1 Added
remedcu Jun 15, 2021
a68d836
Origin Admin Added
remedcu Jun 15, 2021
05536d5
Origin Events Added
remedcu Jun 15, 2021
d00528d
Origins Storage Added
remedcu Jun 15, 2021
a6df42e
Locked Fund v0.1 Added
remedcu Jun 15, 2021
8f0e083
Openzeppelin Helpers Added
remedcu Jun 15, 2021
c3fbb5d
Interfaces Added
remedcu Jun 15, 2021
a2036bb
Added artifacts for FE
remedcu Jun 15, 2021
6325524
Updated package.json and lock file
remedcu Jun 15, 2021
d6b6f26
v0.1 Documentation added
remedcu Jun 15, 2021
3b8e9fe
Added dummy scripts
remedcu Jun 15, 2021
9f45835
Added dummy test files
remedcu Jun 15, 2021
7d1ee7f
Added git attributes
remedcu Jun 15, 2021
5a1f8d7
Added brownie config for scripts
remedcu Jun 15, 2021
9321d62
Added Truffle Config
remedcu Jun 15, 2021
3aaf12e
Added hardhat for Testing
remedcu Jun 15, 2021
db2a67c
Added formatting files
remedcu Jun 15, 2021
d540c43
Added Github Workflows
remedcu Jun 15, 2021
154b6fa
Updated .gitignore
remedcu Jun 15, 2021
0d2e860
Updated README
remedcu Jun 15, 2021
26e1a5d
package.json updated
remedcu Jun 15, 2021
bfa4147
gitignore updated
remedcu Jun 15, 2021
0574d4d
cContracts Formatted
remedcu Jun 15, 2021
c40c5b0
Artifacts Updated
remedcu Jun 15, 2021
3f214e9
Doc Updated
remedcu Jun 15, 2021
f66fc87
Artifacts Updated
remedcu Jun 15, 2021
a3fb746
Updated the github workflow file
remedcu Jun 15, 2021
13b95fa
Minor refactoring
remedcu Jun 15, 2021
90e139a
CI Updated
remedcu Jun 15, 2021
0063477
Badge added to README
remedcu Jun 15, 2021
c8d2446
Enum parameters updated
remedcu Jun 16, 2021
215f12c
IOrigins Updated
remedcu Jun 16, 2021
a183a81
ERC20Detailed now uses ERC20 rather than IERC20_
remedcu Jun 16, 2021
3b4ca30
package.json updated
remedcu Jun 16, 2021
33c9b1e
Formatted OriginsBase and IOrigins
remedcu Jun 16, 2021
c3aa747
Setting token address added to constructor
remedcu Jun 17, 2021
bf75384
Formatted OriginsBase
remedcu Jun 17, 2021
c1f0ba3
Updated brownie config file
remedcu Jun 18, 2021
7177a24
Locked Fund function visibiltiy updated
remedcu Jun 18, 2021
d9f265f
Updated the OriginsBase constructor
remedcu Jun 18, 2021
29c2cd5
Deploy JSON removed
remedcu Jun 18, 2021
be72089
Multisig Wallet Contract Added
remedcu Jun 18, 2021
776100a
Testnet Contract Address Added
remedcu Jun 18, 2021
6a65475
Token Contracts Added
remedcu Jun 18, 2021
369f94e
Locked Contract Deployment Script Added
remedcu Jun 18, 2021
fefa206
Multisig Deployment Script Added
remedcu Jun 18, 2021
c96eb94
README updated with UML and Call Graph
remedcu Jun 18, 2021
2f67de7
IApproveAndCall formatted
remedcu Jun 18, 2021
a13b19a
Token Contract import updated
remedcu Jun 18, 2021
7a3fa76
Locked Fund Script Updated
remedcu Jun 18, 2021
ea66272
Package Lock Updated
remedcu Jun 18, 2021
7f9eac1
Mainnet JSON Updated
remedcu Jun 18, 2021
3237c7d
Brownie Config Updated
remedcu Jun 21, 2021
2f43cca
Locked Fund MAX_DURATION Updated
remedcu Jun 21, 2021
e0fa3ed
OriginsStorage Updated
remedcu Jun 21, 2021
663ca59
OriginsAdmin Updated
remedcu Jun 21, 2021
b26d02a
OriginsEvents Updated
remedcu Jun 21, 2021
053e759
IOrigins Updated
remedcu Jun 21, 2021
406c2a1
OriginsBase Updated
remedcu Jun 21, 2021
2df7e87
RemainingTokenWithdraw Event Added
remedcu Jun 21, 2021
2a376cf
Multisig Deployment Script Updated
remedcu Jun 21, 2021
4f55ef7
LockedFund Deployment Script Updated
remedcu Jun 21, 2021
c89c9c0
Testnet Contracts JSON Updated
remedcu Jun 21, 2021
f657402
Development Contracts JSON Added
remedcu Jun 21, 2021
9925e1f
Base and Event Code Formatted
remedcu Jun 21, 2021
94767b6
Deploy Locked Script Updated
remedcu Jun 21, 2021
7ee3910
JSON Values Updated
remedcu Jun 21, 2021
a2c1352
Origins Deployment Script Added
remedcu Jun 21, 2021
1151416
Origins README added.
remedcu Jun 21, 2021
f134aaa
Transfer check added
remedcu Jun 22, 2021
61b8724
Rectified token calculation in OriginsBase
remedcu Jun 22, 2021
db48ccf
Testnet Address Updated
remedcu Jun 22, 2021
fd1b25c
Solcover updated
remedcu Jun 22, 2021
4f44a83
LockedFund Script Updated
remedcu Jun 22, 2021
ac2557a
OriginsBase Script Updated
remedcu Jun 22, 2021
8c659b0
LockedFund Error Message Updated
remedcu Jun 22, 2021
782f275
Formatted OriginsBase
remedcu Jun 22, 2021
254632e
LockedFund waitedTS require check removed
remedcu Jun 23, 2021
f6e3fa6
LockedFund internal stake function updated
remedcu Jun 23, 2021
7254de8
LockedFund Testnet Contract Updated
remedcu Jun 23, 2021
cf1be3b
LockedFund Script Updated
remedcu Jun 23, 2021
8650ab8
OriginsBase Max Allowed calculation udpated
remedcu Jun 23, 2021
13adcda
Origins Testnet Contract Updated
remedcu Jun 23, 2021
54e2581
OriginsBase RemainingToken Calculation Updated
remedcu Jun 23, 2021
01e7e72
Testnet Contracts Updated
remedcu Jun 23, 2021
26d9db9
README Updated
remedcu Jun 24, 2021
4d086db
OriginsBase Smart Contract Updated
remedcu Jun 24, 2021
0c863fa
Supporting Interfaces Added
remedcu Jun 24, 2021
11b2c8d
Supporting Openzeppelin Contracts Added
remedcu Jun 24, 2021
509f797
Supporting Sovryn Contracts Added
remedcu Jun 24, 2021
c6fe740
Removed unwanted files
remedcu Jun 24, 2021
146e059
Mainnet JSON Updated
remedcu Jun 24, 2021
17e9bae
Testnet JSON Updated
remedcu Jun 24, 2021
879c3d0
LockedFund Tests Added
remedcu Jun 24, 2021
a53c281
Action workflow updated
remedcu Jun 24, 2021
ba301ba
LockedFund Test Formatted
remedcu Jun 24, 2021
29eec84
Github Action workflow updated
remedcu Jun 24, 2021
6b17eef
Github Action workflow updated
remedcu Jun 24, 2021
cb82583
Github Action Updated
remedcu Jun 24, 2021
0eba277
Github Action Updated
remedcu Jun 24, 2021
512973b
Testnet Contract Updated
remedcu Jun 24, 2021
cef8f16
OriginsBase Contract Updated
remedcu Jun 24, 2021
e348ca6
Origins Storage added the total token allocation
remedcu Jun 24, 2021
1ac6c3b
Development JSON Updated
remedcu Jun 24, 2021
2bbfbd6
Added OriginsAdmin Tests
remedcu Jun 24, 2021
1068ec5
OriginsAdmin Tests Formatted
remedcu Jun 24, 2021
1e24f0f
Updated OriginsBase
remedcu Jun 24, 2021
678fe3c
LockedFund Script Updated
remedcu Jun 24, 2021
329dbae
Origins Script Updated
remedcu Jun 24, 2021
1b4ae24
OriginsBase Tests Added
remedcu Jun 24, 2021
a8a1fce
Testnet JSON Updated
remedcu Jun 24, 2021
75e5475
OriginsBase Test Formatted
remedcu Jun 24, 2021
33280b0
added custom paths to .gitignore
tjcloa Jul 1, 2021
c419c09
fix: NamespaceCollision in brownie when compiling
tjcloa Jul 1, 2021
cb142d8
added data for tier 3 on the testnet
tjcloa Jul 1, 2021
5448d69
Deploy Origins Token Balance Check Added
remedcu Jul 2, 2021
d56b690
Brownie gas_limit removed
remedcu Jul 2, 2021
f447aa6
Initial UML diagram added
remedcu Jul 2, 2021
eb866db
Event Check Empty File Added
remedcu Jul 2, 2021
48199b9
Merge branch 'initial' of https://github.com/DistributedCollective/or…
remedcu Jul 2, 2021
19c9a44
Hardhat config updated
remedcu Jul 15, 2021
9f084b6
LockedFund updated with UnlockType, Deposit Functions, etc
remedcu Jul 15, 2021
2d5b8ec
OriginsBase Function Signature updated and UnlockedTS removed
remedcu Jul 15, 2021
7ee4482
OriginsEvent UnlockedTS removed
remedcu Jul 15, 2021
8de3b9b
OriginsStorage UnlockType enum added & UnlockedTS removed
remedcu Jul 15, 2021
2cbde9d
ILockedFund updated based on LockedFund
remedcu Jul 15, 2021
bc630ac
IOrigins updated based on Origins
remedcu Jul 15, 2021
e281e69
Token Contract Updated
remedcu Jul 15, 2021
90c1bec
LockedFund Test Updated
remedcu Jul 15, 2021
4e73b3a
OriginsBase Test Updated
remedcu Jul 15, 2021
1df6cb8
Added Script for Multisig, Token & Governance Creation
remedcu Jul 15, 2021
e9c6e6d
Origins Based Script Refactored and Moved
remedcu Jul 15, 2021
448fc56
Updated Automated Documentation
remedcu Jul 15, 2021
de3e179
Tests Formatted
remedcu Jul 15, 2021
74c3871
package.json updated for npm
remedcu Jul 15, 2021
71dd78a
LockedFund Formatted
remedcu Jul 15, 2021
c6c8867
Formatting Changes
remedcu Jul 15, 2021
22aeda1
Alpha Version
remedcu Jul 15, 2021
cb2ca0c
Prettier Config file updated
remedcu Jul 15, 2021
bb2ee43
Solidity Coverage Config File Updated
remedcu Jul 15, 2021
456c019
Solhint config file updated
remedcu Jul 15, 2021
494303f
Hardhat Config File Updated
remedcu Jul 15, 2021
12921f4
README Updated
remedcu Jul 15, 2021
67e0532
Truffle Config Updated
remedcu Jul 15, 2021
7136125
UML Diagram Updated
remedcu Jul 15, 2021
55262d2
Origins Script README Updated
remedcu Jul 15, 2021
edc1dd6
Token Script README Updated
remedcu Jul 15, 2021
6eb87c9
Values Formatted
remedcu Jul 15, 2021
ae68ddd
package.json Scripts Updated
remedcu Jul 15, 2021
ed195a2
Version updated to v1.1.0
remedcu Jul 15, 2021
62f88ce
Formatted LockedFund
remedcu Jul 16, 2021
5387850
Documentation Updated
remedcu Jul 16, 2021
bc8f003
Diagrams Updated
remedcu Jul 16, 2021
87e3154
Package.json dependency and script updated
remedcu Jul 16, 2021
85e9f00
Solidity Coverage Config Updated
remedcu Jul 20, 2021
431acb2
LockedFund Test Updated
remedcu Jul 20, 2021
8c97a61
OriginsAdmin Test Updated
remedcu Jul 20, 2021
99b449d
OriginsBase Test Updated
remedcu Jul 20, 2021
8f46489
OriginsBase Contract Updated based on Test
remedcu Jul 20, 2021
c01d015
Documentation Updated
remedcu Jul 20, 2021
14ca530
Formatting Changes
remedcu Jul 20, 2021
db5f4be
Tests Updated for 95%+ Coverage
remedcu Jul 20, 2021
e32e1a9
Main README Updated
remedcu Jul 20, 2021
dfeeac1
Script README's Updated
remedcu Jul 20, 2021
b0029aa
Script Values Updated
remedcu Jul 20, 2021
cc0a557
Deploy Token Script Updated
remedcu Jul 20, 2021
79ef9bd
Documentation and Script Updated
remedcu Jul 20, 2021
e5428a8
Few TODOs removed from contracts
remedcu Jul 20, 2021
89e3407
TODO removed from Tests
remedcu Jul 20, 2021
4a84aee
Documentation Updated
remedcu Jul 20, 2021
e2bdef4
Formatting Changes
remedcu Jul 20, 2021
11c54bc
Few TODOs removed
remedcu Jul 20, 2021
d98211a
Testing Github Workflows (#3)
Jul 20, 2021
96aa272
Github Workflows Updated
remedcu Jul 20, 2021
9f60b07
Minor Refactoring
remedcu Jul 20, 2021
5dd2c5b
Minor Refactoring
remedcu Jul 20, 2021
f6899fc
README Updated
remedcu Jul 21, 2021
e7fa465
Prettier Ignore Updated
remedcu Jul 21, 2021
6106dd7
Formatting changes
remedcu Jul 21, 2021
1090d58
Formatting Changes
remedcu Jul 21, 2021
b78febe
Test Functions, Variables and Constants divided
remedcu Jul 22, 2021
31a9a25
Test Functions, Variables and Constants divided
remedcu Jul 22, 2021
e01a44f
Tests Formatted
remedcu Jul 22, 2021
4081fbb
Test Formatted
remedcu Jul 22, 2021
845f84e
Test Refactored
remedcu Jul 22, 2021
003aac4
Tests Formatted
remedcu Jul 22, 2021
a02c686
Tests Refactored
remedcu Jul 22, 2021
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
15 changes: 15 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
env: {
browser: true,
commonjs: true,
es2021: true,
mocha: true, // for test files
"truffle/globals": true, // same as "truffle/truffle": true
},
extends: "prettier",
parserOptions: {
ecmaVersion: 2020,
},
rules: {},
plugins: ["truffle"],
};
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sol linguist-language=Solidity
33 changes: 33 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Installing Packages
run: npm ci
- name: Checking Formatting
run: npm run lint && npm run prettier-check
- name: Code Coverage
run: npm run coverage
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@1.1.3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,14 @@ dist

# TernJS port file
.tern-port

# Custom
cache
build
artifacts
.vscode
coverage
coverage.json
.DS_Store
ORIGINS.code-workspace
__pycache__
18 changes: 18 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
__pycache__
.DS_Store
.history
.hypothesis/
artifacts/
build/
reports/
node_modules/
!.solhint.json
package-lock.json
coverage
coverage.json
docs
truffle-config.js
package.json
cache
brownie-config.yaml
.vscode
15 changes: 15 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"overrides": [
{
"files": ["*.sol", "*.js", "*.test.js", "*.json"],
"options": {
"printWidth": 140,
"tabWidth": 4,
"useTabs": true,
"singleQuote": false,
"bracketSpacing": true,
"explicitTypes": "always"
}
}
]
}
3 changes: 3 additions & 0 deletions .solcover.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
skipFiles: ["Sovryn", "Openzeppelin", "Interfaces"],
};
9 changes: 9 additions & 0 deletions .solhint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "solhint:recommended",
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error",
"max-line-length": ["warn", 140],
"compiler-version": ["warn"]
}
}
2 changes: 2 additions & 0 deletions .solhintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
contracts/Openzeppelin
contracts/Sovryn
Loading