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

Create a UI for Pool Maintenance similar to Yam.Tools #81

Open
wants to merge 134 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
1b45970
yam to shrimp
superdcc Aug 13, 2020
65f087a
initial steps
Aug 13, 2020
a74e420
minor imrpovements
Aug 13, 2020
9eaad81
added creampie and updated other pools
Aug 13, 2020
d2d0313
image and stats change
superdcc Aug 13, 2020
c6871d0
temp fix
Aug 13, 2020
07442a6
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 13, 2020
4d8a836
update
Aug 13, 2020
9dae9bc
cancel the scalingfactor
superdcc Aug 13, 2020
e1e4e7f
ready for online
superdcc Aug 13, 2020
332b9ee
no message
superdcc Aug 13, 2020
91d34f8
token updated
superdcc Aug 13, 2020
b7a1d76
telegram updated, big fixed
superdcc Aug 13, 2020
fe44d57
warning change
superdcc Aug 14, 2020
5828fd7
added mobile scrollings support
Aug 14, 2020
e7e6f57
Readme Updated for Shrimp Gem DAO
superdcc Aug 17, 2020
4646565
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 17, 2020
30628a1
Update README.md
superdcc Aug 17, 2020
b54d3a2
Update README.md
superdcc Aug 17, 2020
fb1a180
Change the Admin keys holders
superdcc Aug 17, 2020
5b6f82b
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 17, 2020
380b66f
Advanced Pool
superdcc Aug 17, 2020
95264fa
Update README.md
Dice-finance-child Aug 17, 2020
f1aa9a1
added the basis of the advertisemen and gov pages
Aug 17, 2020
129beff
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 17, 2020
a85432f
updates to the ad/vote modal
Aug 17, 2020
ccd2336
Governance and advertise page updated
superdcc Aug 17, 2020
124f676
Update README.md
superdcc Aug 17, 2020
e7bc081
Update README.md
superdcc Aug 17, 2020
961eb3a
added the abi calls for proposals and votes
Aug 17, 2020
01ff259
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 17, 2020
cc7c3d3
Update README.md
superdcc Aug 17, 2020
206611f
Update README.md
superdcc Aug 17, 2020
532385b
Coingeck updated, shrimp total updated
superdcc Aug 18, 2020
dc517f9
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 18, 2020
c740ffb
Update README.md
superdcc Aug 18, 2020
321473a
Update README.md
superdcc Aug 18, 2020
05cb2d9
added new modals for ad/vote
Aug 18, 2020
660cd49
Update README.md
superdcc Aug 18, 2020
e1d3d4d
vote counter change being pushed
Aug 18, 2020
19bd430
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 18, 2020
2854fcf
switched to mainnet and set it to return the total votes cast
Aug 18, 2020
52ecb8c
new inform and chain id back to 1
superdcc Aug 18, 2020
8472788
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 18, 2020
44583a3
Update README.md
superdcc Aug 18, 2020
fb267de
Update README.md
superdcc Aug 18, 2020
8ab98c5
updated mainnet reqs and taco pool
Aug 18, 2020
af57323
minor english change
Aug 18, 2020
6bd569a
Independence updated
superdcc Aug 18, 2020
002491f
updated the decleration of shrimpdependance
Aug 18, 2020
08be3ce
Taco added, bug fixed
superdcc Aug 18, 2020
8a452e7
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 18, 2020
e5fbeec
no message
superdcc Aug 18, 2020
baeff9b
grammar update
Aug 18, 2020
cde96bc
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 18, 2020
5d57eb5
Update Vote_Piece.tsx
Aug 18, 2020
b6d44d3
bar updated
superdcc Aug 18, 2020
fe349c5
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 18, 2020
146b819
updated timer to show total hours
Aug 18, 2020
1a033ae
twitter and telegram updated
superdcc Aug 18, 2020
64a042d
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 18, 2020
93054c5
removed console statement that showed on the live site
Aug 19, 2020
b343bbd
added 2 more vote modals and added the countdowns to the farm buttons
Aug 19, 2020
cf6568c
no message
superdcc Aug 19, 2020
488b510
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 19, 2020
c0e7786
Set up the abi calls for the next 2 proposals and synced their placem…
Aug 19, 2020
69e3f24
added 2 pools and added current price and set up new proposal
Aug 19, 2020
6e7f4f4
Count down time fixed
superdcc Aug 19, 2020
9c6204c
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 19, 2020
a2ac1a5
Updated the timers and the vote page
Aug 19, 2020
7d15349
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 19, 2020
78d1d00
fixed unclickable
Aug 19, 2020
4984959
added an anchor tag to handle the href issue
Aug 19, 2020
3dc0acc
removed target
Aug 19, 2020
bb2c28d
Update README.md
superdcc Aug 19, 2020
1735d21
removed annoying logo images and updated the info of voter_piece2
Aug 20, 2020
ddcd871
fixed the timing on the first room
Aug 20, 2020
33e85a1
added new vote and set it up
Aug 20, 2020
091e809
Update Governance.tsx
Aug 20, 2020
90c1bf5
fixed the 3rd vote modal to have the right display data
Aug 20, 2020
150e44c
Update README.md
superdcc Aug 20, 2020
95c8e1a
Update README.md
superdcc Aug 20, 2020
288fcb3
updated votes and cards
Aug 21, 2020
7ee291e
Update README.md
superdcc Aug 21, 2020
2ac304b
zombie finance
superdcc Aug 21, 2020
ced0700
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
superdcc Aug 21, 2020
0f821e6
updated automation for the weekend
Aug 21, 2020
1277599
total shrimp, change, zombie image
superdcc Aug 21, 2020
3cc66fc
Update Vote_Piece2.tsx
Aug 22, 2020
bcfc239
Update README.md
superdcc Aug 23, 2020
e8727d2
final vote3 updated, remove vote function
superdcc Aug 23, 2020
dc37844
extend zombie pool from 3 to 14
superdcc Aug 23, 2020
9c25caf
before invest warning
superdcc Aug 25, 2020
72bc225
updated the zombie panel it is activee locally i will shut it off bef…
Aug 25, 2020
c2ee10b
updated the zombie pool button to be able to change at the time end
Aug 26, 2020
c04abc3
updated to add the doge pool and hid it in main farms/stats
Aug 27, 2020
9d955c6
dogefi change
superdcc Aug 27, 2020
b1a4dcd
updated the dogefi cap
Aug 27, 2020
1cc2adb
Update README.md
superdcc Aug 28, 2020
49b4b0e
Total token updated
superdcc Aug 28, 2020
a714d5c
Update README.md
superdcc Aug 28, 2020
6646f1a
updated the dogefi info
Aug 28, 2020
53e826a
updated the tvl
Aug 28, 2020
bfc0d4c
dogefi updates
Aug 31, 2020
354bfe2
sushi disclaimer updated
superdcc Aug 31, 2020
db41993
added the dogeFi contract and added the sushi pool
Aug 31, 2020
82d4b05
Merge branch 'master' of https://github.com/shrimp-finance/shrimp-pro…
Aug 31, 2020
b4b7375
new sushi contract
Aug 31, 2020
d8b4006
updated logic for stat card of doge and vote 4 and fixxed teh timer a…
Aug 31, 2020
8d3e4a1
made the local changes for testing dogefi
Aug 31, 2020
735373a
contract wrong
superdcc Aug 31, 2020
a0dab7f
added new proposal abi and
Sep 1, 2020
48c5c4c
vote 4 updated
superdcc Sep 1, 2020
36ba53c
added dogefi coin to stats and updated grammar on the new vote
Sep 1, 2020
dd80db6
added proper countdown time to the vote
Sep 1, 2020
07c2172
added the final data to give dogefi a tvl and stat card
Sep 1, 2020
85ec225
replaced the text of unlock wallet with a button to unlock the wallet
Sep 1, 2020
ad76c46
minor updates
Sep 1, 2020
b0ca614
Update README.md
superdcc Sep 3, 2020
a5675de
update features
Sep 3, 2020
e6e9bb4
change
Sep 4, 2020
e9c351d
added frens coin advanced pool and updated other minor values
Sep 7, 2020
5534bed
added the frenspool abi/address pushing for local testing
Sep 8, 2020
7a6b711
updated the manifest and prepped the tvl/stat cards to update with th…
Sep 8, 2020
c13d0f4
added more times and time controllers for advancede cards
Sep 9, 2020
f50e1f5
Update README.md
superdcc Sep 10, 2020
be64c3f
added new pool data for sashimi
Sep 11, 2020
6a06d70
Added the stats for Sashimi...tvl/statcard
Sep 14, 2020
f9211b1
Pickle shrimp lp is built needs contracts then can be sent over for t…
Sep 14, 2020
531aa83
locally testable push for shrimp pickle pool
Sep 14, 2020
f5af7ed
Update README.md
superdcc Sep 17, 2020
81d19b2
Updated total supply
Sep 18, 2020
fa452f4
Update README.md
superdcc Sep 24, 2020
4d0693b
final update
Sep 29, 2020
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
126 changes: 47 additions & 79 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,111 +1,79 @@
# 🍠 YAM Protocol 🍠
## The Protocol
Yam is an experimental protocol building upon the most exciting innovations in programmable money and governance. Built by a team of DeFi natives, it seeks to create:

