Skip to content

[FIP-38] Tokemak deposit#283

Merged
Joeysantoro merged 17 commits intodevelopfrom
feat/tokemak-deposit
Nov 12, 2021
Merged

[FIP-38] Tokemak deposit#283
Joeysantoro merged 17 commits intodevelopfrom
feat/tokemak-deposit

Conversation

@eswak
Copy link
Contributor

@eswak eswak commented Nov 3, 2021

This pull request implements smart contracts for depositing ETH & ERC20s on Tokemak.

  • Implement smart contracts
  • Unit tests & Mock contracts
  • Integration tests on a local mainnet fork
  • DAO description
  • DAO script

image

@Joeysantoro
Copy link
Contributor

Overall looks really great, you can fix these nits then send to Tokemak team for review. Also feel free to begin DAO scripts

Copy link
Contributor

@xklob xklob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contracts look great overall, just a couple of questions there. Roles all look fine and love the comments.

For the tests I left a lot of comments; most of them are code-style things (we've updated the way we do tests quite a bit in the past few months).

Joeysantoro
Joeysantoro previously approved these changes Nov 4, 2021
xklob
xklob previously approved these changes Nov 5, 2021
@eswak eswak dismissed stale reviews from xklob and Joeysantoro via 3b5e838 November 7, 2021 10:12
Comment on lines +17 to +19
const TOKEMAK_REWARDS_ADDRESS = '0x79dD22579112d8a5F7347c5ED7E609e60da713C5';
const TOKEMAK_WETH_POOL_ADDRESS = '0xD3D13a578a53685B4ac36A1Bab31912D2B2A2F36';
const TOKEMAK_TOKE_POOL_ADDRESS = '0xa760e26aA76747020171fCF8BdA108dFdE8Eb930';
Copy link
Contributor

@Joeysantoro Joeysantoro Nov 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: These should probably be added to mainnetAddresses.json right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just needed them here, but I can add them. What artifactName do I use ?

@Joeysantoro
Copy link
Contributor

After fixing merge conflicts and pulling in develop should be good to 🚢

@eswak eswak force-pushed the feat/tokemak-deposit branch from fe36f46 to 1895f01 Compare November 9, 2021 08:08
@eswak
Copy link
Contributor Author

eswak commented Nov 9, 2021

fixed the e2e tests, didn't know about the dependencies.ts file 😅

and up to date vs develop

🚢 ?

@eswak eswak changed the title Tokemak deposit [FIP-38] Tokemak deposit Nov 9, 2021
@Joeysantoro Joeysantoro merged commit d01e4ad into develop Nov 12, 2021
@xklob xklob deleted the feat/tokemak-deposit branch November 19, 2021 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments