Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #801 from jMyles/vodka 

Some comments and require messages.
pull/811/head
K Prasch 2019-03-04 17:17:03 -08:00 committed by GitHub
parent ec6b754ad8 46647638e9
commit fa835e3436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nucypher/blockchain/eth/sol/source/contracts/MinersEscrow.sol
View File

@ -162,9 +162,10 @@ contract MinersEscrow is Issuer {
* @notice Set mining adjudicator address
**/
function setMiningAdjudicator(MiningAdjudicatorInterface _miningAdjudicator) external onlyOwner {
require(address(miningAdjudicator) == address(0) &&
address(_miningAdjudicator) != address(0) &&
_miningAdjudicator.escrow() == address(this));
// Three-part require...
require(address(miningAdjudicator) == address(0) && // Can't adjudicator once it is set.
address(_miningAdjudicator) != address(0) && // Check to make sure that we're setting it somewhere.
_miningAdjudicator.escrow() == address(this)); // This is the escrow for the new adjudicator.
miningAdjudicator = _miningAdjudicator;
}

97
nucypher/blockchain/eth/sol/source/contracts/MiningAdjudicator.sol
View File

@ -61,7 +61,9 @@ contract MiningAdjudicator is Upgradeable {
)
public
{
require(address(_escrow) != address(0) &&
// Sanity checks.
require(address(_escrow) != address(0) && // This contract has an escrow, and it's not the null address.
// The reward and penalty coefficients are set.
_percentagePenaltyCoefficient != 0 &&
_rewardCoefficient != 0);
escrow = _escrow;
@ -98,12 +100,13 @@ contract MiningAdjudicator is Upgradeable {
)
public
{
require(_minerPublicKey.length == 65 && _requesterPublicKey.length == 65);
require(_minerPublicKey.length == 65 && _requesterPublicKey.length == 65,
"Either the requester or miner had an incorrect key length (ie, not 65)");
// Check that CFrag is not evaluated yet
bytes32 evaluationHash = SignatureVerifier.hash(
abi.encodePacked(_capsuleBytes, _cFragBytes), hashAlgorithm);
require(!evaluatedCFrags[evaluationHash]);
require(!evaluatedCFrags[evaluationHash], "This CFrag has already been evaluated.");
// Verify requester's signature of Capsule
bytes memory preparedPublicKey = new bytes(64);
@ -221,11 +224,15 @@ contract MiningAdjudicator is Upgradeable {
require(Numerology.check_compressed_point(
_capsule.pointE.sign,
_capsule.pointE.xCoord,
_precomputed.pointEyCoord
));
_precomputed.pointEyCoord),
"Precomputed Y coordinate of E doesn't correspond to compressed E point"
);
// Input validation: z*E
require(Numerology.is_on_curve(_precomputed.pointEZxCoord, _precomputed.pointEZyCoord));
require(Numerology.is_on_curve(_precomputed.pointEZxCoord, _precomputed.pointEZyCoord),
"Point zE is not a valid EC point"
);
// TODO: Change validation of EC multiplications to require()
bool left_hand_element_is_correct = Numerology.ecmulVerify(
_capsule.pointE.xCoord, // E_x
_precomputed.pointEyCoord, // E_y
@ -236,13 +243,16 @@ contract MiningAdjudicator is Upgradeable {
// Input validation: E1
require(Numerology.check_compressed_point(
_cFrag.pointE1.sign, // E1_sign
_cFrag.pointE1.xCoord, // E1_x
_precomputed.pointE1yCoord // E1_y
));
_cFrag.pointE1.sign, // E1_sign
_cFrag.pointE1.xCoord, // E1_x
_precomputed.pointE1yCoord), // E1_y
"Precomputed Y coordinate of E1 doesn't correspond to compressed E1 point"
);
// Input validation: h*E_1
require(Numerology.is_on_curve(_precomputed.pointE1HxCoord, _precomputed.pointE1HyCoord));
// Input validation: h*E1
require(Numerology.is_on_curve(_precomputed.pointE1HxCoord, _precomputed.pointE1HyCoord),
"Point h*E1 is not a valid EC point"
);
bool rhs_element_is_correct = Numerology.ecmulVerify(
_cFrag.pointE1.xCoord, // E1_x
_precomputed.pointE1yCoord, // E1_y
@ -251,12 +261,13 @@ contract MiningAdjudicator is Upgradeable {
_precomputed.pointE1HyCoord // hE1_y
);
// Input validation: E_2
// Input validation: E2
require(Numerology.check_compressed_point(
_cFrag.proof.pointE2.sign, // E2_sign
_cFrag.proof.pointE2.xCoord, // E2_x
_precomputed.pointE2yCoord // E2_y
));
_precomputed.pointE2yCoord), // E2_y
"Precomputed Y coordinate of E2 doesn't correspond to compressed E2 point"
);
bool equation_holds = Numerology.eqAffineJacobian(
[_precomputed.pointEZxCoord, _precomputed.pointEZyCoord],
@ -278,11 +289,14 @@ contract MiningAdjudicator is Upgradeable {
require(Numerology.check_compressed_point(
_capsule.pointV.sign,
_capsule.pointV.xCoord,
_precomputed.pointVyCoord
));
_precomputed.pointVyCoord),
"Precomputed Y coordinate of V doesn't correspond to compressed V point"
);
// Input validation: z*V
require(Numerology.is_on_curve(_precomputed.pointVZxCoord, _precomputed.pointVZyCoord));
require(Numerology.is_on_curve(_precomputed.pointVZxCoord, _precomputed.pointVZyCoord),
"Point zV is not a valid EC point"
);
left_hand_element_is_correct = Numerology.ecmulVerify(
_capsule.pointV.xCoord, // V_x
_precomputed.pointVyCoord, // V_y
@ -293,13 +307,16 @@ contract MiningAdjudicator is Upgradeable {
// Input validation: V1
require(Numerology.check_compressed_point(
_cFrag.pointV1.sign, // V1_sign
_cFrag.pointV1.xCoord, // V1_x
_precomputed.pointV1yCoord // V1_y
));
_cFrag.pointV1.sign, // V1_sign
_cFrag.pointV1.xCoord, // V1_x
_precomputed.pointV1yCoord), // V1_y
"Precomputed Y coordinate of V1 doesn't correspond to compressed V1 point"
);
// Input validation: h*V_1
require(Numerology.is_on_curve(_precomputed.pointV1HxCoord, _precomputed.pointV1HyCoord));
// Input validation: h*V1
require(Numerology.is_on_curve(_precomputed.pointV1HxCoord, _precomputed.pointV1HyCoord),
"Point h*V1 is not a valid EC point"
);
rhs_element_is_correct = Numerology.ecmulVerify(
_cFrag.pointV1.xCoord, // V1_x
_precomputed.pointV1yCoord, // V1_y
@ -308,12 +325,13 @@ contract MiningAdjudicator is Upgradeable {
_precomputed.pointV1HyCoord // h*V1_y
);
// Input validation: V_2
// Input validation: V2
require(Numerology.check_compressed_point(
_cFrag.proof.pointV2.sign, // V2_sign
_cFrag.proof.pointV2.xCoord, // V2_x
_precomputed.pointV2yCoord // V2_y
));
_precomputed.pointV2yCoord), // V2_y
"Precomputed Y coordinate of V2 doesn't correspond to compressed V2 point"
);
equation_holds = Numerology.eqAffineJacobian(
[_precomputed.pointVZxCoord, _precomputed.pointVZyCoord],
@ -334,7 +352,9 @@ contract MiningAdjudicator is Upgradeable {
// We don't have to validate U since it's fixed and hard-coded
// Input validation: z*U
require(Numerology.is_on_curve(_precomputed.pointUZxCoord, _precomputed.pointUZyCoord));
require(Numerology.is_on_curve(_precomputed.pointUZxCoord, _precomputed.pointUZyCoord),
"Point z*U is not a valid EC point"
);
left_hand_element_is_correct = Numerology.ecmulVerify(
UMBRAL_PARAMETER_U_XCOORD, // U_x
UMBRAL_PARAMETER_U_YCOORD, // U_y
@ -343,15 +363,18 @@ contract MiningAdjudicator is Upgradeable {
_precomputed.pointUZyCoord // zU_y
);
// Input validation: U_1 (a.k.a. KFragCommitment)
// Input validation: U1 (a.k.a. KFragCommitment)
require(Numerology.check_compressed_point(
_cFrag.proof.pointKFragCommitment.sign, // U1_sign
_cFrag.proof.pointKFragCommitment.xCoord, // U1_x
_precomputed.pointU1yCoord // U1_y
));
_precomputed.pointU1yCoord), // U1_y
"Precomputed Y coordinate of U1 doesn't correspond to compressed U1 point"
);
// Input validation: h*U_1
require(Numerology.is_on_curve(_precomputed.pointU1HxCoord, _precomputed.pointU1HyCoord));
// Input validation: h*U1
require(Numerology.is_on_curve(_precomputed.pointU1HxCoord, _precomputed.pointU1HyCoord),
"Point h*U1 is not a valid EC point"
);
rhs_element_is_correct = Numerology.ecmulVerify(
_cFrag.proof.pointKFragCommitment.xCoord, // U1_x
_precomputed.pointU1yCoord, // U1_y
@ -360,12 +383,13 @@ contract MiningAdjudicator is Upgradeable {
_precomputed.pointU1HyCoord // h*V1_y
);
// Input validation: U_2 (a.k.a. KFragPok ("proof of knowledge"))
// Input validation: U2 (a.k.a. KFragPok ("proof of knowledge"))
require(Numerology.check_compressed_point(
_cFrag.proof.pointKFragPok.sign, // U2_sign
_cFrag.proof.pointKFragPok.xCoord, // U2_x
_precomputed.pointU2yCoord // U2_y
));
_precomputed.pointU2yCoord), // U2_y
"Precomputed Y coordinate of U2 doesn't correspond to compressed U2 point"
);
equation_holds = Numerology.eqAffineJacobian(
[_precomputed.pointUZxCoord, _precomputed.pointUZyCoord],
@ -434,6 +458,7 @@ contract MiningAdjudicator is Upgradeable {
}
// TODO: Consider changing to internal
// TODO: Unit test wrt to Umbral implementation
function extendedKeccakToBN (bytes memory _data) public pure returns (uint256) {
bytes32 upper;

3
tests/blockchain/eth/contracts/main/miners_escrow/conftest.py
View File

@ -40,8 +40,9 @@ def token(testerchain):
def escrow_contract(testerchain, token, request):
def make_escrow(max_allowed_locked_tokens):
# Creator deploys the escrow
_mining_coefficient = 2 * 10 ** 7
contract, _ = testerchain.interface.deploy_contract(
'MinersEscrow', token.address, 1, 4 * 2 * 10 ** 7, 4, 4, 2, 100, max_allowed_locked_tokens)
'MinersEscrow', token.address, 1, 4 * _mining_coefficient, 4, 4, 2, 100, max_allowed_locked_tokens)
if request.param:
secret_hash = testerchain.interface.w3.keccak(secret)