Skip to content

Commit 414111c

Browse files
committed
Merge branch 'staging' into production
2 parents 17d6231 + 1487ed8 commit 414111c

File tree

277 files changed

+92688
-1817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+92688
-1817
lines changed

CONTRIBUTING.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Contributing
22

3+
# Hop Monorepo
4+
5+
We welcome contributations for bug fixes and performance improvements.
6+
7+
Please open an issue for any feature requests to discuss it with the maintainers.
8+
9+
## Typo Fixes
10+
11+
At the moment, we do not accept contributions for typo fixes due to high number of spam PRs.
12+
313
# Frontend
414

515
Thank you for your interest in contributing to the Hop frontend!🐰
@@ -41,11 +51,11 @@ The following points should help guide your development:
4151
- Accessibility: anyone can use the interface
4252
- The interface should be responsive, small and also run well on low performance devices (majority of swaps on mobile!)
4353

44-
At the moment we're only considering bug fixes and small improvements. If you have a feature request, please open an issue first to discuss it.
54+
At the moment we're only considering bug fixes that improve functionality. If you have a feature request, please open an issue first to discuss it.
4555

4656
### Release process
4757

48-
Releases are cut automatically from the `production` branch according to the [release workflow](./.github/workflows/deploy.yml).
58+
Releases are cut automatically from the `production` branch according to the [release workflow](.github/workflows/ui-deploy.yml).
4959

