Skip to content

Commit

Permalink
v0.8.1 (#1141)
Browse files Browse the repository at this point in the history
* V2 earn stake (#1056)

* New Stake TransactionList component
* Remove Savelist component
* adding PlaceholderConnect component
* Implement Dayjs on time calculation
* update transactionlist styles
* implement stake modal + new layout
* adding preloader to placeholderConnect
* adding test for components
* adding preloader + remove fallback for button onClick when it's disable
* fixing preloader on light theme
* migrate props to selectors
* fixing state name
* New checkbox Label component
* update earn page start
* fixing types on button styles
* fixing extended types
* tab switcher component + actions + styles for token list
* migrating modal to redux state
* update logic on stake modal
* update just design
* Fixes for Mobile Devices (Dao page / Stake / Earn)
* test cases fixes
---------

Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
(cherry picked from commit 1f8975a)

* Jemeza/gtwy 2.5 history (#1007)

Redesign History table:
* adding a transactions table
* configured transactions
* work on transactions table
* added filter, optimized history page
* bringing branch up to date
* changed methods to get chain icons
* added connect button and no history icon for history page
* fixed connect button, simplified transaction resolver filter, refactored types in transaction resolver
* removing unnecessary files
* refactored constants to seperate file
* removed alt attribute from svg component and updated test/stories
* migrated history to typescript
* fixing types issues hook
* disable date picker for history page
* remove datepicker types
* disable datepicker on history page
* fix style import
* update snapshots for unit test

---------

Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
Co-authored-by: alvaro-ricotta <alvaro.e.ricotta@gmail.com>
(cherry picked from commit 79087b1)

* update QA issues (#1084)

* update QA issues

* update constant + page title

(cherry picked from commit 57973b3)

* Added block explorer links to the footer (#1082)

* added funcionality to add block explorer links in the footer

* linting and format fixes

* updated network picker icons on chains & history page

* update svg

* fixes for test snaps

---------

Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
(cherry picked from commit e4dc487)

* Fix/mobile view header design (#1087)

* change:
- chore: removed unused icons
- fix: moved all images unders assets folder to keep single source
- fix: updated the images, icon import

* header partial changes

* mobile header design partial fixes

* updated the assets path

* updated test case snapshot

* fix for nav / account address feeselector

* implementation of drawer bottom for user account to copy and discussone

* change:
 - cleanup consoles
 - move feeswitcher change to hook
 - add drawer for switch fees for mobile view
 - disable feeswitcher on nav in mobile view

* fix: fee switcher on desktop & mobile

* change:
 - design fixes for earn page
 - design fix light mode
 - switch icon on history page fixes

* modal change

* add to meta mask

* updated the copy

* added icons for network on network picker

* load the boba icon from getCoinImage

* fixes for icons

* revert of wagmi.md

* console cleanup

* fix for history test

(cherry picked from commit 6adeb89)

* Fix/date range picker history (#1088)

* add react date picker modal

* add date time range picker

* added new date picker

* adjust date picker style and functionality

* added test for date picker

* resolving remaining merge conflicts

* change:
 - removed breaking code in getCoinImage
 - added png files for boba icons
 - loaded the icons for network and coin wherever required.
 - fix console crash for gasSwitcher
 - fix hover issue on history page
 - fix classNames for avaxIcons.

* commented out the date picker as needs some more time

* add date picker back

* updated snapshot and breaking change

* navgation links for stake & dao only for ETH network

* boba logo update across app

---------

Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
(cherry picked from commit 0a4f4e5)

* Fix/reported gateway issues (#1092)

* Fix: Icons on bridge success modal height fixes.
* Fix: classic bridge estimated time update

(cherry picked from commit f5717f3)

* Fix/date range picker history (#1094)

* add react date picker modal

* add date time range picker

* added new date picker

* adjust date picker style and functionality

* added test for date picker

* resolving remaining merge conflicts

* change:
 - removed breaking code in getCoinImage
 - added png files for boba icons
 - loaded the icons for network and coin wherever required.
 - fix console crash for gasSwitcher
 - fix hover issue on history page
 - fix classNames for avaxIcons.

* commented out the date picker as needs some more time

* add date picker back

* updated snapshot and breaking change

* navgation links for stake & dao only for ETH network

* boba logo update across app

* added functionality/styling to date picker

---------

Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
(cherry picked from commit e43f32a)

* Fix/add avalanche transaction history (#1096)

* added avalanche to history page

* refactored network names, increased robustness of history page

* updated image svgs and test

* refactoring names

* making correct svg show on from-to column

(cherry picked from commit 1b0cec9)

* change: (#1097)

* change:
 - fix: token balance is not showing on BNB & AVAX l2 network
 - fix: added emergency swap when there toosmallsec balance.

* moved style to separate fil

* updated snapshots

(cherry picked from commit bfa5f22)

* tiggler Selectors when account is anable only (#1099)

(cherry picked from commit e6b1868)

* Updated boba scope page (#1098)

* Fix: Crash on BobaScope
* Fix: updated the test cases for history page

---------
Co-authored-by: Sahil Kashetwar <sahil@enya.ai>

(cherry picked from commit 3cbc31c)

* Cleanup old PagerFooter and PagerHeader component (#1101)

(cherry picked from commit abf6109)

* Fix : usage of dispatch while withdrawing funds (#1128)

* fix : usage of dispatch while withdrawing funds

* fix: updated snapshot

(cherry picked from commit 3b00afe)

* Styling fix to history page (#1130)

* fixed styling, fixed mobile view of history page and updated test

* updated history snap shots

---------

Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
Co-authored-by: Sahil Kashetwar <sahil@enya.ai>
(cherry picked from commit a2d7314)

* Add files via upload (#1091)

(cherry picked from commit 93c4c92)

* Bump mikefarah/yq from 4.34.2 to 4.35.1 (#1129)

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.34.2 to 4.35.1.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](mikefarah/yq@v4.34.2...v4.35.1)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 9669fd3)

* Bump @storybook/api from 7.0.18 to 7.2.1 (#1086)

Bumps [@storybook/api](https://github.com/storybookjs/storybook/tree/HEAD/code/deprecated/manager-api-shim) from 7.0.18 to 7.2.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v7.2.1/code/deprecated/manager-api-shim)

---
updated-dependencies:
- dependency-name: "@storybook/api"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 13b45d5)

* Gateway: Feedback Issues fixes  (#1135)

* change:
 - fix: down chevron in light mode for select tokens
 - fix: Change "Show Testnet" to "Show Testnets"
 - fix: time estimation on bridging confirmation modal
 - fix: Change "Add token to metamask" to "Add token to wallet"
 - fix: Change network name from "Boba" to "Boba ETH'
 - fix: Dialog freezes when no wallet installed
 - fix for show to use testnets
 - fix for test
 - Reverted to show testnets

(cherry picked from commit eb17896)

* Gateway: Reported issues. (#1136)

* tiggler Selectors when account is anable only

* updating network switcher

* pushing changes for bidirectional wallet connect

* fixing dropdown for mobile devices + add switcher networks

* fixing layer on Network Selector header

* network issue

* fix listening to the network change

* update snapshot

---------

Co-authored-by: alvaro-ricotta <alvaro.e.ricotta@gmail.com>
(cherry picked from commit 562a21b)

---------

Co-authored-by: alvaro-ricotta <81116391+alvaro-ricotta@users.noreply.github.com>
Co-authored-by: jemeza <57341979+jemeza@users.noreply.github.com>
Co-authored-by: Sahil K <86316370+sk-enya@users.noreply.github.com>
Co-authored-by: Souradeep Das <dsouradeep2@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
6 people authored Aug 21, 2023
1 parent c2a9555 commit 36d36e6
Show file tree
Hide file tree
Showing 325 changed files with 8,999 additions and 6,957 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/boba-publish-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
with:
node-version: 16
- name: yq - portable yaml processor
uses: mikefarah/yq@v4.34.2
uses: mikefarah/yq@v4.35.1

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/boba-publish-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
with:
node-version: 16
- name: yq - portable yaml processor
uses: mikefarah/yq@v4.34.2
uses: mikefarah/yq@v4.35.1

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
Binary file added boba_audits/Boba_Zokyo_audit_report_Aug7_2023.pdf
Binary file not shown.
30 changes: 15 additions & 15 deletions boba_documentation/developer/wagmi.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## TLDR

The WAGMI incentives program is Boba Network's take on liquidity mining 2.0. In collaboration with UMA protocol, we are be distributing WAGMI options on BOBA token to promising projects building on Boba. Users can earn WAGMI options using their favorite dApps on Boba Network. WAGMI options are KPI (key performance indicators) options redeemable for BOBA tokens based on metrics relating to Boba Network, such as monthly active wallets or project specific TVL.
The WAGMI incentives program is Boba Network's take on liquidity mining 2.0. In collaboration with UMA protocol, we are be distributing WAGMI options on BOBA token to promising projects building on Boba. Users can earn WAGMI options using their favorite dApps on Boba Network. WAGMI options are KPI (key performance indicators) options redeemable for BOBA tokens based on metrics relating to Boba Network, such as monthly active wallets or project specific TVL.

WAGMI works by using UMA protocol's [optimistic oracle](https://umaproject.org/optimistic-oracle.html). BOBA tokens are locked up in a smart contract that pays out subject to network KPIs (i.e. TVL of Boba) and secured in WAGMIvX tokens. BOBA is paid out after a 1 month settlement period on KPIs.

Expand Down Expand Up @@ -33,11 +33,11 @@ collateralToken = getContract("ERC20").at("0x__________")
await collateralToken
.methods
.approve(
LongShortPair.options.address,
LongShortPair.options.address,
web3.utils.toWei("10"))
.send({
gas: 100000,
gasPrice: 2 * 1000000000,
gas: 100000,
gasPrice: 2 * 1000000000,
from: (await web3.eth.getAccounts())[0]
})

Expand All @@ -47,8 +47,8 @@ await LongShortPair
.create(
web3.utils.toWei("5")
).send({
gas: 300000,
gasPrice: 2 * 1000000000,
gas: 300000,
gasPrice: 2 * 1000000000,
from: (await web3.eth.getAccounts())[0]
})

Expand All @@ -58,8 +58,8 @@ await LongShortPair
.redeem(
web3.utils.toWei("2.5")
).send({
gas: 200000,
gasPrice: 2 * 1000000000,
gas: 200000,
gasPrice: 2 * 1000000000,
from: (await web3.eth.getAccounts())[0]
})
```
Expand Down Expand Up @@ -88,7 +88,7 @@ const LongShortPair = new ethers.Contract(
)

// collateralPerPair: units of collateral are required to mint one pair of synthetic tokens
const mintTx = await LongShortPair.create(depositBobaAmount.div(collateralPerPair))
const mintTx = await LongShortPair.create(depositBobaAmount.div(collateralPerPair))
await mintTx.wait()
```

Expand All @@ -104,20 +104,20 @@ TVLDenomination:USD,
LowerTVLBound:300000000,
UpperTVLBound:1000000000,
MinimumPayout:1,
Rounding:6"
--optimisticOracleLivenessTime 43200
Rounding:6"
--optimisticOracleLivenessTime 43200
--fpl Linear --lowerBound 0 --upperBound 2000000000000000000
```

## Each WAGMI token needs a new Oracle that provides the goal-specific data
## Each WAGMI token needs a new Oracle that provides the goal-specific data

The WAGMIv0 oracle is documented [here](https://github.com/UMAprotocol/UMIPs/blob/master/Implementations/boba-wagmi-tvl.md). Briefly, the WAGMIv0 oracle estimates TVL bridged from L1 to Boba network through the L1 standard bridge contract. It is based on similar calculation logic that is used to estimate Boba network TVL on the Dune Analytics Boba Bridge USD TVL display.
The WAGMIv0 oracle is documented [here](https://github.com/UMAprotocol/UMIPs/blob/master/Implementations/boba-wagmi-tvl.md). Briefly, the WAGMIv0 oracle estimates TVL bridged from L1 to Boba network through the L1 standard bridge contract. It is based on similar calculation logic that is used to estimate Boba network TVL on the Dune Analytics Boba Bridge USD TVL display.

[Method doc - Boba TVL](https://github.com/UMAprotocol/UMIPs/blob/master/Implementations/boba-wagmi-tvl.md) (that is referenced in LSP contract ancillary data) has link to example script: https://github.com/Reinis-FRP/boba-tvl.

## Claims Interface

For the claims interface, the relevant smart contracts are:
For the claims interface, the relevant smart contracts are:

* The [LSP contract 0x7F969E3F19355C47f6bc957E502c79C75b373BF3](https://blockexplorer.boba.network/address/0x7F969E3F19355C47f6bc957E502c79C75b373BF3/transactions)

Expand Down Expand Up @@ -195,7 +195,7 @@ Next, add the new WAGMI token to the **token lookup**:
} else if (_tokenContractAddressL1 === 'wagmiv0') {
if(tA['WAGMIv0'].L2 !== null) _tokenContractAddressL2 = tA['WAGMIv0'].L2.toLowerCase()
tokenContract = new ethers.Contract(
_tokenContractAddressL2,
_tokenContractAddressL2,
erc20abi,
networkService.L2Provider,
)
Expand Down
4 changes: 4 additions & 0 deletions packages/boba/gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@
"axios": "^0.21.1",
"bignumber.js": "^9.0.1",
"bn.js": "^5.1.3",
"bootstrap-daterangepicker": "^3.1.0",
"browserify-fs": "^1.0.0",
"browserify-zlib": "^0.2.0",
"buffer": "^6.0.3",
"date-fns": "^2.30.0",
"dayjs": "^1.11.7",
"dotenv": "^8.2.0",
"eslint-config-react-app": "^7.0.0",
Expand All @@ -60,8 +62,10 @@
"postcss-normalize": "^10.0.1",
"process": "^0.11.10",
"react": "^17.0.2",
"react-bootstrap-daterangepicker": "^8.0.0",
"react-card-flip": "^1.1.5",
"react-datepicker": "^4.6.0",
"react-day-picker": "^8.8.0",
"react-dom": "^17.0.2",
"react-ga4": "^1.4.1",
"react-multi-carousel": "^2.6.5",
Expand Down
4 changes: 4 additions & 0 deletions packages/boba/gateway/src/actions/networkAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,7 @@ export function setActiveNetworkType(payload) {
return dispatch({ type: 'NETWORK/SET_TYPE/ACTIVE', payload })
}
}

export function fetchBlockExplorerUrls() {
return createAction('NETWORK/SET/BLOCK_EXPLORER', () => networkService.getBlockExplorerLinks())
}
9 changes: 9 additions & 0 deletions packages/boba/gateway/src/assets/bobaAvax.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions packages/boba/gateway/src/assets/bobaBNB.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions packages/boba/gateway/src/assets/bobaEth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions packages/boba/gateway/src/assets/ethereum.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/boba/gateway/src/assets/images/allNetworks.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
9 changes: 9 additions & 0 deletions packages/boba/gateway/src/assets/images/ethereumFlex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/boba/gateway/src/assets/images/filter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions packages/boba/gateway/src/assets/images/hamburger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions packages/boba/gateway/src/assets/images/icons/actions.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/boba/gateway/src/assets/images/icons/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/boba/gateway/src/assets/images/icons/no-data.svg
18 changes: 18 additions & 0 deletions packages/boba/gateway/src/assets/images/icons/switchButton.svg
Loading

0 comments on commit 36d36e6

Please sign in to comment.