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.

Sign up for GitHub

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

Jump to bottom

Merge Develop into Master #34

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

Merge Develop into Master #34

wants to merge 49 commits into from

Conversation

Ryanmtate
Copy link
Contributor

// NOTE: Do not merge until following are complete
// TODO:

  • Add mainnet addresses to README.md;
  • Fix decimal place normalization in contract;
  • Add stable coin addresses for allowedAssets;

Ryanmtate and others added 30 commits September 18, 2018 12:42
@Ryanmtate
Adding a backup folder called mainnet for build artifacts to separate…
e281868 
… from truffle migrate process
@Ryanmtate
Update migrations scripts to separate files
6ee38f8 
Now able to run `truffle migrate --reset -f <number for migration
script>`

NOTE: This will run the subsequent migrations files after the number.
@Ryanmtate
Reverted back to 0.4.24;
284dbb1 
Able to deploy and run successful unit tests for contracts
@Ryanmtate
WIP: Adding a Stable Coin swap contract for converting trusted stable…
1333896 
… coins to USDx and vice-versa.
@Ryanmtate
Adding StableSwap contract; TODO decimal normalization
2d14bb4
@Ryanmtate
Add fee params per asset for stable swap contract; add natspec
68e2272
@Ryanmtate
Merge pull request #36 from tokenio/stable_swap
641094f 
Add fee params per asset for stable swap contract; add natspec
@Ryanmtate
Deployed TokenIOStableSwap w/ unit tests checking convert method in b…
60d3621 
…oth directions.
@Ryanmtate
Added an ERC20 contract that includes fees; Gas costs for transfers a…
d1abd47 
…re ~130K gas
@Ryanmtate
Bypass forceTransfer() method in library and directly update storage …
e5784e2 
…contract
@vlad-kostanda
configs update
1d5b3cc
@vlad-kostanda
Storage improvement by making it more specific
8516810
@vlad-kostanda
breaking transfer test. need investigation
78ea975
@vlad-kostanda
minor updates to correspond to new fee parameters format
745bf71
@vlad-kostanda
1. updates to balance storage and mappings order; 2. logging transfer…
df3b83c 
… gas use in test for FeesApply contract
@RostyslavBortman
fix issue with forceTransfer in TokenIOLib
fabaa99
@RostyslavBortman
oprimize set params functiom, created struct in storage
c7ceb89
@RostyslavBortman
optimized transger/transfer from functions
5ed7a55
@RostyslavBortman
optimized transfer/transferFrom functions in TokenIOERC20FeesApply
04aff17
@RostyslavBortman
optimization fixes
baceec3
@RostyslavBortman
add comments
46e3f90
@RostyslavBortman
add tests and delete functions
0e7145e
@RostyslavBortman
fix code before PR
f55e0aa
@RostyslavBortman
fix code before meeting
78b24f6
@RostyslavBortmanAdoria
fix formatting
14069f3
@RostyslavBortmanAdoria
remove excess
6130966
@Ryanmtate
Merge pull request #40 from adoriasoft/fees_apply
11ea966 
Fees apply optimization changes
@RostyslavBortmanAdoria
apply optimization changes for all contracts
a47f73a
@vlad-kostanda
Merge pull request #2 from adoriasoft/fees_apply_dev2
6d7f470 
apply optimization changes for other contracts
@RostyslavBortmanAdoria
fix bug with fxUSDBPSRate parameter
f21b784
@RostyslavBortmanAdoria
add comments to constructor
182257d
@RostyslavBortmanAdoria
fees_apply_solidityVersionMigration
d31cbf0
@RostyslavBortmanAdoria
solidity version migration
d4164e3
@vlad-kostanda
Merge pull request #3 from adoriasoft/fees_apply_solidityVersionMigra…
191b4f8 
…tion

Fees apply solidity version migration
@RostyslavBortmanAdoria
add proxy
5c0d72f
@RostyslavBortmanAdoria
adding proxies
ed2fb5f
@RostyslavBortmanAdoria
fix compilation errors
8360ce9
@RostyslavBortmanAdoria
update proxy contract
799dc45
@RostyslavBortmanAdoria
add upgrade function
e76b813
@RostyslavBortmanAdoria
change tests for proxies
e090dbb
@RostyslavBortmanAdoria
fixes in proxy implementation + tests
a63b9f1
@RostyslavBortmanAdoria
tests added
84edbde
@Ryanmtate
Merge pull request #38 from tokenio/fees_apply
ed1dafd 
Fees apply
@RostyslavBortmanAdoria
Merge pull request #4 from adoriasoft/fees_apply_dev_proxy
885258a 
Fees apply dev proxy
@RostyslavBortmanAdoria
remove excess
c8ea85d
@Ryanmtate
Merge pull request #41 from adoriasoft/fees_apply
df35f92 
Fees apply
@Ryanmtate
Merge pull request #44 from tokenio/fees_apply
936e5f0 
Fees apply
@Ryanmtate
Update compiler settings
c6ca884
@Ryanmtate
Merge pull request #45 from tokenio/feature/update_compiler_settings
7346eb6 
Update compiler settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Ryanmtate @vlad-kostanda @RostyslavBortman @RostyslavBortmanAdoria