Skip to content

Commit 51ccd7d

Browse files
committed
Merge remote-tracking branch 'origin/master' into pxrl/refactor2
2 parents 534d300 + 3292a65 commit 51ccd7d

File tree

199 files changed

+10993
-6097
lines changed

Some content is hidden

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

199 files changed

+10993
-6097
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22
jobs:
33
install:
44
docker:
5-
- image: cimg/node:20.19.2
5+
- image: cimg/node:22.18.0
66
working_directory: ~/relayer-v2
77
resource_class: medium+
88
steps:
@@ -21,7 +21,7 @@ jobs:
2121
- node_modules
2222
test:
2323
docker:
24-
- image: cimg/node:20.19.2
24+
- image: cimg/node:22.18.0
2525
working_directory: ~/relayer-v2
2626
resource_class: medium+
2727
parallelism: 20
@@ -105,7 +105,7 @@ jobs:
105105
yarn test --bail $(cat /tmp/test-files)
106106
lint:
107107
docker:
108-
- image: cimg/node:20.19.2
108+
- image: cimg/node:22.18.0
109109
working_directory: ~/relayer-v2
110110
resource_class: medium+
111111
steps:

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ RELAYER_TOKENS='["0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", "0xA0b86991c6218b
269269
# and ARWEAVE_GATEWAY must be set to valid values.
270270
PERSIST_DATA_TO_ARWEAVE=false
271271

272-
# This wallet JWK is used to sign transactions intended for permenant storage of bundle
272+
# This wallet JWK is used to sign transactions intended for permanent storage of bundle
273273
# data on Arweave. Ensure that the wallet has enough AR to cover the cost of storage.
274274
ARWEAVE_WALLET_JWK=$({"kty":"", "e":"", "n":"", "d":"", "p":"", "q":"", "dp":"", "dq":"", "qi":""})
275275

.github/workflows/dependency-review.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ jobs:
1212
uses: actions/checkout@v4
1313
- name: "Dependency Review"
1414
uses: actions/[email protected]
15+
with:
16+
allow-ghsas: |
17+
GHSA-h755-8qp9-cq85

.github/workflows/deploy.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ jobs:
1010
- name: Curl build and deploy webhook for GCP for UMA protocol repo
1111
run: ${{ secrets.PROTOCOL_BUILD_DEPLOY_WEBHOOK }}
1212
shell: bash
13+
- name: Curl build and deploy webhook for GCP for UMA across repo
14+
run: ${{ secrets.ACROSS_BUILD_DEPLOY_WEBHOOK }}
15+
shell: bash

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
# Setup .npmrc file to publish to npm
1111
- uses: actions/setup-node@v4
1212
with:
13-
node-version: "20"
13+
node-version: "22.18"
1414
registry-url: "https://registry.npmjs.org"
1515
cache: "yarn"
1616
- run: yarn

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ addresses.json
2626

2727
# AI context files
2828
CLAUDE.md
29+
30+
# yalc
31+
.yalc

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# These owners will be the default owners for everything in
88
# the repo unless a later match takes precedence.
9-
* @mrice32 @nicholaspai @pxrl @james-a-morris @dohaki @bmzig
9+
* @mrice32 @nicholaspai @pxrl @dohaki @bmzig

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM node:20
1+
FROM node:22.18
22

3-
WORKDIR /relayer
3+
WORKDIR /across-relayer
44

55
COPY . ./
66

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Check out [this guide](https://docs.across.to/relayers/running-a-relayer) for de
1717

1818
## Prerequisites
1919

20-
To install dependencies successfully, node version should be higher or equal to v20.18.0 && lower than v22. After installing dependencies and building the repository, be sure to [install RedisDB](https://redis.io/docs/getting-started/installation/), an in-memory storage layer that is required to make the bots work. The bots query blockchain RPCs for a lot of smart contract events so it's important that the bot
20+
To install dependencies successfully, node version should be higher or equal to v20.18.0 && lower than v22. After installing dependencies and building the repository, be sure to [install RedisDB](https://redis.io/docs/latest/get-started), an in-memory storage layer that is required to make the bots work. The bots query blockchain RPCs for a lot of smart contract events so it's important that the bot
2121
cache some of this data in order to maintain its speed.
2222

2323
The first time that the bot runs, it might be slower than usual as the Redis DB fills up. This slowdown should disappear on subsequent runs.
@@ -81,19 +81,20 @@ To test local changes to the SDK alongside this repository you can use `yalc`:
8181
npm install -g yalc
8282
```
8383

84-
2. Inside the `@across-protocol/sdk` directory, publish the local SDK to your local yalc server:
84+
2. Inside the `@across-protocol/sdk` directory, watch for changes and publish the local SDK to your local yalc server:
8585

8686
```sh
87-
yalc publish
87+
yalc yalc:watch
8888
```
8989

90-
3. Link the local SDK in this repository:
90+
3. Add/Link the local SDK in this repository:
9191

9292
```sh
9393
yalc add @across-protocol/sdk
9494
```
95+
use `yalc link @across-protocol/sdk` if you dont want yalc to modify package.json file
9596

96-
To make updates to the SDK, you can run `yalc update @across-protocol/sdk` in this repository.
97+
Any changes to the SDK will be automatically published to your local yalc server.
9798

9899
Once you are done testing, you can remove the local SDK by running `yalc remove @across-protocol/sdk` in this repository.
99100

STYLE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
This repo adpots [Google TypeScript Style Guide](https://google.github.io/styleguide/tsguide.html) for the sake of consistency and clarity of code.
2+
3+
In addition to the style guide above, the following principles should be followed:
4+
- functions should be short, < 100 LOC
5+
- files should be short, < 1000 LOC
6+
- functions should rarely have more than a couple of indentations within them, e.g. max 3. If there's more, it's usually a sign that functionality can be extracted to a separate function with readable name
7+
- within the same file / class, there should be minimal redundancy
8+
- comment line length should not exceed the configured max code line length: 120 characters

0 commit comments

Comments
 (0)