5060
Fix pull requests should be merged whenever ready and tested.
5161

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
| Lib/App | Current Version | Description |
1818
| --- | --- | --- |
1919
[@hop-protocol/v2-sdk](packages/v2-sdk) | [![npm version](https://badge.fury.io/js/%40hop-protocol%2Fv2-sdk.svg)](https://badge.fury.io/js/) | V2 TypeScript Hop SDK |
20-
[@hop-protocol/v2-hop-node](packages/v-2hop-node) | [![npm version](https://badge.fury.io/js/%40hop-protocol%2Fv2-hop-node.svg)](https://badge.fury.io/js/) | TypeScript Hop Node |
20+
[@hop-protocol/v2-hop-node](packages/v2-hop-node) | [![npm version](https://badge.fury.io/js/%40hop-protocol%2Fv2-hop-node.svg)](https://badge.fury.io/js/) | TypeScript Hop Node |
2121

2222
## Quickstart
2323

ops/webhooks/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Set up a webhook [on GitHub](https://github.com/hop-protocol/hop/settings/hooks)
1616
- Installation
1717
- Add the appropriate files from this directory to the server and make them executable with `chmod +x`
1818
- Run `./install_webhook_server.sh`
19-
- Run `/.install-_dependencies.sh`
19+
- Run `./install-_dependencies.sh`
2020
- Run the webhook server in the background with `./run_webhook_server.sh &`
2121

22-
Ensure that you have a `docker.sh` executable file in the directly where these files are being executed.
22+
Ensure that you have a `docker.sh` executable file in the directory where these files are being executed.
2323

2424
To stop the webhook server, run `./stop_webhook_server.sh`.

packages/frontend/src/pages/CommitTransfers/CommitTransfers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export const CommitTransfers: FC = () => {
151151
<Typography variant="h4">Commit Transfers</Typography>
152152
</Box>
153153
<Box mb={4} justifyItems="center" style={{ opacity: 0.7 }}>
154-
<Typography variant="body1">This is to commit the transfer root hash which is necessary for manually withdrawals.</Typography>
154+
<Typography variant="body1">This is to commit the transfer root hash which is necessary for manual withdrawals.</Typography>
155155
</Box>
156156
<form className={styles.form} onSubmit={handleSubmit}>
157157
<Box>

packages/frontend/src/pages/Convert/ConvertContext.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,9 @@ const ConvertProvider: FC<{ children: ReactNode }> = ({ children }) => {
512512
useEffect(() => {
513513
const isUSDCe = sourceToken?.symbol === 'hUSDC.e' || destToken?.symbol === 'USDC.e'
514514
const isMagic = sourceToken?.symbol === 'hMAGIC'
515-
if (isUSDCe && destNetwork?.isL1) {
516-
setInfo(<>Notice: The USDC.e bonder was <Link target="_blank" rel="noopener noreferrer" href="https://twitter.com/HopProtocol/status/1765455840700694902">deprecated</Link> on March 20th, 2024. To transfer hUSDC.e to L1, <strong>you will need to wait for the full exit process (7+ days after root commit)</strong> before withdrawing. After you have intiated the withdrawal on this page, you must commit the transfer root hash on the <Link href="/#/commit-transfers">Commit Transfers Page</Link> here. Please reach out on <Link target="_blank" rel="noopener noreferrer" href="https://discord.gg/PwCF88emV4">Discord</Link> if you have any questions.</>)
517-
} else if (isMagic && destNetwork?.isL1) {
518-
setInfo(<>Notice: The MAGIC bonder was deprecated on December 2024. To transfer hMAGIC to L1, <strong>you will need to wait for the full exit process (7+ days after root commit)</strong> before withdrawing. After you have intiated the withdrawal on this page, you must commit the transfer root hash on the <Link href="/#/commit-transfers">Commit Transfers Page</Link> here. Please reach out on <Link target="_blank" rel="noopener noreferrer" href="https://discord.gg/PwCF88emV4">Discord</Link> if you have any questions.</>)
515+
const showInfo = (isUSDCe || isMagic) && destNetwork?.isL1
516+
if (showInfo) {
517+
setInfo(<>Notice: The {sourceToken?.symbol} bonder was {isUSDCe ? <Link target="_blank" rel="noopener noreferrer" href="https://twitter.com/HopProtocol/status/1765455840700694902">deprecated</Link>: 'deprecated'} on {isUSDCe ? 'March 20th, 2024' : 'December 2024'}. To transfer {sourceToken?.symbol} to L1, <strong>you will need to wait for the full exit process (7+ days after root commit)</strong> before withdrawing. Please visit the <Link target="_blank" rel="noopener noreferrer" href="https://docs.hop.exchange/basics/usdce-manual-withdrawals">docs</Link> for more details. Please reach out on <Link target="_blank" rel="noopener noreferrer" href="https://discord.gg/PwCF88emV4">Discord</Link> if you have any questions.</>)
519518
} else {
520519
setInfo(null)
521520
}

packages/hop-node/src/chains/Chains/optimism/inclusion/AbstractOptimismInclusionService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export abstract class AbstractOptimismInclusionService extends AbstractInclusion
106106
// The limit is set on RLP decoding, so all batches that can be decoded in MAX_RLP_BYTES_PER_CHANNEL will
107107
// be accepted ven if the size of the channel is greater than MAX_RLP_BYTES_PER_CHANNEL. The exact requirement
108108
// is that length(input) <= MAX_RLP_BYTES_PER_CHANNEL.
109-
// https://github.com/ethereum-optimism/optimism/blob/develop/specs/derivation.md#channel-format
109+
// https://github.com/ethereum-optimism/optimism/blob/master/specs/derivation.md#channel-format
110110
const maxOutputLength = 10_000_000
111111
const channelCompressed: Buffer = Buffer.concat([frameData])
112112
return zlib.inflateSync(channelCompressed, { maxOutputLength })

packages/sdk/docs/README.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Hop v1 SDK
22

3-
> The Hop Protocol TypeScript SDK
3+
> The Hop Protocol v1 TypeScript SDK
44
55
[![Documentation](https://img.shields.io/badge/documentation-available-green.svg?style=flat)](https://docs.hop.exchange/v/developer-docs/js-sdk/js-sdk)
6-
[![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/@hop-protocol/sdk/master/LICENSE)
7-
[![dependencies Status](https://david-dm.org/@hop-protocol/sdk/status.svg)](https://david-dm.org/@hop-protocol/sdk)
6+
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/@hop-protocol/sdk/master/LICENSE)
87
[![NPM version](https://badge.fury.io/js/%40hop-protocol%2Fsdk.svg)](https://badge.fury.io/js/%40hop-protocol%2Fsdk)
9-
[![npm bundle size (scoped version)](https://img.shields.io/bundlephobia/minzip/@hop-protocol/sdk/latest.svg)](https://bundlephobia.com/result?p=@hop-protocol/sdk@latest)
108

119
## Demo
1210

@@ -15,18 +13,18 @@
1513
## Install
1614

1715
```bash
18-
npm install @hop-protocol/sdk
16+
pnpm --filter @hop-protocol/sdk... install
1917
```
2018

2119
## CDN
2220

23-
[https://cdn.jsdelivr.net/npm/@hop-protocol/sdk@latest/hop.js](jsDelivr CDN)
21+
[jsDelivr CDN](https://cdn.jsdelivr.net/npm/@hop-protocol/sdk@latest/hop.js)
2422

2523
```html
2624
<script src="https://cdn.jsdelivr.net/npm/@hop-protocol/sdk@latest/hop.js"></script>
2725
```
2826

29-
[https://unpkg.com/@hop-protocol/sdk@latest/hop.js](unpkg CDN)
27+
[unpkg CDN](https://unpkg.com/@hop-protocol/sdk@latest/hop.js)
3028

3129
```html
3230
<script src="https://unpkg.com/@hop-protocol/sdk@latest/hop.js"></script>
@@ -43,31 +41,31 @@ For sdk API reference, see [hop-sdk-docs.netlify.app](https://hop-sdk-docs.netli
4341
Install dependencies
4442

4543
```bash
46-
npm install
44+
pnpm install
4745
```
4846

4947
Run build watcher
5048

5149
```bash
52-
npm run dev
50+
pnpm run dev
5351
```
5452

5553
Build sdk
5654

5755
```bash
58-
npm run build
56+
pnpm run build
5957
```
6058

6159
Generate documentation
6260

6361
```bash
64-
npm run docs
62+
pnpm run docs
6563
```
6664

6765
## Test
6866

6967
```bash
70-
npm test
68+
pnpm test
7169
```
7270

7371
## License

0 commit comments

Comments
 (0)