• an elastic supply to seek eventual price stability<br/>
• a governable treasury to further support stability<br/>
• fully on-chain governance to enable decentralized control and evolution from Day 1<br/>
• a fair distribution mechanism that incentivizes key community members to actively take the reins of governance

At its core, YAM is an elastic supply cryptocurrency, which expands and contracts its supply in response to market conditions, initially targeting 1 USD per YAM. This stability mechanism includes one key addition to existing elastic supply models such as Ampleforth: a portion of each supply expansion is used to buy yCurve (a high-yield USD-denominated stablecoin) and add it to the Yam treasury, which is controlled via Yam community governance.

We have built Yam to be a minimally viable monetary experiment, and at launch there will be zero value in the YAM token. After deployment, it is entirely dependent upon YAM holders to determine its value and future development. We have employed a fork of the Compound governance module, which will ensure all updates to the Yam protocol happen entirely on-chain through community voting.
# 🦐 Shrimp Gem DAO Protocol 🦐

## Audits

None. Contributors have given their best efforts to ensure the security of these contracts, but make no guarantees. It has been spot checked by just a few pairs of eyes. It is a probability - not just a possibility - that there are bugs. That said, minimal changes were made to the staking/distribution contracts that have seen hundreds of millions flow through them via SNX, YFI, and YFI derivatives. The reserve contract is excessively simple as well. We prioritized staked assets' security first and foremost.
![](https://i.imgur.com/rBqjTu1.jpg)

The original devs encourage governance to fund a bug bounty/security audit
## The Protocol
The whale fights the shrimp, and it has never changed since ancient times. Who said shrimp can't fight big whales? As long as we are united!

The token itself is largely based on COMP and Ampleforth which have undergone audits - but we made non-trivial changes.
Shrimp is a community that gathers all investors. We share the latest Pump tokens and collectively discuss the latest DeFi technology! Anyone who holds 3000 $Shrimp Coins or equivalent to 4000 $USD can make a Advanced Pool. All Shrimp Holders will start marketing your token! why? Because we are a group of people who want to fight whales.

The rebaser may also have bugs - but has been tested in multiple scenarios. It is restricted to Externally Owned Accounts (EOAs) calling the rebase function for added security. SafeMath is used everywhere.

If you feel uncomfortable with these disclousures, don't stake or hold YAM. If the community votes to fund an audit, or the community is gifted an audit, there is no assumption that the original devs will be around to implement fixes, and is entirely at their discretion.
## Level of ocean
🐋 Humpback Whale = 5000 BTC or more
🐋 Whale = 1000 - 5000 BTC
🦈 Shark = 500 - 1000 BTC
🐬 Dolphin = 100 - 500 BTC
🐠 Fish = 50 - 100 BTC
🐙 Octopus = 10 - 50 BTC
🦀 Crab = 1 - 10 BTC
🦐 Shrimp = less then 1 BTC (We are here)

## The Token
The core YAM token uses yCRV as the reserve currency, which is roughly a $1 peg. Each supply expansion (referred to as an inflating rebase), a portion of tokens is minted and used to build up the treasury. This treasury is then in complete ownership of YAM holders via governance.
## About Developer
Xixi's address: [0xaa447A04b15AFF261e0683f293A1b731c5c10c9B](https://etherscan.io/address/0xaa447A04b15AFF261e0683f293A1b731c5c10c9B)


## Distribution
Rather than allocating a portion of the supply to the founding team, YAM is being distributed in the spirit of YFI: no premine, no founder shares, no VC interests — simply equal-opportunity staking distribution to attract a broad and vision-aligned community to steward the future of the protocol and token.
## Shirmp Token Info
Total Shrimp Coin:257,715.52 Shrimp ([More Info](https://github.com/shrimp-finance/shrimp-protocol/wiki/Total-Shrimp:-257,715.52-%F0%9F%A6%90) )
The last total amount update: 2020/09/25 + 4,494.92 🦐

The initial distribution of YAM will be evenly distributed across eight staking pools: WETH, YFI, MKR, LEND, LINK, SNX, COMP, and ETH/APML Uniswap v2 LP tokens. These pools were chosen intentionally to reach a broad swath of the overall DeFi community, as well as specific communities with a proven commitment to active governance and an understanding of complex tokenomics.
Genesis Distribution Pool:Genesis Staked pool(Dice, Eth, Cream, YFI, Comp, UNI Pool)
Genesis Distribution Period:2020/08/13 ~ 2020/08/19(It's all over, only Uni pool is left)

Following the launch of the initial distribution pools, a second distribution wave will be incentivized through a YAM/yCRV Uniswap pool. This pool will allow Uniswap's TWAP-based oracle to provide necessary input as the basis for rebase calculations, as well as provide liquidity for the rebase to purchase yCurve for the treasury.
## Advanced Pool Info
Anyone can create an advanced pool by placing at least 3000 🦐 Shrimp or equivalent to 4000 $USD and pointing to a minimum of 3 days.

We have the purest cryptocurrency shrimp community in the world and can help you market your project.
There is no more efficient marketing method than this. Hurry up and join the shrimp community. Let's take a look at your project, 👀?

## Rebases
## Governance([More info](https://github.com/shrimp-finance/shrimp-protocol/wiki/Shrimp-Governance))
Governance is entirely dictated by Shrimp holders from the start. Upon deployment, ownership of all Shrimp protocol contracts will be reliquished to the timelocked Governance contract or removed entirely. At the very least, this can be seen as a reference implementation for a truly decentralized protocol.

Rebases are controlled by an external contract called the Rebaser. This is comparable to Ampleforth's `monetaryPolicy` contract. It dictates how large the rebase is and what happens on the rebase. The YAM token just changes the supply based on what this contract provides it.
Anybody with 5% of Shrimp to their address can propose a governance action; these are simple or complex sets of actions, such as adding support for a new shrimping pool, changing an Advanced Pool fee.

There are a requirements before rebases are active:
<br />
• Liquid YAM/yCRV market<br/>
• `init_twap()`<br/>
• `activate_rebasing()`<br/>
## Admin keys Holder([More info](https://github.com/shrimp-finance/shrimp-protocol/wiki/Community-Authorization---Multisig-Wallet))
[Xixi Huang](https://twitter.com/superdxixi) - (Founder) - Founder of Dice.Finance
[Andersson Michael](https://twitter.com/betpirateio) - (Partner) - Founder of Betpirate.io
Tom Chu - (Team) - Technical Lead of Shrimp.Finance
[Marcos](https://twitter.com/mdelriovila) - (Shrimp Community) - Telegram admins of Shrimp
[Mojo](https://twitter.com/BitnAlts) - (Tacos Community) - Telegram admins of TACO

Following the launch of the second pool, rebasing can begin its activation phase. This begins with `init_twap()` on the rebaser contract. Anyone can call this at anytime once there is a YAM/yCRV Uniswap V2 market. The oracle is designed to be 12 hours between checkpoints. Given that, 12 hours after `init_twap()` is called, anyone can call `activate_rebasing()`. This turns rebasing on, permanently. Now anyone can call `rebase()` when `inRebaseWindow() == true;`.
## Other protocol information:
Shrimp Trade: [Uniswap](https://app.uniswap.org/#/swap?inputCurrency=0x38c4102d11893351ced7ef187fcf43d33eb1abe6&outputCurrency=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2)
Shrimp Price Chart: [Chartex](https://uniswap.chartex.pro/?symbol=UNISWAP:SHRIMP)
Shrimp Token Listed: [Coingecko](https://www.coingecko.com/en/coins/shrimp-finance)

In a rebase, the order of operations are:
<br />
• ensure in rebase window<br/>
• calculate how far off price is from the peg<br/>
• dampen the rebase by the rebaseLag<br/>
• if positive calculate protocol mint amount<br/>
• change scaling factor, (in/de)flating the supply<br/>
• sync uniswap, mint, sell to uniswap, transfer excess YAM and bought yCRV to reserves<br/>
• call any extra functions governance adds in the future (i.e. Balancer gulps)<br/>
## Audits

None. Contributors have given their best efforts to ensure the security of these contracts, but make no guarantees. It has been spot checked by just a few pairs of eyes. It is a probability - not just a possibility - that there are bugs. That said, minimal changes were made to the staking/distribution contracts that have seen hundreds of millions flow through them via SNX, YFI, and YFI derivatives. The reserve contract is excessively simple as well. We prioritized staked assets' security first and foremost.

## Governance
Governance is entirely dictated by YAM holders from the start. Upon deployment, ownership of all YAM protocol contracts was reliquished to the timelocked Governance contract or removed entirely. At the very least, this can be seen as a reference implementation for a truly decentralized protocol.
The original devs encourage governance to fund a bug bounty/security audit

# Development
### Building
This repo uses truffle. Ensure that you have truffle installed. Given the composability aspect of this
The token itself is largely based on COMP which have undergone audits - but we made non-trivial changes.

Then, to build the contracts run:
```
$ truffle compile
```

If you feel uncomfortable with these disclousures, don't stake or hold Shrimp. If the community votes to fund an audit, or the community is gifted an audit, there is no assumption that the original devs will be around to implement fixes, and is entirely at their discretion.


To run tests, run against a single test package, i.e.:
```
$ sh startBlockchain.sh
$ truffle migrate --network distribution
$ python scripts/clean.py
$ cd jsLib
$ jest deployment
$ jest token
$ jest rebase
$ jest governance
$ jest governorAlpha
$ jest distribution
```
The need to run one-by-one seems to be a limitation of jest + ganache.
## Distribution
Rather than allocating a portion of the supply to the founding team, Shrimp is being distributed in the spirit of YFI: no premine, no founder shares, no VC interests — simply equal-opportunity staking distribution to attract a broad and vision-aligned community to steward the future of the protocol and token.

The distribution tests require specific tokens. These are acquired by using the ganache unlock_account function. If you receive fails, the owner likely decreased their ownership of that token. Just replace any instances of that address with another holder of the token.
The initial distribution of Shrump will be evenly distributed across 6 staking pools: WETH, DICE, CREAM, COMP, YFI, and ETH/SHRIMP Uniswap v2 LP tokens. These pools were chosen intentionally to reach a broad swath of the overall DeFi community, as well as specific communities with a proven commitment to active governance and an understanding of complex tokenomics.

Note: some governance tests require a different ganache setup. You will encounter a warning (but not a failed test) if the wrong type of ganache is setup. To run the correct one:
```
$ sh startBlockchainMining.sh
$ truffle migrate --network distribution
$ python scripts/clean.py
$ cd jsLib
$ jest governance
```


#### Attributions
Much of this code base is modified from existing works, including:

[Compound](https://compound.finance) - Jumping off point for token code and governance

[Ampleforth](https://ampleforth.org) - Initial rebasing mechanism, modified to better suit the YAM protocol

[Synthetix](https://synthetix.io) - Rewards staking contract

[YEarn](https://yearn.finance)/[YFI](https://ygov.finance) - Initial fair distribution implementation
[Yam](https://yam.finance/) - Token Distribution Pool
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions yam-www/package.json → shrimp-www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"react-circular-progressbar": "^2.0.3",
"react-countdown": "^2.2.1",
"react-dom": "^16.13.1",
"react-hook-form": "^6.4.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"styled-components": "^5.1.1",
Expand Down
File renamed without changes.
Binary file added shrimp-www/public/favicon.ico
Binary file not shown.
Binary file added shrimp-www/public/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions shrimp-www/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="en" style="display: grid;">

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="For the SHRIMP(ing) community." />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet">
<meta name="twitter:image" content="https://shrimp.finance/hero.png" />
<meta name="twitter:description" content="SHRIMP(ing) community is the biggest Gem DAO in ethereum, once your coin is listed in the Advanced pools, it will be over the moon. Everyone has 5% Shrimp and willing burn 1% Shrimp can list your Advanced pools for a week." />
<meta name="twitter:card" content="summary" />
<meta name="twitter:title" content="SHRIMP - First Gem DAO Community." />
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-175287457-1"></script>
<script>
window.dataLayer = window.dataLayer || [];

function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());
gtag('config', 'UA-175287457-1');
</script>
<title>Shrimp.Finance - First Gem DAO for ethereum community.</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>

</html>
12 changes: 1 addition & 11 deletions yam-www/public/manifest.json → shrimp-www/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,9 @@
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"start_url": "/",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
Expand Down
File renamed without changes.
23 changes: 20 additions & 3 deletions yam-www/src/App.tsx → shrimp-www/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ import useModal from './hooks/useModal'

import Farms from './views/Farms'
import Home from './views/Home'
import Adverts from './views/Advertisements';
import Vote from './views/Gov'
import Farm from './views/Farm/Farm'
import Stats from './views/Stats/Stats'

import theme from './theme'

Expand All @@ -29,9 +33,21 @@ const App: React.FC = () => {
<Route path="/" exact>
<Home />
</Route>
<Route path="/farms">
<Route path="/farms" exact>
<Farms />
</Route>
<Route path="/farms/:farmId">
<Farm />
</Route>
<Route path="/Vote" exact>
<Vote />
</Route>
<Route path="/Adverts" exact>
<Adverts />
</Route>
<Route path="/Stats" exact>
<Stats />
</Route>
</Switch>
</Router>
<Disclaimer />
Expand All @@ -42,6 +58,7 @@ const App: React.FC = () => {
const Providers: React.FC = ({ children }) => {
return (
<ThemeProvider theme={theme}>
{/* change the ChainId below here for the preffered network when testing, 1 main 3 ropsten */}
<UseWalletProvider chainId={1}>
<YamProvider>
<TransactionProvider>
Expand All @@ -67,9 +84,9 @@ const Disclaimer: React.FC = () => {

useEffect(() => {
const seenDisclaimer = localStorage.getItem('disclaimer')
if (!seenDisclaimer) {
// if (!seenDisclaimer) {
onPresentDisclaimerModal()
}
// }
}, [])

return (
Expand Down
Binary file added shrimp-www/src/assets/img/doge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shrimp-www/src/assets/img/farmer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shrimp-www/src/assets/img/frens.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shrimp-www/src/assets/img/kimchi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shrimp-www/src/assets/img/pickle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shrimp-www/src/assets/img/sashimi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,28 @@ const DisclaimerModal: React.FC<DisclaimerModal> = ({ onConfirm, onDismiss }) =>
if (step === 'disclaimer') {
return (
<div>
<p>Audits: None.</p>
<p>While the initial creators of the Yam protocol have made reasonable efforts to attempt to ensure the security of the contracts, including forking much of the codebase from existing well-audited projects and soliciting review from friends, nothing approaching the rigor of a formal audit has been conducted at this time.</p>
<p>We STRONGLY urge caution to anyone who chooses to engage with these contracts.</p>
<p>Audits: None. (This project is in beta. Use at your own risk.)</p>
<p>🚨 The final inflation mint was September 25th (4494.92 Shrimp), Shrimp WETH_SHRIMP_UNI_LP Pool has removed the liquidity.</p>
</div>
)
} else {
return (
<div>
<p>Attention YAM Uniswap LPs</p>
<p>The only Uniswap pool that is compatible with YAM is YAM/yCRV (Curve yPool tokens)</p>
<p>Attention SHRIMP Uniswap LPs</p>
<p>The only Uniswap pool that is compatible with SHRIMP is SHRIMP/WETH</p>
<p>Providing liquidity for other Uniswap pools is dangerous</p>
<p>You will LOSE your share of rebases</p>
</div>
)
}
}, [step])

const button = useMemo(() => {
if (step === 'disclaimer') {
// return (
// <Button text="Next" variant="secondary" onClick={() => setStep('uniswap')} />
// )
return (
<Button text="Next" variant="secondary" onClick={() => setStep('uniswap')} />
<Button text="I understand" onClick={handleConfirm} />
)
} else {
return (
Expand Down
31 changes: 31 additions & 0 deletions shrimp-www/src/components/Footer/components/Nav.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react'
import styled from 'styled-components'

const Nav: React.FC = () => {
return (
<StyledNav>
<StyledLink href="https://github.com/shrimp-finance/shrimp-protocol">Github</StyledLink>
<StyledLink href="https://twitter.com/FinanceShrimp">Twitter</StyledLink>
<StyledLink href="https://t.me/shrimping">Telegram</StyledLink>
<StyledLink href="https://www.coingecko.com/en/coins/shrimp-finance">Coingecko</StyledLink>
<StyledLink href="https://app.uniswap.org/#/swap?inputCurrency=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&outputCurrency=0x38c4102d11893351ced7ef187fcf43d33eb1abe6">Uniswap</StyledLink>
</StyledNav>
)
}

const StyledNav = styled.nav`
align-items: center;
display: flex;
`

const StyledLink = styled.a`
color: ${props => props.theme.color.grey[400]};
padding-left: ${props => props.theme.spacing[3]}px;
padding-right: ${props => props.theme.spacing[3]}px;
text-decoration: none;
&:hover {
color: ${props => props.theme.color.grey[500]};
}
`

export default Nav
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const StyledButton = styled.button<StyledButtonProps>`
background-color: ${props => props.theme.color.grey[200]};
border: 0;
border-radius: 28px;
box-shadow: 6px 6px 12px ${props => props.theme.color.grey[300]},
box-shadow: 6px 6px 12px ${props => props.theme.color.grey[100]},
-12px -12px 24px ${props => props.theme.color.grey[100]}aa;
color: ${props => !props.disabled ? props.theme.color.primary.main : props.theme.color.grey[400]};
cursor: pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Loader: React.FC<LoaderProps> = ({ text }) => {
return (
<StyledLoader>
<CardIcon>
<StyledYam>🍠</StyledYam>
<StyledYam>🦐</StyledYam>
</CardIcon>
{!!text && <StyledText>{text}</StyledText>}
</StyledLoader>
Expand All @@ -23,7 +23,7 @@ const spin = keyframes`
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
transform: rotate(-360deg);
}
`

Expand Down
Loading