Skip to content

Commit 6d87344

Browse files
committed
Merge branch 'master' into update-buttons
2 parents 0ff3991 + b079847 commit 6d87344

Some content is hidden

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

47 files changed

+22041
-13304
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"react-feather": "^2.0.10",
3434
"react-select": "^5.3.2",
3535
"styled-components": "^5.3.5",
36-
"viem": "2.21.10",
37-
"wagmi": "2.12.12"
36+
"viem": "2.28.0",
37+
"wagmi": "2.15.0"
3838
},
3939
"devDependencies": {
4040
"@next/bundle-analyzer": "^12.1.6",

server/package-lock.json

Lines changed: 19297 additions & 11489 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@
1919
"serverless": "^2.31.0",
2020
"serverless-prune-plugin": "^1.4.4",
2121
"serverless-webpack-fixed": "^5.3.3",
22-
"ts-loader": "^8.0.18",
22+
"ts-loader": "^9.5.1",
2323
"typescript": "5.4.5",
2424
"webpack": "^5.27.2"
2525
},
2626
"dependencies": {
2727
"@aws-sdk/client-s3": "^3.504.0",
28-
"bignumber.js": "^9.1.1"
28+
"@rainbow-me/rainbowkit": "^2.1.6",
29+
"bignumber.js": "^9.1.1",
30+
"react": "^18.2.0",
31+
"react-dom": "^18.2.0",
32+
"viem": "^2.21.10",
33+
"wagmi": "^2.12.12"
2934
}
3035
}

server/serverless.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ custom:
4444
stage: ${opt:stage, self:provider.stage}
4545
webpack:
4646
webpackConfig: ./webpack.config.js
47-
includeModules:
48-
forceInclude:
49-
- ethers
5047
packager: 'npm'
5148
excludeFiles: src/**/*.test.ts
5249
prune:
@@ -92,6 +89,8 @@ functions:
9289
memorySize: 512
9390
events:
9491
- schedule: cron(0 * * * ? *)
92+
environment:
93+
CG_API_KEY: ${env:CG_API_KEY}
9594

9695
resources:
9796
# CORS for api gateway errors

server/src/generateTokenlist.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ const handler = async () => {
55
try {
66
const tokenlists = await getTokenList();
77
await storeJSONString('tokenlists.json', JSON.stringify(tokenlists), 3600);
8+
// store token list by chain
9+
for (const chain in tokenlists) {
10+
const list = {}
11+
for (const token of tokenlists[chain]) {
12+
list[token.address] = token;
13+
}
14+
await storeJSONString(`tokenlists-${chain}.json`, JSON.stringify(list), 3600);
15+
}
816
} catch (e) {
917
console.log(e);
1018
throw e;

server/src/tokenlists/getSandwichList.ts

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)