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

dev: upgrade deps #1346

Merged
merged 2 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:

jobs:
api-deploy:
# master and prod only, no tags
if: startsWith(github.ref, 'refs/heads/')
name: API Deploy
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions apps/daimo-clippy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dev": "echo Use 'npm start' for Clippy dev",
"start": "tsx src/index.ts",
"lint": "npm run lint:deps && npm run lint:style",
"lint:deps": "npx depcheck --ignores @tsconfig/node20,@types/tape,ts-node",
"lint:deps": "npx depcheck --ignores @tsconfig/node20,@types/tape",
"lint:style": "eslint . --max-warnings=0"
},
"license": "GPL-3.0-or-later",
Expand All @@ -17,6 +17,6 @@
"@slack/bolt": "^3.17.1",
"@trpc/client": "^11.0.0-next-beta.318",
"dotenv": "^16.4.5",
"viem": "^1.19.15"
"viem": "^2.18.2"
}
}
1 change: 0 additions & 1 deletion apps/daimo-mobile/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ config.resolver = {
stream: require.resolve("stream-browserify"), // For CBOR React Native
},
assetExts: [...config.resolver.assetExts, "ttf", "woff", "woff2"], // Include font extensions
unstable_enablePackageExports: true,
};

module.exports = config;
6 changes: 3 additions & 3 deletions apps/daimo-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@babel/core": "^7.20.0",
"@craftzdog/react-native-buffer": "^6.0.5",
"@daimo/api": "*",
"@daimo/auth-client": "^0.1.0",
"@daimo/auth-client": "*",
"@daimo/common": "*",
"@daimo/contract": "*",
"@daimo/expo-app-delegate": "*",
Expand Down Expand Up @@ -103,8 +103,8 @@
"stream-browserify": "^3.0.0",
"text-encoding-polyfill": "^0.6.7",
"ts-unused-exports": "^9.0.4",
"typescript": "^5.3.0",
"viem": "^1.19.15",
"typescript": "5.3.3",
"viem": "^2.18.2",
"zod": "^3.23.8"
},
"eslintConfig": {
Expand Down
4 changes: 2 additions & 2 deletions apps/daimo-mobile/src/logic/key.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
SlotType,
signWithMnemonic,
} from "@daimo/common";
import { daimoAccountABI } from "@daimo/contract";
import { daimoAccountAbi } from "@daimo/contract";
import * as ExpoEnclave from "@daimo/expo-enclave";
import { SigningCallback } from "@daimo/userop";
import { base64urlnopad } from "@scure/base";
Expand Down Expand Up @@ -83,7 +83,7 @@ function wrapRawSignerAsWebauthn(
const responseTypeLocation = BigInt(clientDataJSON.indexOf('"type":'));

const signatureStruct = getAbiItem({
abi: daimoAccountABI,
abi: daimoAccountAbi,
name: "signatureStruct",
}).inputs;

Expand Down
4 changes: 2 additions & 2 deletions apps/daimo-mobile/src/logic/passkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
getSlotType,
parseAndNormalizeSig,
} from "@daimo/common";
import { DaimoChain, daimoAccountABI } from "@daimo/contract";
import { DaimoChain, daimoAccountAbi } from "@daimo/contract";
import * as ExpoPasskeys from "@daimo/expo-passkeys";
import { SigningCallback } from "@daimo/userop";
import { base64 } from "@scure/base";
Expand Down Expand Up @@ -98,7 +98,7 @@ export function getWrappedPasskeySigner(
const { r, s } = parseAndNormalizeSig(derSig);

const signatureStruct = getAbiItem({
abi: daimoAccountABI,
abi: daimoAccountAbi,
name: "signatureStruct",
}).inputs;

Expand Down
2 changes: 1 addition & 1 deletion apps/daimo-mobile/src/sync/sync.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccountHistoryResult } from "@daimo/api";
import type { AccountHistoryResult } from "@daimo/api";
import {
EAccount,
OpStatus,
Expand Down
2 changes: 1 addition & 1 deletion apps/daimo-testbed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"fast-text-encoding": "^1.0.6",
"react": "18.2.0",
"react-native": "0.73.4",
"typescript": "^5.3.0"
"typescript": "5.3.3"
}
}
11 changes: 5 additions & 6 deletions apps/daimo-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
"@daimo/contract": "*",
"@headlessui/react": "^1.7.18",
"@neynar/nodejs-sdk": "^1.12.0",
"@rainbow-me/rainbowkit": "^1.1.1",
"@rainbow-me/rainbowkit": "^2.1.6",
"@tanstack/react-query": "^5.28.4",
"@trpc/client": "^11.0.0-next-beta.318",
"@trpc/react-query": "^11.0.0-next-beta.318",
"@trpc/server": "^11.0.0-next-beta.318",
"@types/react": "~18.2.45",
"@types/react-dom": "^18.2.7",
Expand All @@ -27,13 +26,13 @@
"next": "^13.5.4",
"pino-pretty": "^10.2.3",
"react": "18.2.0",
"react-dom": "^18.2.0",
"react-dom": "18.2.0",
"sharp": "0.32.6",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.4.1",
"ts-loader": "^9.5.0",
"use-debounce": "^10.0.0",
"viem": "^1.19.15",
"wagmi": "^1.4.12",
"viem": "^2.18.2",
"wagmi": "^2.12.0",
"zod": "^3.23.8"
},
"scripts": {
Expand Down
249 changes: 0 additions & 249 deletions apps/daimo-web/src/app/pos/PointOfSalePage.tsx

This file was deleted.

Loading
Loading