open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into automated-market-resolution

Browse Source
This commit is contained in:
Milli 2022-05-28 22:22:44 +02:00
commit fe2c90d011
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/antes.ts
View File

@ -116,7 +116,7 @@ export function getFreeAnswerAnte(
}
export function getNumericAnte(
creator: User,
anteBettorId: string,
contract: FullContract<DPM, Numeric>,
ante: number,
newBetId: string
@ -136,7 +136,7 @@ export function getNumericAnte(
const anteBet: NumericBet = {
id: newBetId,
userId: creator.id,
userId: anteBettorId,
contractId: contract.id,
amount: ante,
allBetAmounts,

2
functions/src/create-contract.ts
View File

@ -184,7 +184,7 @@ export const createContract = newEndpoint(['POST'], async (req, [user, _]) => {
.doc()
const anteBet = getNumericAnte(
user,
providerId,
contract as FullContract<DPM, Numeric>,
ante,
anteBetDoc.id

7
web/package.json
View File

@ -4,10 +4,10 @@
"private": true,
"scripts": {
"dev": "concurrently -n NEXT,TS -c magenta,cyan \"next dev -p 3000\" \"yarn ts --watch\"",
"devdev": "NEXT_PUBLIC_FIREBASE_ENV=DEV concurrently -n NEXT,TS -c magenta,cyan \"FIREBASE_ENV=DEV next dev -p 3000\" \"FIREBASE_ENV=DEV yarn ts --watch\" # see https://github.com/vercel/next.js/discussions/33634",
"devdev": "cross-env NEXT_PUBLIC_FIREBASE_ENV=DEV concurrently -n NEXT,TS -c magenta,cyan \"cross-env FIREBASE_ENV=DEV next dev -p 3000\" \"cross-env FIREBASE_ENV=DEV yarn ts --watch\"",
"dev:dev": "yarn devdev",
"dev:the": "NEXT_PUBLIC_FIREBASE_ENV=THEOREMONE concurrently -n NEXT,TS -c magenta,cyan \"FIREBASE_ENV=THEOREMONE next dev -p 3000\" \"FIREBASE_ENV=THEOREMONE yarn ts --watch\"",
"dev:emulate": "NEXT_PUBLIC_FIREBASE_EMULATE=TRUE yarn devdev",
"dev:the": "cross-env NEXT_PUBLIC_FIREBASE_ENV=THEOREMONE concurrently -n NEXT,TS -c magenta,cyan \"cross-env FIREBASE_ENV=THEOREMONE next dev -p 3000\" \"cross-env FIREBASE_ENV=THEOREMONE yarn ts --watch\"",
"dev:emulate": "cross-env NEXT_PUBLIC_FIREBASE_EMULATE=TRUE yarn devdev",
"ts": "tsc --noEmit --incremental --preserveWatchOutput --pretty",
"build": "next build",
"start": "next start",
@ -48,6 +48,7 @@
"autoprefixer": "10.2.6",
"concurrently": "6.5.1",
"critters": "0.0.16",
"cross-env": "^7.0.3",
"eslint-config-next": "12.1.6",
"next-sitemap": "^2.5.14",
"postcss": "8.3.5",

9
yarn.lock
View File

@ -1828,7 +1828,14 @@ critters@0.0.16:
postcss "^8.3.7"
pretty-bytes "^5.3.0"
cross-spawn@^7.0.2:
cross-env@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
dependencies:
cross-spawn "^7.0.1"
cross-spawn@^7.0.1, cross-spawn@^7.0.2:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==