Skip to content

Commit

Permalink
feat: bumped to zokrates 0.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
MirandaWood committed Jun 8, 2021
1 parent 3c445e1 commit 472f8fa
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 14 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GPR_TOKEN

FROM zokrates/zokrates:0.6.1 as builder
FROM zokrates/zokrates:0.6.4 as builder

FROM node:14.11.0 as node-build
ARG GPR_TOKEN
Expand All @@ -14,7 +14,7 @@ WORKDIR /app

COPY --from=node-build /app /app
COPY --from=builder /home/zokrates/.zokrates/bin/zokrates /app/zokrates
COPY ./stdlib-bugfix/stdlib /app/stdlib/
COPY --from=builder /home/zokrates/.zokrates/stdlib /app/stdlib/
COPY ./src ./src
COPY ./circuits ./circuits
COPY ./config ./config
Expand All @@ -24,7 +24,8 @@ COPY ./start-dev ./start-dev
RUN apt-get update -y
RUN apt-get install -y netcat

ENV ZOKRATES_HOME /app/stdlib
ENV ZOKRATES_HOME /app
ENV ZOKRATES_STDLIB /app/stdlib

EXPOSE 80
CMD npm start
26 changes: 21 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
},
"dependencies": {
"@eyblockchain/zokrates-zexe.js": "^0.1.12",
"@eyblockchain/zokrates-zexe.js": "^0.3.1",
"@semantic-release/git": "^9.0.0",
"amqplib": "^0.6.0",
"body-parser": "1.19.0",
Expand Down
6 changes: 3 additions & 3 deletions src/services/generateKeys.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import logger from '../utils/logger.mjs';

export default async function({
filepath,
curve = 'bls12_377',
backend = 'zexe',
provingScheme = 'gm17'
curve = 'bn128',
backend = 'ark', // zexe backend now named ark
provingScheme = 'gm17',
}) {
const outputPath = `./output`;
const circuitsPath = `./circuits`;
Expand Down
3 changes: 1 addition & 2 deletions src/services/generateProof.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default async function ({
transactionInputs,
outputDirectoryPath,
proofFileName,
backend = 'zexe',
backend = 'ark', // zexe backend now named ark
provingScheme = 'gm17',
}) {
const outputPath = `./output`;
Expand Down Expand Up @@ -64,7 +64,6 @@ export default async function ({

logger.info(`Complete`);
logger.debug(`Responding with proof and inputs:`);
logger.debug(proof);
logger.debug(publicInputs);
} finally {
try {
Expand Down

0 comments on commit 472f8fa

Please sign in to comment.