jude/Riskless
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a lot of stuff

Browse Source
This commit is contained in:
jude
2023-04-10 11:19:11 +01:00
parent 848c56ff84
commit 0991c6bff9
8 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
static/js/modules/crypto/paillier.js
View File

@ -1,7 +1,7 @@
import { cryptoRandom, generate_prime } from "./random_primes.js";
import { mod_exp } from "./math.js";
class Cyphertext {
class Ciphertext {
constructor(key, plainText, r) {
if (r === undefined) {
r = cryptoRandom(4096);
@ -46,15 +46,15 @@ class Cyphertext {
}
prove() {
return new ProofSessionProver(this);
return new ZeroProofSessionProver(this);
}
asReadOnlyCyphertext() {
return new ReadOnlyCyphertext(this.pubKey, this.cyphertext);
return new ReadOnlyCiphertext(this.pubKey, this.cyphertext);
}
}
class ProofSessionProver {
class ZeroProofSessionProver {
constructor(cipherText) {
this.cipherText = cipherText;
@ -87,9 +87,9 @@ class ProofSessionProver {
}
}
window.Cyphertext = Cyphertext;
window.Cyphertext = Ciphertext;
export class ReadOnlyCyphertext {
export class ReadOnlyCiphertext {
constructor(key, cyphertext) {
this.cyphertext = cyphertext;
this.pubKey = key;
@ -107,15 +107,15 @@ export class ReadOnlyCyphertext {
}
prove(plainText, a) {
return new ProofSessionVerifier(this, plainText, a);
return new ZeroProofSessionVerifier(this, plainText, a);
}
clone() {
return new ReadOnlyCyphertext(this.pubKey, this.cyphertext);
return new ReadOnlyCiphertext(this.pubKey, this.cyphertext);
}
}
class ProofSessionVerifier {
class ZeroProofSessionVerifier {
constructor(cipherText, plainText, a) {
// Clone, otherwise the update below will mutate the original value
this.cipherText = cipherText.clone();
@ -147,7 +147,7 @@ class ProofSessionVerifier {
}
}
window.ReadOnlyCyphertext = ReadOnlyCyphertext;
window.ReadOnlyCyphertext = ReadOnlyCiphertext;
export class PaillierPubKey {
constructor(n) {
@ -157,7 +157,7 @@ export class PaillierPubKey {
}
encrypt(m, r) {
return new Cyphertext(this, m, r);
return new Ciphertext(this, m, r);
}
toJSON() {

8
static/js/modules/interface/dom.js
View File

@ -148,6 +148,14 @@ document.addEventListener("DOMContentLoaded", () => {
el.addEventListener("click", (ev) => {
let region = ev.target.closest(".node").dataset.name;
game.us.sendReinforce(region);
if (game.isPregame()) {
game.us.endTurn();
if (game.allReinforcementsPlaced()) {
game.incrementState();
}
}
})
);

16
static/js/modules/interface/main.js
View File

@ -125,7 +125,7 @@ document.addEventListener("ACT", async (ev) => {
game.setReady(data.author, data.ready);
} else {
// Throw out our own packets
if (data.author === game.us) {
if (data.author === game.us.id) {
return;
}
@ -149,6 +149,10 @@ document.addEventListener("ACT", async (ev) => {
game.currentPlayer().endTurn();
}
}
if (game.allReinforcementsPlaced()) {
game.incrementState();
}
} else {
if (await game.currentPlayer().act(data)) {
game.currentPlayer().endTurn();
@ -163,8 +167,16 @@ document.addEventListener("ACT", async (ev) => {
// todo has to filter by player
document.addEventListener("PROOF", async (ev) => {
const data = ev.detail;
if (data.stage === "REQUEST") {
let region = Region.getRegion(data.region);
// todo check if this is a valid request e.g actually has neighbour
if (region.owner === game.us) {
region.prove();
}
}
if (data.stage === "CONJECTURE") {
// find the relevant entity
let region = Region.getRegion(data.region);
region.verify(BigInt(data.plainText), BigInt(data.a));

4
static/js/modules/interface/map.js
View File

@ -157,6 +157,10 @@ export class Region {
this.strength.prove(this.name);
}
requestProof() {
socket.emit("message", Packet.createProofRequest(this.name));
}
verify(plainText, a) {
this.strength.verify(this.name, plainText, a);
}

8
static/js/modules/interface/packet.js
View File

@ -117,6 +117,14 @@ export class Packet {
});
}
static createProofRequest(region) {
return this._sign({
...this._createBase("PROOF"),
stage: "REQUEST",
region: region,
});
}
static createProofConjecture(region, plainText, a) {
return this._sign({
...this._createBase("PROOF"),

27
static/js/modules/interface/player.js
View File

@ -1,7 +1,7 @@
import { Packet } from "./packet.js";
import { socket, game, random } from "./main.js";
import { RsaPubKey } from "../crypto/rsa.js";
import { PaillierPubKey, ReadOnlyCyphertext } from "../crypto/paillier.js";
import { PaillierPubKey, ReadOnlyCiphertext } from "../crypto/paillier.js";
import { Region } from "./map.js";
import { showDefenseDom } from "./dom.js";
@ -88,7 +88,7 @@ export class Player {
if (region.owner === null) {
region.claim(
this,
new ReadOnlyCyphertext(this.paillierPubKey, BigInt(data.cipherText))
new ReadOnlyCiphertext(this.paillierPubKey, BigInt(data.cipherText))
);
this.totalStrength += 1;
@ -112,7 +112,7 @@ export class Player {
if (region.owner === this) {
region.reinforce(
new ReadOnlyCyphertext(
new ReadOnlyCiphertext(
this.paillierPubKey,
BigInt(data.regions[regionName])
)
@ -122,6 +122,13 @@ export class Player {
this.totalStrength += 1;
// request proofs
for (let region of this.getRegions()) {
if ([...region.neighbours.values()].find((r) => r.owner === game.us)) {
region.requestProof();
}
}
return true;
}
@ -154,15 +161,13 @@ export class Player {
this.totalStrength += 1;
// send proofs
for (let region of this.getRegions()) {
// eh
if ([...region.neighbours.values()].find((r) => r.owner !== this)) {
region.prove();
if (game.isPlaying()) {
this.reinforcementsPlaced += 1;
if (this.reinforcementsPlaced === this.reinforcementsAvailable) {
this.turnPhase = PHASE_ATTACK;
}
}
this.endTurn();
}
/**
@ -173,7 +178,7 @@ export class Player {
*/
async act(data) {
if (this.turnPhase === PHASE_REINFORCE) {
if (data.region !== undefined) {
if (data.regions !== undefined) {
if (this.reinforce(data)) {
this.reinforcementsPlaced += 1;
}