-
Notifications
You must be signed in to change notification settings - Fork 156
Update Random #783
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Update Random #783
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,27 +7,294 @@ struct RANDOM2 | |
| struct RANDOM : public ContractBase | ||
| { | ||
| public: | ||
| struct StateData | ||
| struct RevealAndCommit_input | ||
| { | ||
| uint64 _earnedAmount; | ||
| uint64 _distributedAmount; | ||
| uint64 _burnedAmount; | ||
| bit_4096 reveal; | ||
| id commit; | ||
| }; | ||
|
|
||
| uint32 _bitFee; // Amount of qus | ||
| struct RevealAndCommit_output | ||
| { | ||
| }; | ||
|
|
||
| struct RevealAndCommit_input | ||
| struct RevealAndCommit_locals | ||
| { | ||
| bit_4096 revealedBits; | ||
| id committedDigest; | ||
| bit_4096 zeroReveal; // TODO: Use a constant from either QPI or global state | ||
| uint32 stream; | ||
| uint32 collateralTier; | ||
| uint32 i; | ||
| }; | ||
| struct RevealAndCommit_output | ||
|
|
||
| struct StateData | ||
| { | ||
| uint64 earnedAmount; | ||
| uint64 distributedAmount; | ||
| uint64 burnedAmount; | ||
|
|
||
| uint32 bitFee; // Amount of qus | ||
|
|
||
| Array<uint32, 4> populations; // 3 | ||
| Array<id, 4096> providers; // 3 * 1365 | ||
| Array<uint64, 4096> collateralTiers; // 3 * 1365 | ||
| Array<id, 4096> commits; // 3 * 1365 | ||
| Array<bit_4096, 4096> reveals; // 3 * 1365 | ||
| bit_4096 revealOrCommitFlags; // 3 * 1365 | ||
| Array<bit_4096, 32> entropy; // 3 * 10 | ||
| }; | ||
|
|
||
| private: | ||
| PUBLIC_PROCEDURE_WITH_LOCALS(RevealAndCommit) | ||
| { | ||
| // TODO: Reject transactions from smart contracts! | ||
|
|
||
| switch (qpi.invocationReward()) | ||
| { | ||
| case 1: locals.collateralTier = 0; break; | ||
|
|
||
| case 10: locals.collateralTier = 1; break; | ||
|
|
||
| case 100: locals.collateralTier = 2; break; | ||
|
|
||
| case 1000: locals.collateralTier = 3; break; | ||
|
|
||
| case 10000: locals.collateralTier = 4; break; | ||
|
|
||
| case 100000: locals.collateralTier = 5; break; | ||
|
|
||
| case 1000000: locals.collateralTier = 6; break; | ||
|
|
||
| case 10000000: locals.collateralTier = 7; break; | ||
|
|
||
| case 100000000: locals.collateralTier = 8; break; | ||
|
|
||
| case 1000000000: locals.collateralTier = 9; break; | ||
|
|
||
| default: qpi.transfer(qpi.invocator(), qpi.invocationReward()); return; | ||
| } | ||
|
|
||
| locals.stream = mod<uint32>(qpi.tick(), 3); | ||
|
|
||
| if (input.reveal != locals.zeroReveal) // Don't need to initialize [locals.zeroReveal] because | ||
| // locals struct has been zeroed (bad practice, but | ||
| // it's for spreading awareness about this nuance) | ||
| { | ||
| for (; locals.i < state.get().populations.get(locals.stream); locals.i++) // Don't need to initialize [locals.i] because locals | ||
| // struct has been zeroed (bad practice, but it's for | ||
| // spreading awareness about this nuance) | ||
| { | ||
| if (qpi.invocator() == state.get().providers.get(locals.stream * 1365 + locals.i) && | ||
| locals.collateralTier == state.get().collateralTiers.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| break; | ||
| } | ||
| } | ||
| if (locals.i == state.get().populations.get(locals.stream) || | ||
| state.get().reveals.get(locals.stream * 1365 + locals.i) != locals.zeroReveal || | ||
| qpi.K12(input.reveal) != state.get().commits.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| qpi.transfer(qpi.invocator(), qpi.invocationReward()); | ||
| return; | ||
| } | ||
|
|
||
| state.mut().reveals.set(locals.stream * 1365 + locals.i, input.reveal); | ||
| state.mut().revealOrCommitFlags.set(locals.stream * 1365 + locals.i, 1); | ||
| } | ||
|
|
||
| if (input.commit == id::zero()) | ||
| { | ||
| qpi.transfer(qpi.invocator(), qpi.invocationReward()); | ||
| return; | ||
| } | ||
|
|
||
| for (locals.i = 0; locals.i < state.get().populations.get(locals.stream); locals.i++) | ||
| { | ||
| if (qpi.invocator() == state.get().providers.get(locals.stream * 1365 + locals.i) && | ||
| locals.collateralTier == state.get().collateralTiers.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| break; | ||
| } | ||
| } | ||
| if (locals.i == state.get().populations.get(locals.stream)) | ||
| { | ||
| if (locals.i == 1365) | ||
| { | ||
| qpi.transfer(qpi.invocator(), qpi.invocationReward()); | ||
| return; | ||
| } | ||
|
|
||
| state.mut().providers.set(locals.stream * 1365 + locals.i, qpi.invocator()); | ||
| state.mut().collateralTiers.set(locals.stream * 1365 + locals.i, locals.collateralTier); | ||
| state.mut().populations.set(locals.stream, locals.i + 1); | ||
| } | ||
| else | ||
| { | ||
| if (state.get().reveals.get(locals.stream * 1365 + locals.i) == locals.zeroReveal) | ||
| { | ||
| qpi.transfer(qpi.invocator(), qpi.invocationReward()); | ||
| return; | ||
| } | ||
| } | ||
| state.mut().commits.set(locals.stream * 1365 + locals.i, input.commit); | ||
| state.mut().revealOrCommitFlags.set(locals.stream * 1365 + locals.i, 1); | ||
| } | ||
|
|
||
| struct END_TICK_locals | ||
| { | ||
| bit_4096 zeroReveal; // TODO: Use a constant from either QPI or global state | ||
| bit_4096 entropy; | ||
| id collateralRecipient; | ||
| uint32 stream; | ||
| uint32 i, j; | ||
| uint16 collateralTierFlags; | ||
| }; | ||
|
|
||
| PUBLIC_PROCEDURE(RevealAndCommit) | ||
| END_TICK_WITH_LOCALS() | ||
| { | ||
| qpi.transfer(qpi.invocator(), qpi.invocationReward()); | ||
| locals.stream = mod<uint32>(qpi.tick(), 3); | ||
|
|
||
| for (; locals.i < 10; locals.i++) // Don't need to initialize [locals.i] because locals | ||
| // struct has been zeroed (bad practice, but it's for | ||
| // spreading awareness about this nuance) | ||
| { | ||
| state.mut().entropy.set(locals.stream * 10 + locals.i, | ||
| locals.zeroReveal); // Don't need to initialize [locals.zeroReveal] | ||
| // because locals struct has been zeroed (bad | ||
| // practice, but it's for spreading awareness | ||
| // about this nuance) | ||
| } | ||
|
|
||
| for (locals.i = 0; locals.i < state.get().populations.get(locals.stream); locals.i++) | ||
| { | ||
| if (state.get().revealOrCommitFlags.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| break; | ||
| } | ||
| } | ||
| if (locals.i == state.get().populations.get(locals.stream)) // Nobody provided their reveal, that | ||
| // tick was probably empty | ||
| { | ||
| while (locals.i--) | ||
| { | ||
| switch (state.get().collateralTiers.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| case 0: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 1); break; | ||
|
|
||
| case 1: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 10); break; | ||
|
|
||
| case 2: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 100); break; | ||
|
|
||
| case 3: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 1000); break; | ||
|
|
||
| case 4: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 10000); break; | ||
|
|
||
| case 5: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 100000); break; | ||
|
|
||
| case 6: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 1000000); break; | ||
|
|
||
| case 7: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 10000000); break; | ||
|
|
||
| case 8: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 100000000); break; | ||
|
|
||
| default: qpi.transfer(state.get().providers.get(locals.stream * 1365 + locals.i), 1000000000); | ||
| } | ||
| state.mut().providers.set(locals.stream * 1365 + locals.i, id::zero()); | ||
| state.mut().collateralTiers.set(locals.stream * 1365 + locals.i, 0); | ||
| // Don't need to zero [state.reveals], they are all-zeros anyway | ||
| state.mut().commits.set(locals.stream * 1365 + locals.i, id::zero()); | ||
| } | ||
| state.mut().populations.set(locals.stream, 0); | ||
| } | ||
| else | ||
| { | ||
| // Don't need to initialize [locals.collateralTierFlags] because locals | ||
| // struct has been zeroed (bad practice, but it's for spreading awareness | ||
| // about this nuance) | ||
|
|
||
| for (locals.i = state.get().populations.get(locals.stream); locals.i--;) | ||
| { | ||
| if (state.get().revealOrCommitFlags.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| locals.collateralRecipient = state.get().providers.get(locals.stream * 1365 + locals.i); | ||
| } | ||
| else | ||
| { | ||
| locals.collateralRecipient = id::zero(); | ||
| } | ||
|
|
||
| switch (state.get().collateralTiers.get(locals.stream * 1365 + locals.i)) | ||
| { | ||
| case 0: qpi.transfer(locals.collateralRecipient, 1); break; | ||
|
|
||
| case 1: qpi.transfer(locals.collateralRecipient, 10); break; | ||
|
|
||
| case 2: qpi.transfer(locals.collateralRecipient, 100); break; | ||
|
|
||
| case 3: qpi.transfer(locals.collateralRecipient, 1000); break; | ||
|
|
||
| case 4: qpi.transfer(locals.collateralRecipient, 10000); break; | ||
|
|
||
| case 5: qpi.transfer(locals.collateralRecipient, 100000); break; | ||
|
|
||
| case 6: qpi.transfer(locals.collateralRecipient, 1000000); break; | ||
|
|
||
| case 7: qpi.transfer(locals.collateralRecipient, 10000000); break; | ||
|
|
||
| case 8: qpi.transfer(locals.collateralRecipient, 100000000); break; | ||
|
|
||
| default: qpi.transfer(locals.collateralRecipient, 1000000000); | ||
| } | ||
|
|
||
| if (locals.collateralRecipient == id::zero()) | ||
| { | ||
| locals.collateralTierFlags |= (1 << state.get().collateralTiers.get(locals.stream * 1365 + locals.i)); | ||
|
|
||
| state.mut().providers.set(locals.stream * 1365 + locals.i, | ||
| state.get().providers.get(locals.stream * 1365 + state.get().populations.get(locals.stream))); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not sure about the logic here and many places in the code, we access
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. --CFB: |
||
| state.mut().providers.set(locals.stream * 1365 + state.get().populations.get(locals.stream), id::zero()); | ||
|
|
||
| state.mut().collateralTiers.set( | ||
| locals.stream * 1365 + locals.i, | ||
| state.get().collateralTiers.get(locals.stream * 1365 + state.get().populations.get(locals.stream))); | ||
| state.mut().collateralTiers.set(locals.stream * 1365 + state.get().populations.get(locals.stream), 0); | ||
|
|
||
| state.mut().reveals.set(locals.stream * 1365 + locals.i, | ||
| state.get().reveals.get(locals.stream * 1365 + state.get().populations.get(locals.stream))); | ||
| state.mut().reveals.set(locals.stream * 1365 + state.get().populations.get(locals.stream), locals.zeroReveal); | ||
|
|
||
| state.mut().commits.set(locals.stream * 1365 + locals.i, | ||
| state.get().commits.get(locals.stream * 1365 + state.get().populations.get(locals.stream))); | ||
| state.mut().commits.set(locals.stream * 1365 + state.get().populations.get(locals.stream), id::zero()); | ||
|
|
||
| state.mut().populations.set(locals.stream, state.get().populations.get(locals.stream) - 1); | ||
| } | ||
| else | ||
| { | ||
| if (!(locals.collateralTierFlags & (1 << state.get().collateralTiers.get(locals.stream * 1365 + locals.i)))) | ||
| { | ||
| locals.entropy = | ||
| state.get().entropy.get(locals.stream * 10 + state.get().collateralTiers.get(locals.stream * 1365 + locals.i)); | ||
| for (locals.j = 0; locals.j < 4096; locals.j++) | ||
| { | ||
| locals.entropy.set(locals.j, | ||
| locals.entropy.get(locals.j) ^ state.get().reveals.get(locals.stream * 1365 + locals.i).get(locals.j)); | ||
| } | ||
| state.mut().entropy.set(locals.stream * 10 + state.get().collateralTiers.get(locals.stream * 1365 + locals.i), | ||
| locals.entropy); | ||
| state.mut().reveals.set(locals.stream * 1365 + locals.i, locals.zeroReveal); | ||
| } | ||
| } | ||
|
|
||
| state.mut().revealOrCommitFlags.set(locals.stream * 1365 + locals.i, 0); | ||
| } | ||
|
|
||
| for (locals.i = 0; locals.i < 10; locals.i++) | ||
| { | ||
| if (locals.collateralTierFlags & (1 << locals.i)) | ||
| { | ||
| state.mut().entropy.set(locals.stream * 10 + locals.i, locals.zeroReveal); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| REGISTER_USER_FUNCTIONS_AND_PROCEDURES() | ||
|
|
@@ -37,6 +304,6 @@ struct RANDOM : public ContractBase | |
|
|
||
| INITIALIZE() | ||
| { | ||
| state.mut()._bitFee = 1000; | ||
| state.mut().bitFee = 1000; | ||
| } | ||
| }; | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you are not using the fee and these amounts anywhere in the code
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--CFB: SC isn't finished, only half of it is coded to test in isolation, hence earnedAmount isn't touched