Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
kroist committed Dec 16, 2023
1 parent 4bdad0b commit d3f9906
Show file tree
Hide file tree
Showing 29 changed files with 3,374 additions and 1,001 deletions.
29 changes: 27 additions & 2 deletions contracts/FHEordle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ contract FHEordle is EIP712WithModifier {
uint8 public nGuesses;
euint8[5] public eqMaskGuess;
euint32[5] public letterMaskGuess;
euint16[5][5] public letterMaskGuessHist;

bytes32[] private proof;
bytes32 private root;
Expand Down Expand Up @@ -49,12 +50,17 @@ contract FHEordle is EIP712WithModifier {
for (uint8 i = 0; i < 5; i++) {
eqMaskGuess[i] = TFHE.asEuint8(0);
letterMaskGuess[i] = TFHE.asEuint32(0);
// letterMaskGuessHist[i][0] = TFHE.asEuint16(0);
// letterMaskGuessHist[i][1] = TFHE.asEuint16(0);
// letterMaskGuessHist[i][2] = TFHE.asEuint16(0);
// letterMaskGuessHist[i][3] = TFHE.asEuint16(0);
// letterMaskGuessHist[i][4] = TFHE.asEuint16(0);
}
nGuesses = 0;
wordSubmitted = false;
gameStarted = false;
playerWon = false;
proofChecked = false;
proofChecked = true;
root = _root;
word1 = 0;
}
Expand Down Expand Up @@ -120,13 +126,13 @@ contract FHEordle is EIP712WithModifier {
word1Letters[4] = l4;
word1LettersMask = mask;
wordSubmitted = true;
gameStarted = true;
}

function submitProof(bytes32[] calldata _proof) public onlyRelayer {
require(wordSubmitted, "word not submitted");
require(!gameStarted, "game started");
proof = _proof;
gameStarted = true;
}

function guessWord1(
Expand Down Expand Up @@ -173,6 +179,11 @@ contract FHEordle is EIP712WithModifier {
);
eqMaskGuess[nGuesses] = eqMask;
letterMaskGuess[nGuesses] = TFHE.and(word1LettersMask, letterMask);
letterMaskGuessHist[nGuesses][0] = l0;
letterMaskGuessHist[nGuesses][1] = l1;
letterMaskGuessHist[nGuesses][2] = l2;
letterMaskGuessHist[nGuesses][3] = l3;
letterMaskGuessHist[nGuesses][4] = l4;

nGuesses += 1;
}
Expand All @@ -190,6 +201,20 @@ contract FHEordle is EIP712WithModifier {
);
}

function getLetterGuess(uint8 guessN,
uint8 letterN,
bytes32 publicKey,
bytes calldata signature
)
public view onlySignedPublicKey(publicKey, signature) onlyPlayer
returns (bytes memory) {
require(guessN < nGuesses, "canno exceed nGuesses");
require(letterN < 5, "cannot exceed 5");
return (
TFHE.reencrypt(letterMaskGuessHist[guessN][letterN], publicKey)
);
}

function claimWin(uint8 guessN) public onlyPlayer {
euint8 fullMask = TFHE.asEuint8(31);
bool compare = TFHE.decrypt(TFHE.eq(fullMask, eqMaskGuess[guessN]));
Expand Down
13 changes: 13 additions & 0 deletions contracts/FHEordleFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ contract FHEordleFactory is EIP712WithModifier {

mapping(address => address) public userLastContract;

mapping(address => uint32) public gamesWon;
mapping(address => bool) public claimedWin;

constructor() EIP712WithModifier("Authorization token", "1") {
creator = msg.sender;
}
Expand Down Expand Up @@ -57,6 +60,16 @@ contract FHEordleFactory is EIP712WithModifier {
return true;
}

function mint() public {
if (userLastContract[msg.sender] != address(0)) {
address contractAddr = userLastContract[msg.sender];
FHEordle game = FHEordle(contractAddr);
require(game.playerWon() && game.proofChecked() && !claimedWin[contractAddr], "has to win and check proof");
claimedWin[contractAddr] = true;
gamesWon[msg.sender] += 1;
}
}



}
104 changes: 104 additions & 0 deletions react-wordle/config/env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
'use strict';

const fs = require('fs');
const path = require('path');
const paths = require('./paths');

// Make sure that including paths.js after env.js will read .env variables.
delete require.cache[require.resolve('./paths')];

const NODE_ENV = process.env.NODE_ENV;
if (!NODE_ENV) {
throw new Error(
'The NODE_ENV environment variable is required but was not specified.'
);
}

// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
const dotenvFiles = [
`${paths.dotenv}.${NODE_ENV}.local`,
// Don't include `.env.local` for `test` environment
// since normally you expect tests to produce the same
// results for everyone
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
`${paths.dotenv}.${NODE_ENV}`,
paths.dotenv,
].filter(Boolean);

// Load environment variables from .env* files. Suppress warnings using silent
// if this file is missing. dotenv will never modify any environment variables
// that have already been set. Variable expansion is supported in .env files.
// https://github.com/motdotla/dotenv
// https://github.com/motdotla/dotenv-expand
dotenvFiles.forEach(dotenvFile => {
if (fs.existsSync(dotenvFile)) {
require('dotenv-expand')(
require('dotenv').config({
path: dotenvFile,
})
);
}
});

// We support resolving modules according to `NODE_PATH`.
// This lets you use absolute paths in imports inside large monorepos:
// https://github.com/facebook/create-react-app/issues/253.
// It works similar to `NODE_PATH` in Node itself:
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims.
// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
// We also resolve them to make sure all tools using them work consistently.
const appDirectory = fs.realpathSync(process.cwd());
process.env.NODE_PATH = (process.env.NODE_PATH || '')
.split(path.delimiter)
.filter(folder => folder && !path.isAbsolute(folder))
.map(folder => path.resolve(appDirectory, folder))
.join(path.delimiter);

// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
// injected into the application via DefinePlugin in webpack configuration.
const REACT_APP = /^REACT_APP_/i;

function getClientEnvironment(publicUrl) {
const raw = Object.keys(process.env)
.filter(key => REACT_APP.test(key))
.reduce(
(env, key) => {
env[key] = process.env[key];
return env;
},
{
// Useful for determining whether we’re running in production mode.
// Most importantly, it switches React into the correct mode.
NODE_ENV: process.env.NODE_ENV || 'development',
// Useful for resolving the correct path to static assets in `public`.
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
// This should only be used as an escape hatch. Normally you would put
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
// We support configuring the sockjs pathname during development.
// These settings let a developer run multiple simultaneous projects.
// They are used as the connection `hostname`, `pathname` and `port`
// in webpackHotDevClient. They are used as the `sockHost`, `sockPath`
// and `sockPort` options in webpack-dev-server.
WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
// Whether or not react-refresh is enabled.
// It is defined here so it is available in the webpackHotDevClient.
FAST_REFRESH: process.env.FAST_REFRESH !== 'false',
}
);
// Stringify all values so we can feed into webpack DefinePlugin
const stringified = {
'process.env': Object.keys(raw).reduce((env, key) => {
env[key] = JSON.stringify(raw[key]);
return env;
}, {}),
};

return { raw, stringified };
}

module.exports = getClientEnvironment;
66 changes: 66 additions & 0 deletions react-wordle/config/getHttpsConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
'use strict';

const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
const chalk = require('react-dev-utils/chalk');
const paths = require('./paths');

// Ensure the certificate and key provided are valid and if not
// throw an easy to debug error
function validateKeyAndCerts({ cert, key, keyFile, crtFile }) {
let encrypted;
try {
// publicEncrypt will throw an error with an invalid cert
encrypted = crypto.publicEncrypt(cert, Buffer.from('test'));
} catch (err) {
throw new Error(
`The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}`
);
}

try {
// privateDecrypt will throw an error with an invalid key
crypto.privateDecrypt(key, encrypted);
} catch (err) {
throw new Error(
`The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${
err.message
}`
);
}
}

// Read file and throw an error if it doesn't exist
function readEnvFile(file, type) {
if (!fs.existsSync(file)) {
throw new Error(
`You specified ${chalk.cyan(
type
)} in your env, but the file "${chalk.yellow(file)}" can't be found.`
);
}
return fs.readFileSync(file);
}

// Get the https config
// Return cert files if provided in env, otherwise just true or false
function getHttpsConfig() {
const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env;
const isHttps = HTTPS === 'true';

if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE);
const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE);
const config = {
cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
key: readEnvFile(keyFile, 'SSL_KEY_FILE'),
};

validateKeyAndCerts({ ...config, keyFile, crtFile });
return config;
}
return isHttps;
}

module.exports = getHttpsConfig;
29 changes: 29 additions & 0 deletions react-wordle/config/jest/babelTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

const babelJest = require('babel-jest').default;

const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false;
}

try {
require.resolve('react/jsx-runtime');
return true;
} catch (e) {
return false;
}
})();

module.exports = babelJest.createTransformer({
presets: [
[
require.resolve('babel-preset-react-app'),
{
runtime: hasJsxRuntime ? 'automatic' : 'classic',
},
],
],
babelrc: false,
configFile: false,
});
14 changes: 14 additions & 0 deletions react-wordle/config/jest/cssTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';

// This is a custom Jest transformer turning style imports into empty objects.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process() {
return 'module.exports = {};';
},
getCacheKey() {
// The output is always the same.
return 'cssTransform';
},
};
40 changes: 40 additions & 0 deletions react-wordle/config/jest/fileTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict';

const path = require('path');
const camelcase = require('camelcase');

// This is a custom Jest transformer turning file imports into filenames.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process(src, filename) {
const assetFilename = JSON.stringify(path.basename(filename));

if (filename.match(/\.svg$/)) {
// Based on how SVGR generates a component name:
// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
const pascalCaseFilename = camelcase(path.parse(filename).name, {
pascalCase: true,
});
const componentName = `Svg${pascalCaseFilename}`;
return `const React = require('react');
module.exports = {
__esModule: true,
default: ${assetFilename},
ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
return {
$$typeof: Symbol.for('react.element'),
type: 'svg',
ref: ref,
key: null,
props: Object.assign({}, props, {
children: ${assetFilename}
})
};
}),
};`;
}

return `module.exports = ${assetFilename};`;
},
};
Loading

0 comments on commit d3f9906

Please sign in to comment.