vzotova
f69e23864a
WorkLock: tokens splitted into base part (min stake) and bonus part
2020-03-14 12:00:24 +03:00
vzotova
fde134a398
Apply suggestions from code review #1732
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
2020-03-13 23:01:01 +03:00
vzotova
18bffc15c1
WorkLock: method to cancel distribution when not enough bidders
2020-03-13 22:59:05 +03:00
vzotova
38ddc5e591
WorkLock: force refund at CLI, actor, agent layers
2020-03-13 22:57:39 +03:00
vzotova
0bd4cd98ca
WorkLock: force refund to whales
2020-03-13 22:47:04 +03:00
vzotova
41cbd542ee
WorkLock: small refactoring of methods and tests
2020-03-13 22:31:38 +03:00
vzotova
8571f220f4
StakingEscrow: reorganize tests for max/min allowed locked tokens
2020-03-13 21:51:07 +03:00
vzotova
bc618284af
WorkLock: checking all bids to prevent exceeding max allowable stake
2020-03-13 21:51:06 +03:00
vzotova
db6dea77f3
WorkLock: tracking all bidders
2020-03-13 21:51:06 +03:00
vzotova
a2deca9eb8
WorkLock: cancellation window
2020-03-13 21:51:05 +03:00
vzotova
5c719dd1a9
New constraints in WorkLock: minimum allowed bid, cancellation only during bidding, removed unclaimed tokens
2020-03-13 21:51:04 +03:00
vzotova
a8f0ab3eee
WorkLock: improve ABI: extracted calculating available refund
2020-03-13 21:50:35 +03:00
K Prasch
ab978c09be
Merge pull request #1759 from KPrasch/configurate
...
Offline Configuration Selection
2020-03-13 10:56:05 -07:00
Kieran Prasch
489c048712
KeyStore -> Datastore
2020-03-09 14:50:18 -07:00
damon
457151635a
add test hooks and test for expiring cfrags working
2020-03-09 13:45:26 -07:00
Kieran R. Prasch
4b82f6261f
Forging a test for auto arrangement pruning with a twisted clock.
2020-03-09 13:45:26 -07:00
Kieran Prasch
eb32902704
Keep missing configuration tests passing; Always use mocked registry source.
2020-03-05 10:02:20 -08:00
Kieran Prasch
cf1ca2093f
Interactive network selection; Touch ups.
2020-03-03 09:17:09 -08:00
Kieran R. Prasch
7e5cd1c42c
Adding configurable gas strategy to Alice/Bob; Work around for embedded JSON IPC emitters.
2020-02-27 15:44:41 -07:00
David Núñez
7e1dec2950
Merge pull request #1662 from vzotova/rate-range
...
[DO NOT MERGE YET] Reward rate range
2020-02-27 12:05:03 -08:00
David Núñez
0dcdf51fc8
Merge pull request #1738 from cygnusv/activate-network
...
Allow to deploy a network in idle mode. Activate later
2020-02-26 15:40:38 -08:00
tuxxy
87534a944d
Handle InvalidSignature and add to suspicious activities and log the offense
2020-02-25 05:33:05 +01:00
tuxxy
8b2ac8106d
Learn from a teacher who provides improperly signed payloads
2020-02-25 03:09:22 +01:00
David Núñez
c63c754c89
Test showing how a manual deployment of an idle network is done
2020-02-24 15:29:11 -08:00
David Núñez
db85663e05
Use new deployer mode everywhere else
2020-02-24 11:37:32 -08:00
Kieran R. Prasch
891dd04d2a
Cleanup: No need to pass --staker-address. Support get_worker_config_in_tests.
2020-02-23 19:20:17 -07:00
Kieran R. Prasch
f858ede235
Setup optional bonding timeout and settable poll rate for Workers.
2020-02-23 19:20:17 -07:00
Kieran R. Prasch
728793b24a
Monkeypatch registry source fetching in CLI reconfiguration tests.
2020-02-23 19:20:17 -07:00
tuxxy
0a0a083f62
Going a different direction, make block_until_bonded a staticmethod for Worker init
2020-02-23 19:20:17 -07:00
tuxxy
44739108c6
Add worker_is_bonded static method and include in worker tests
2020-02-23 19:20:17 -07:00
David Núñez
4fb7d0efa4
Show how to activate StakingEscrow using its deployer
2020-02-23 09:00:58 -08:00
David Núñez
aaf9f32734
Trying to stake when network is idle should fail
2020-02-23 08:28:36 -08:00
David Núñez
29ba116e42
Test for deploying network contracts with StakingEscrow in idle state
2020-02-22 17:11:55 -08:00
David Núñez
e55ccf2341
More general deployment modes: Meet Bare, Idle and Full
...
Idle = Deploy contract in 'idle' state, without activation
2020-02-22 17:11:55 -08:00
David Núñez
5968b519d8
Clean and simplify some deployers logic
2020-02-22 17:11:55 -08:00
vzotova
0dd1f90c14
Apply suggestions from code review #1730
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
Co-Authored-By: K Prasch <kieran@nucypher.com>
2020-02-22 11:38:31 +03:00
vzotova
7a25f2ca0d
Fix #1726
2020-02-21 15:49:25 +03:00
vzotova
4188cc673f
Set min rate for a staker in actor, agent and CLI layers
2020-02-20 12:05:50 +03:00
vzotova
3816151cf9
Method for setting range of min reward rate in actors, deployers and CLI layers
2020-02-20 12:03:48 +03:00
vzotova
633b87ebfb
PolicyManager: min reward rate range
2020-02-20 12:03:48 +03:00
Kieran R. Prasch
bcbbec9016
Fixes missing bytes caster on CLI test.
2020-02-19 20:53:39 -07:00
Kieran R. Prasch
3f3386d360
Allow for forcible blockchain interface registration for tests.
2020-02-19 20:53:39 -07:00
jMyles
0a1d2a5282
Compatibility with changes to middleware and side channel fixture.
2020-02-16 18:42:09 -07:00
jMyles
18ce406bce
Pushing arrangement query down to new agent methods.
2020-02-16 17:47:25 -07:00
jMyles
dbcbc26cba
Test showing that paying the wrong nodes results in Ursula noticing and refusing to service the Policy.
2020-02-16 16:33:15 -07:00
jMyles
e7e26c5cc3
Moving freeriding attacks to their own module.
2020-02-16 12:29:10 -07:00
jMyles
ed56c78d74
Test showing the 'safeguards removed' variant of trying not to pay.
2020-02-16 11:06:10 -07:00
jMyles
624242d791
Don't need capsule side channel here anymore.
2020-02-15 19:47:09 -07:00
jMyles
cf07c3add6
Why wasn't blockchain side channel always compatible with the federated one?
2020-02-15 17:58:48 -07:00
jMyles
f0d7781ef5
Fixing up sinpa test to use Amonia.
2020-02-15 17:57:58 -07:00
David Núñez
0faff6f45a
Test demonstrating how Alice can do a "sinpa" (dine and dash)
...
Fake it till you make it
(This commit was modified by @jMyles to depict the attack in a separate test rather than modifying test_decentralized_grant in place.)
2020-02-14 12:26:39 -07:00
vzotova
9f13dc81d9
StakingEscrow: separate event for `prolongStake`
2020-02-13 23:16:08 +01:00
vzotova
030eda725f
Apply suggestions from code review #1652
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
2020-02-13 23:16:03 +01:00
vzotova
ab0bad144e
Small fixes for duration ranges in stake cli
2020-02-13 23:15:22 +01:00
vzotova
b26f3993eb
Fix for duration of sub-stake in case when winding down is disabled
2020-02-13 23:14:28 +01:00
vzotova
16757e32a2
Contracts: public -> external where possible
2020-02-13 23:14:28 +01:00
vzotova
546fc83b44
Rename _totalSupply to _totalSupplyOfTokens to prevent variables shadowing
2020-02-13 23:14:28 +01:00
Kieran R. Prasch
6f9e89d826
Cleanup grant lifecycle tests
2020-02-13 13:40:42 -07:00
Kieran Prasch
18be53f5a5
Tests backing up CLI inline config; worker IP envvar to support.
2020-02-13 13:40:42 -07:00
Kieran Prasch
eb916afa52
Special handling of Alice grant CLI options;
2020-02-13 13:40:42 -07:00
David Núñez
a91f0d26a2
Since we use agency_local_registry fixture now, remove registry mock in test_felix
...
Really closes #1346
2020-02-13 11:19:55 -07:00
David Núñez
4b161121c2
WorkLock deployment parameters for tests are hard-coded in token_economics fixture
...
TODO: do something better about it
2020-02-13 11:19:55 -07:00
David Núñez
de0ced9518
Fix problems with bidder initialization in WorkLock CLI
2020-02-13 11:19:55 -07:00
David Núñez
f5816de34b
Merge pull request #1672 from vzotova/fix-1671
...
Fixes bug in PolicyManager #1671
2020-02-13 14:08:04 +00:00
vzotova
9aa49f57f0
Ignoring broken state in `PolicyManager.rewardState` with possibility to fix it later
2020-02-11 21:48:16 +03:00
vzotova
b7098590e6
Reproduce scenario from #1671
2020-02-11 19:15:12 +03:00
vzotova
c17653b535
Restrict checks in `PolicyManager.register()` and `PolicyManager.createPolicy()` to prevent inconsistent state
2020-02-11 17:17:35 +03:00
damon c
d389e075e3
Merge pull request #1330 from nucypher/birdcage
...
[EPIC] Birdcage: A PR for people who want to pretend to like Bob.
2020-02-10 15:34:46 -08:00
jMyles
90a3c26298
Finishing the layup for which @michwill set me up vis a vis TreasureMaps being passed through Bob's controller.
2020-02-10 13:09:15 -08:00
jMyles
4f8e266bf6
Use live message kit in spec test for forward compatibility.
2020-02-10 13:09:15 -08:00
jMyles
f164382164
Use live TreasureMap in spec test for forward compatibility.
2020-02-10 13:09:15 -08:00
jMyles
40f329db1b
Now that we're resetting the side channel in a fixture, each tests starts with the first message.
2020-02-10 13:09:15 -08:00
jMyles
6b6e07ec46
An empty or intentionally misleading TreasureMap warrants a more severe Exception than NotEnoughUrsulas: introducing TreasureMap.IsDisorienting
2020-02-10 13:09:15 -08:00
jMyles
fb2f03e307
Resetting side channel bewteen fixture runs so that message is unchanged.
2020-02-10 13:09:15 -08:00
jMyles
76e83cda50
Reducing scope of fixture. See: https://ptb.discordapp.com/channels/411401661714792449/411401661714792451/667904759956504577
2020-02-10 13:09:15 -08:00
jMyles
6490af67c8
Touch-ups around failing tests.
2020-02-10 13:09:15 -08:00
jMyles
3ce055561d
Test compatibility for unpacking message kits.
2020-02-10 13:09:15 -08:00
tuxxy
96aab3701f
Add JSON serialization methods to 'PolicyCredential'
2020-02-10 13:09:15 -08:00
tuxxy
32a95ffd71
Add 'credential' method on 'Policy' w/ consistency tests
2020-02-10 13:09:15 -08:00
Michael Egorov
16ad56c934
Fix merge conflicts
2020-02-08 04:27:34 -08:00
Michael Egorov
99681680d6
Check text returned by federated_bob.retrieve
2020-02-08 04:27:34 -08:00
Michael Egorov
c920cf44a5
Test treasure_map in character control
2020-02-08 04:27:34 -08:00
Michael Egorov
c70e8e2216
Bob.retrieve() accepting an optional treasure map works
2020-02-08 04:27:34 -08:00
Michael Egorov
f5c85e9c72
Test if Bob can decrypt with the treasure map (he can't yet)
2020-02-08 04:27:34 -08:00
jMyles
fe840cfd13
Test showing multiple messages from multiple Enricos in a single Adventure.
2020-02-08 04:27:34 -08:00
jMyles
04a96b54a2
Test showing failure of multiple-Capsule retrieval - see #1359 .
2020-02-08 04:27:34 -08:00
jMyles
f87eb322f9
Pausing console logging instead of stopping and starting.
2020-02-08 04:27:34 -08:00
jMyles
e73e1e5765
Temporarily ceasing console logging right before click invocation.
2020-02-08 04:27:34 -08:00
jMyles
bd679888d9
Adding logging around consecutive retrieval test.
2020-02-08 04:27:34 -08:00
jMyles
7a115f65f0
Logging statements around Bob patching.
2020-02-08 04:27:34 -08:00
jMyles
1e33857dd5
Battle of the mocks: another finally block.
2020-02-08 04:27:34 -08:00
jMyles
7ac8374c07
Passing ciphertext(s) as positional.
2020-02-08 04:27:34 -08:00
jMyles
0cdcc523b7
Re-patching LocalContractRegistry.read in a finally block. Fixes #1346 .
2020-02-08 04:27:31 -08:00
jMyles
ce86d7dd0f
capsule_side_channel() doesn't return the Enrico anymore; it's composed.
2020-02-08 01:18:51 -08:00
jMyles
bd49d39696
blockchain bob using new retrieve API.
2020-02-08 01:18:51 -08:00
jMyles
067369ed45
Various bugfixes and other accounting for changes since the cherry-picks below.
2020-02-08 01:18:51 -08:00
jMyles
c3ea0377e0
Have Bob retrieve again, just to be absolutely clear that it now works back-to-back by default.
2020-02-08 01:18:51 -08:00
jMyles
6c73075867
I don't like the sound of that.
2020-02-08 01:18:51 -08:00
jMyles
1a34a2a60a
New Bob CLI test to show retrieve().
2020-02-08 01:18:51 -08:00
jMyles
70952329c3
Unpacking message kits into retrieve().
2020-02-08 01:18:51 -08:00
jMyles
24ab7a6e4f
Test showing multiple-Enrico retrieve.
2020-02-08 01:18:51 -08:00
jMyles
dc202da06e
Include enrico instance when resetting capsule_side_channel for test convenience.
2020-02-08 01:18:51 -08:00
jMyles
447b9b6e5c
We don't need the temporary download_registry fix anymore.
2020-02-08 01:18:51 -08:00
jMyles
5f0c7ce5ef
Several test fixes, most notable including that, in the capsule_side_channel fixture, we now keep the same enrico until it is reset().
2020-02-08 01:18:51 -08:00
jMyles
da2d2a0be1
Showing multiple retrievals in network without retaining CFrags.
2020-02-08 01:18:50 -08:00
jMyles
3b9cb9212a
Better WorkOrder repr; updating tests to be more precise for replete WorkOrders.
2020-02-08 01:18:50 -08:00
jMyles
9acac0cb0d
Saving replete WorkOrders where appropriate.
2020-02-08 01:18:50 -08:00
jMyles
c4937b78bf
Introducing designation of a WorkOrder that is 'replete' with CFrags for each PRETask.
2020-02-08 01:18:50 -08:00
jMyles
74fa1803ab
Fixing up retrieve() params, adding type hints.
2020-02-08 01:18:50 -08:00
jMyles
404446b7ac
Removing the 'cache' conceptr from work_orders_for_capsule.
2020-02-08 01:18:50 -08:00
jMyles
305fffdbf6
Single-track for incomplete WorkOrders.
2020-02-08 01:18:50 -08:00
jMyles
1957507a09
Not saving pending WorkOrders anymore; only completed.
2020-02-08 01:18:50 -08:00
jMyles
c74f465e8d
Always include completed WorkOrders. (Though we'll remove this entirely soon.)
2020-02-08 01:18:50 -08:00
jMyles
f507952a14
Starting to separately store WorkOrders on Bob.
2020-02-08 01:18:50 -08:00
jMyles
55f96bdc38
Splitting the argument previously called 'cache' into three more coherent and granular parameters.
2020-02-08 01:18:50 -08:00
jMyles
677c8ddcfb
When generating WorkOrder, if CFrags are being retained, return two tuples of WorkOrders - one complete, the other incomplete. Also some refactoring.
2020-02-08 01:18:50 -08:00
jMyles
577dc0fe0a
Test showing complete flow of both Bob modes.
2020-02-08 01:18:50 -08:00
jMyles
7aab0c64c6
Test showing that Bob can't partially retrieve and then resume without caching.
2020-02-08 01:18:49 -08:00
jMyles
9aaf696fb5
Bob retrieves again!
2020-02-08 01:18:49 -08:00
jMyles
adba29ec1b
Affirmatively setting reuse_already_attached to False to show that this works the first time.
2020-02-08 01:18:49 -08:00
jMyles
630dec68c0
A test for Bob using a CFrag attached to a previously completed WorkOrder.
2020-02-08 01:18:49 -08:00
jMyles
78bad1cad1
Fixing up frag handling tests for new API.
2020-02-08 01:18:49 -08:00
jMyles
a0b5ea7393
Testing show successful second retrieval.
2020-02-08 01:18:49 -08:00
jMyles
83e44a63f2
Not necessarily generating new WorkOrders anymore; maybe looking them up. And they aren't necessarily 'generated' anymore; they're instead just known to be useful.
2020-02-08 01:18:49 -08:00
jMyles
0cb4f71709
Beginnings of a test; clearer logs.
2020-02-08 01:18:49 -08:00
Kieran R. Prasch
22ccdb4d68
Rebase touchups; bobkey spec bugfix.
2020-02-07 13:26:40 -08:00
David Núñez
c756b4ef14
Use new agency_local_registry fixture for CLI tests, and fix broken tests
...
Previously, we were supporting the consistency of our registry usage in a weird combination of fixtures' side-effects. Not anymore. CLI tests should use agency_local_registry, since it's a file-based mirror of the test_registry fixture when agency is assumed.
2020-02-07 11:28:34 +01:00
David Núñez
1356346533
Fix test for CLI multisig deployment. Remove unused registry fixture
2020-02-07 11:22:08 +01:00
David Núñez
2f090b3b44
First pass at CLI command to build upgrade TX via MultiSig: nucypher-deploy upgrade --multisig ...
2020-02-07 11:22:08 +01:00
David Núñez
554ce00923
First pass at deploying MultiSig contract with nucypher-deploy
...
* Adapting ContractAdministrator to additional, optional deployers (e.g, for MultiSig)
* Adds option --parameters to nucypher-deploy that allows to pass override arguments for contract deployment. Intended usage is MultiSig constructor arguments, but can be potentially used in other contracts (e.g., custom args to NuCypherToken).
* Tests for MultiSig deployment with the CLI
2020-02-07 11:22:08 +01:00
David Núñez
0058230c3d
Janitorial stuff
2020-02-07 11:22:08 +01:00
David Núñez
4aeb64486e
Touches to MultiSigDeployer and MultiSigAgent. Tests for both
2020-02-07 11:22:08 +01:00
David Núñez
88a365ac18
Obtain upgrading transactions for Dispatcher.upgrade()
...
Uses the new BlockhainInterface.build_transaction() endpoint to construct unsigned transactions.
The unsigned transactions in this commit are the raw data that is signed by MultiSig participates during a contract upgrade.
2020-02-07 11:22:08 +01:00
David Núñez
9a6a8be976
Touches to MultiSigAgent and MultiSig actors
2020-02-07 11:22:07 +01:00
David Núñez
b311430490
First pass on block confirmations at the BlockchainInterface layer - see #1194
2020-02-07 11:22:07 +01:00
damon
d656142974
field validation, tests, squashed
2020-02-06 03:23:19 -08:00
Kieran R. Prasch
a3ee748555
Accomodate the usage of --rate for granting via LCI specs; Post rebase cleanup.
2020-02-06 03:23:19 -08:00
damon
fcb9763959
handle kwargs based requests
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
2020-02-06 03:22:42 -08:00
damon
75a84ffad9
remove specifications mappings
...
remove specifications references
remove bad idea
2020-02-06 03:22:06 -08:00
damon
44ce4b475f
move nucypher command decorator to CharacterPublicInterface
...
fix rpc_control_blockchain test
2020-02-06 03:21:59 -08:00
Kieran R. Prasch
71a7fc7a1c
Passing RPCController tests
2020-02-06 03:21:59 -08:00
Kieran R. Prasch
763e295299
Deprecates character control decorator in favor of new command specification API (successful policy creation by RPC controller)
2020-02-06 03:21:59 -08:00
Kieran R. Prasch
d34e6df0b6
Aiming to unify command specifications, controllers, validations, serilaizers with schema modeling (Needs adiitional follow up).
2020-02-06 03:21:59 -08:00
damon
c9f0d6c540
fix failing test on invalid rpc input
...
handle TypeError in invalid RPC input
2020-02-06 03:20:50 -08:00
damon
865b547ce3
more detailed validation test
2020-02-05 11:21:33 -08:00
damon
e5688bdb42
update specification validation test with new exception
2020-02-05 11:21:33 -08:00
damon
e26bb7a6cf
all alice control refactored, tests working
2020-02-05 11:21:33 -08:00
damon
52551da5da
initial specifications refactor commit
2020-02-05 11:21:33 -08:00
K Prasch
cd1466883e
Merge pull request #1645 from KPrasch/missing-worklock
...
Fixes #1644 ; Economics without Worklock enrollment
2020-02-03 13:01:56 -08:00
Kieran R. Prasch
59f369cd6b
Expand worklock deployment test to cover economics instantiation before deployment.
2020-02-01 13:11:45 -08:00
Kieran R. Prasch
6081e2f2f7
Include basic html and json rendering tests.
2020-01-31 20:09:21 -08:00
Kieran R. Prasch
9554eb45a6
Implement ethSupply, Renames and Tweaks with @vzotova
2020-01-30 17:19:06 -08:00
Kieran R. Prasch
ec78da448e
Expose more worklock methods on agency; Adjust claim requirements.; CLI warning for small bids.
2020-01-30 14:18:18 -08:00
Kieran R. Prasch
a720070c75
Adjust Bidder tests for new requirements; Use blocktime as reference.
2020-01-30 11:57:11 -08:00
Kieran Prasch
c8c8b7d552
Respond to RFCs in PR #1550 ; Touch ups
2020-01-30 10:27:29 -08:00
Kieran Prasch
f0ac200cb7
Detailing the higher level functionality of Bidder.
2020-01-30 10:27:29 -08:00
Kieran Prasch
db899e8452
Relocate worklock with the rest of the cli commands
2020-01-30 10:27:29 -08:00
Kieran Prasch
a6ca5cbd6f
Respond to RFCs in PR #1550
2020-01-30 10:27:29 -08:00
Kieran Prasch
bbcb9e649c
Updates worklock API to work-based unlock without allocation deployments.
2020-01-30 10:27:29 -08:00
Kieran Prasch
bb55ac05d7
Alternate suggestion for worklock claim; Fix import in estimate gas
2020-01-30 10:27:29 -08:00
Kieran Prasch
df4de9d0c6
Support worklock bid cancellation via CLI - Clean up outstanding TODOs
2020-01-30 10:27:29 -08:00
Kieran Prasch
b403b291de
Passing worklock CLI tests: baseline, Test showing single contract deployment (sneaking in seeder as a plceholder for worklock without params ready).
2020-01-30 10:27:29 -08:00
Kieran Prasch
5570d20df5
Unblocked by dnunez - Init stake via worklock allocation and ind. registry.
2020-01-30 10:27:29 -08:00
Kieran Prasch
cc9b000fa3
Tightening worklock CLI assertions based on the layer below. Blocked by inability to set-worker to worklock allocation.
2020-01-30 10:27:29 -08:00
Kieran Prasch
657bc0b9a5
Third pass on Worklock CLI under new design\ patterns
2020-01-30 10:27:29 -08:00
Kieran Prasch
606c15493a
Tearing up worklock CLI for compadability with the latest implementations
2020-01-30 10:27:29 -08:00
Kieran Prasch
355d7ff887
Deprecates TestEconomics; Adds worklock supply and funding management - Extracts statistical methods to worklock agent.
2020-01-30 10:27:29 -08:00
Kieran Prasch
b2bf0f487d
Live coding with vicky!
2020-01-30 10:27:29 -08:00
Kieran R. Prasch
fc45282964
Additional tests to cover worklock bid reading and test registry management for worklock agent test module
2020-01-30 10:27:29 -08:00
Kieran R. Prasch
5359ca9aec
Trying to use deterministic preallocation address generation via worklock in tests.
2020-01-30 10:27:29 -08:00
Kieran R. Prasch
4652daa176
Reconstruction of worklock CLI tests (without consideration for preallocations)
2020-01-30 10:27:29 -08:00
Kieran R. Prasch
5ac52b1271
Integrating the worklock deployer with the rest of em'
2020-01-30 10:27:29 -08:00
Kieran R. Prasch
ffd290cb59
Cherry-picking version 1 of the worklock CLI.
2020-01-30 10:26:37 -08:00
Kieran R. Prasch
ae0b1d1734
Adds new contract function agency for worklock: refunds, cancellation, tests to match.
2020-01-30 10:26:37 -08:00
Kieran R. Prasch
717a84afd4
Incorporating new worklock contract functions into agents, deployers, and economics.
2020-01-30 10:26:37 -08:00
Kieran R. Prasch
82dbfcfe89
First steps to integrate worklock deployment params via economics
2020-01-30 10:26:37 -08:00
Kieran Prasch
5c3c6a00e8
Properly bond worklock to staking escrow at deploy-time.
2020-01-30 10:26:37 -08:00
Kieran Prasch
1fe806bc57
Expand deployment class registry to include aux. contracts, Include single contract deployment CLI integration test based on WorkLock.
2020-01-30 10:26:37 -08:00
Kieran Prasch
cff807eaff
Bidding agent tests.
2020-01-30 10:26:37 -08:00
Kieran R. Prasch
e21a2da6c1
funding method for worklock deployer
2020-01-30 10:26:37 -08:00
Kieran Prasch
496f73680a
Carving out worklock agent tests.
2020-01-30 10:26:37 -08:00
Kieran Prasch
cdc8696855
Baseline Worklock deployer tests.
2020-01-30 10:26:37 -08:00
David Núñez
6d3db88a2d
Merge pull request #1627 from vzotova/force-solidity-version
...
Single version of solidity compiler
2020-01-30 18:18:34 +00:00
vzotova
f4c2c4c668
solc bash installation script -> python script, to use solc version from the code
2020-01-29 17:01:11 +03:00
K Prasch
a28584d63d
Merge pull request #1611 from cygnusv/fixes
...
Small fixes to grant: input validation, correct formatting of stakers' data from StakingEscrow
2020-01-25 15:24:49 -08:00
David Núñez
6d7c2abf13
Some input validation to `nucypher alice grant`
2020-01-24 12:07:26 +01:00
Kieran Prasch
46ab992c35
Allow seperate nucypher vs provider password for Felix
2020-01-23 11:44:24 -08:00
David Núñez
c590538bbd
Move "public" environment variables to `nucypher.config.constants`
2020-01-21 13:53:11 +01:00
David Núñez
f1daae2463
Relocate NetworksInventory to nucypher.blockchain.eth.networks
2020-01-19 23:20:11 +01:00
David Núñez
3da6bdf087
Don't set globally a default domain in tests
...
Otherwise, tests are not modeling real behavior, where we don't have a default.
2020-01-19 19:58:38 +01:00
David Núñez
637a750b94
Make this test resistant to environments where the password envvar exists
2020-01-19 02:59:14 +01:00
David Núñez
4ca3ffe6de
Adapt `nucypher stake` logic to inclusion of --network option
2020-01-19 02:59:14 +01:00
David Núñez
b802af8223
A RegistrySourceManager for tests that only uses a tailored MockRegistrySource
...
It assumes that the only valid network is TEMPORARY_DOMAIN
2020-01-19 02:59:14 +01:00
David Núñez
0a64d09505
This test destroyed my local alice config file (╬ Ò ‸ Ó)
2020-01-19 02:59:14 +01:00
David Núñez
fe55ffc42c
Preoperative marking before replantation surgery
...
We want to connect learning to "registry" domains
2020-01-18 19:40:19 +01:00
Kieran Prasch
0db9f719cf
adjustments to wind down aagency test to acommodate prolong test.
2020-01-16 11:16:47 -08:00
Kieran Prasch
d4cc1bd3c7
Code formatting suggestions; Ensure action period happens early
2020-01-15 11:48:53 -08:00
Kieran Prasch
923b2deb98
Prolong stake API and CLI entry; Deprecate Felix template and landing page
2020-01-15 11:48:53 -08:00
Kieran Prasch
c28d5892bb
Introduces prolong stake agency and test
2020-01-15 11:48:53 -08:00
vzotova
06c588476f
Fix after rebasing
2020-01-15 12:09:00 +03:00
vzotova
1cf543f0f1
Wind-down parameter for cli
2020-01-15 12:08:59 +03:00
vzotova
5648f41af7
Wind-down parameter for actors
2020-01-15 12:08:59 +03:00
vzotova
09e37375fe
Wind-down parameter for agents
2020-01-15 12:08:58 +03:00
vzotova
6c5ef32aa2
Tests for wind-down parameter, wind-down parameter in PreallocationEscrow
2020-01-15 12:08:57 +03:00
vzotova
a945c21ad3
Minor rename in test_intercontract_integration.py
2020-01-14 16:59:54 +03:00
vzotova
b2d27046dd
WorkLock: time-based lock -> stake-based lock, claim() locks token in StakingEscrow
2020-01-14 16:56:20 +03:00
derekpierre
fe1a6c8fe4
The recommendation provided after detecting a missing configuration file was incorrect for the StakeHolder configuration.
...
Fix incorrect message for missing configuration file when default configuration file not found
2020-01-10 16:04:44 -05:00
David Núñez
345a09e2f8
Merge pull request #1459 from vzotova/policy
...
Policy refactoring
2020-01-10 10:42:33 +00:00
Victoria
35a0dd5528
Apply suggestions from code review #1459
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
Co-Authored-By: David Núñez <david@nucypher.com>
2020-01-10 13:14:04 +03:00
vzotova
bd7d5ac43a
Fix for test_sampling_distribution
2020-01-10 13:14:04 +03:00
vzotova
3fd751b638
PolicyManager: revocation using owner's signature
2020-01-10 13:14:03 +03:00
vzotova
d0396ac86c
PolicyManager: split creator role into creator and owner
2020-01-10 13:14:02 +03:00
vzotova
5fa515d295
Moved some gas spending from createPolicy to confimrAcivity
2020-01-10 13:14:02 +03:00
vzotova
5acb9abf76
PolicyManager: fix reentrancy test and small optimizations
2020-01-10 13:14:02 +03:00
vzotova
2e94f2cc02
Update estimate_gas script for new start/end policy time
2020-01-10 13:14:01 +03:00
vzotova
3f888c8b51
Fix cli tests with policy creation
2020-01-10 13:14:01 +03:00
vzotova
4c983fc045
Update character layer for new start/end policy time
2020-01-10 13:14:00 +03:00
vzotova
513c5a491d
Agent tests for start/end policy time
2020-01-10 13:13:20 +03:00
vzotova
24d56a03cc
Inter contract test for new start/end policy time
2020-01-10 13:13:19 +03:00
vzotova
8a4f079087
Tests for new policy start/end timestamp
2020-01-10 13:13:19 +03:00
Bogdan Opanchuk
8e11c96054
Remove GroupGeneralConfig attributes asignment and replace it with method calls
...
Attributes don't do anything anymore
2020-01-10 11:10:53 +01:00
Bogdan Opanchuk
fa96c4722d
global_config: move `mock_networking` option to the characters that actually use it, remove `etherscan` completely
2020-01-10 11:10:53 +01:00
Bogdan Opanchuk
9197f302d6
Group CLI options into structures (including the general options, formerly click_config)
2020-01-10 11:10:53 +01:00
jMyles
757b292f0c
Comment responding to @dnunez' question.
2020-01-10 01:17:14 -08:00
jMyles
b0d23b309a
Don't need this regression test anymore; it doesn't actually show anything terribly interesting about #1554 .
2020-01-08 16:43:39 -08:00
jMyles
99096b01c7
Test showing #1554 .
2020-01-08 16:43:39 -08:00
jMyles
d6d73612bb
This lives in learning tests now.
2020-01-08 16:43:39 -08:00
jMyles
c510c3531e
For test purposes, we need to mature the sprout to see its cert.
2020-01-08 16:43:39 -08:00
jMyles
923f2377ba
These assertions don't work at the moment, though it's not clear how important that is.
2020-01-08 16:43:39 -08:00
jMyles
332d072c40
This needs to be eager now, as we won't verify (and thus get the tested warning) otherwise.
2020-01-08 16:43:39 -08:00
jMyles
264b18e232
The end of automatic mixed operating mode. Removes and cleans up lots of federated_only kwargs. Closes #410 .
2020-01-08 16:43:39 -08:00
jMyles
bab41dd398
This mock needs to know about the node now.
2020-01-08 16:43:39 -08:00
jMyles
93d1f7f3dc
It is no longer the case that Alice will get NotEnoughNodes here; in fact she can't help but learn about (and verify) the nodes she needs at grant time.
2020-01-08 16:43:39 -08:00
jMyles
b49dcf98b3
Some more optimizations to lower test time.
2020-01-08 16:43:39 -08:00
jMyles
092d9049db
Facility to convert fake key to real one for testing.
2020-01-08 16:43:39 -08:00
jMyles
e88d0bcf42
A few updates to performance mocks. Most notably, and strangest, a quick list of all the integers which, when cast to string along with the test string, produce a value in bytes which can't be used as a public key. Seemed like the simplest way to proceed, but I'm open to ideas.
2020-01-08 16:43:39 -08:00
jMyles
32593b432c
Flask wants testing set to true in order for this to be treated like a test client.
2020-01-08 16:43:39 -08:00
jMyles
3f372d4053
Comments and new mocks for highperf Alice test.
2020-01-08 16:43:39 -08:00
jMyles
91e757b021
highperf mocked ursula fleet is now variable in size.
2020-01-08 16:43:39 -08:00
jMyles
949cea211a
Up and down in the water?! A mock Bob for working with highperf mock Ursulas.
2020-01-08 16:43:39 -08:00
jMyles
703aeeee02
Need mock message verification in more places than were initially obvious.
2020-01-08 16:43:39 -08:00
jMyles
2e0fb975ae
We need to be able to mock specific routes individually to test this.
2020-01-08 16:43:39 -08:00
jMyles
d06b92cd45
Testing showing JIT validation of Ursula, with TODO showing where we might eventually do that.
2020-01-08 16:43:39 -08:00
jMyles
5de196329a
New fixture for high-performance mocked Alice, which is compatible with Ursulas fixture in previous commit.
2020-01-08 16:43:39 -08:00
jMyles
377d88c81c
Making fixture out of high-performance mocked ursulas.
2020-01-08 16:43:39 -08:00
jMyles
367195d5e7
Moving performance mocks to separate module.
2020-01-08 16:43:39 -08:00
jMyles
dd9f866ba7
Collating all mocks needed to make high-performance mock ursulas.
2020-01-08 16:43:39 -08:00
jMyles
80778dc957
Pass entire class throug in order to instantiate NodeSprout or node instance.
2020-01-08 16:43:39 -08:00
jMyles
7df1fde295
New test module for discovery phases.
2020-01-08 16:43:39 -08:00
jMyles
f7e90f4bc3
Updating test to account for use of NodeSprout.
2020-01-08 16:43:39 -08:00
jMyles
bc6950dd8f
Better tracking of mock verifications.
2020-01-08 16:43:39 -08:00
jMyles
0555018ff1
Test showing #1450 .
2020-01-08 16:43:39 -08:00
jMyles
cd29869ac4
Crazy web of patches. These are the minimum mocks required to produce 5000 Ursulas in the timeframe required for a test.
2020-01-08 16:43:39 -08:00
jMyles
d329b98293
A fast mock public key.
2020-01-08 16:43:39 -08:00
jMyles
6a336aecbd
Insane monkey patching block. This is how you make several thousand Ursulas in a test.
2020-01-08 16:43:39 -08:00
David Núñez
ebb58ae48d
Enter the Sidekick: assisting ContractAdministrator to deploy preallocation contracts
2020-01-03 12:13:53 +01:00
David Núñez
4e8caac910
Use approveAndCall also when creating a stake in StakingEscrow
...
* Reduces stake creation to a single TX
2020-01-03 12:13:53 +01:00
vzotova
d1cb098d1e
receiveApproval method for PreallocationEscrow
2020-01-03 12:13:53 +01:00
Kieran R. Prasch
88386c91f9
Respond to RFCs in PR #1536
2020-01-02 12:41:44 -08:00
Kieran R. Prasch
8cf8397726
Adjustments to config tests to loosen up a little and allow for config versioning to be seperately tested.
2020-01-02 12:41:44 -08:00
Kieran R. Prasch
f501f6dedb
Remove stale password assertions (UX no longer requires auth for 'view')
2020-01-02 12:41:44 -08:00
Kieran R. Prasch
4324618128
Disable hardcoded seednodes in conftest.
2020-01-02 12:41:44 -08:00
vzotova
e66058530e
Fixes #1349 , enable re-staking by default
2019-12-26 13:21:12 +03:00
vzotova
4f0a49ff4a
Upgradeability test revision
2019-12-26 13:01:11 +03:00
vzotova
bb15e4bad1
Apply suggestions from code review #1407
2019-12-26 13:01:10 +03:00
vzotova
686a977f43
Test flag for StakingEscrow in administrator class
2019-12-26 13:01:10 +03:00
vzotova
a473357eca
Fix after rebasing
2019-12-26 13:01:10 +03:00
vzotova
6843f309f4
Reentrancy protection test for cancelBid
2019-12-26 13:01:09 +03:00
vzotova
3c000d5742
Fixed integration test
2019-12-26 13:01:08 +03:00
vzotova
5d522666d4
Fixed worklock tests
2019-12-26 13:01:08 +03:00
vzotova
f7c0401ff5
Test flag for multiple worklock in StakingEscrow
2019-12-26 13:01:08 +03:00
vzotova
acd8f50e16
Update test_worklock
2019-12-26 13:01:07 +03:00
vzotova
b454a0fd40
Completed tests for burn tokens
2019-12-26 13:01:06 +03:00
vzotova
73e0b6378c
Explicit StakingEscrow and WorkLock initialization
2019-12-26 13:01:06 +03:00
vzotova
4dcb5b201d
Apply suggestions from code review #1470
...
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
Co-Authored-By: David Núñez <david@nucypher.com>
2019-12-24 19:01:06 +03:00
vzotova
9def52d817
Fixed tests after contract version integration
2019-12-24 19:01:05 +03:00
vzotova
52bba7884c
Completed upgradeability test
2019-12-24 19:01:05 +03:00
vzotova
adb11d6785
Test for multi-version contract deployment
2019-12-24 19:01:05 +03:00
vzotova
98185a99c4
Search using contract version, checking version while deployment
2019-12-24 19:01:04 +03:00
vzotova
24b7fc3539
Versioned contract class, contract version in registry, ability to remove parameters from constructor in deployers (overrides)
2019-12-24 19:01:04 +03:00
vzotova
4ce0a3658b
Upgradability test: download contracts from github, master branch
2019-12-24 19:01:03 +03:00
vzotova
7002734e0b
Test for multi-source solidity compilation
2019-12-24 19:01:03 +03:00
vzotova
b140a03972
SolidityCompiler: ability to use multiple directories for compilation
2019-12-24 19:01:02 +03:00
vzotova
79f50206c6
Removed unnecessary * from solidity docs
2019-12-24 19:01:02 +03:00
Kieran R. Prasch
77b297ede3
Excavate reencryption logic onto Ursula proper.
2019-12-11 18:23:56 -08:00
Kieran R. Prasch
eba53f3206
Prepare datastore models for storing WorkOrders
2019-12-11 17:14:40 -08:00
David Núñez
5cc04f6d1d
Simplify PreallocationEscrow.withdrawTokens(). Thanks @vzotova, you rock
...
* Use StakingEscrow.getAllTokens instead of getLockedTokens, so unlocked tokens are also considered for the limit deduction
* This is fine since tokens are still in StakingEscrow, and only can leave via PreallocationEscrow
2019-12-11 13:32:03 +01:00
David Núñez
9b2d5d2fde
Implement `nucypher stake preallocation` subactions as a click argument
2019-12-11 13:32:03 +01:00
David Núñez
d3b961f9bd
PreallocationEscrowAgent.available_balance returns the balance that can be collected, considering both locked and staked tokens
2019-12-11 13:32:02 +01:00
David Núñez
82b8dbd0d6
Test `nucypher stake preallocation --status` and `--withdraw-tokens`
2019-12-11 13:32:02 +01:00
David Núñez
428c7f2a0e
TODOs and housekeeping
2019-12-11 13:27:08 +01:00
David Núñez
2caa88c68d
Adapt tests to latests changes in PreallocationEscrow
2019-12-11 13:27:08 +01:00
David Núñez
fe11752e58
Introduce mock_transacting_power_activation fixture
2019-12-11 13:27:08 +01:00
David Núñez
da7a572549
Adapt tests to new registry fetching; extract common fixture.
2019-12-11 13:27:08 +01:00
David Núñez
cf5cef9a20
Adapt PreallocationEscrow deployer and tests to latest changes
2019-12-11 13:27:08 +01:00
K Prasch
e10bcf5647
Merge pull request #1493 from KPrasch/cadmium
...
Ensure all tests can run in a singe session; Docker adjustments
2019-12-10 00:41:41 -08:00
Kieran R. Prasch
40e5ed7934
Adds optional explicit allocation file output directory; Implement in tests.
2019-12-09 17:04:49 -08:00
David Núñez
193b53ee1b
Merge pull request #1498 from nucypher/todo-party
...
After TODO party clean-up 🎉
2019-12-07 17:54:42 +00:00
David Núñez
c82d78b08b
Inaugural TODO Party: Review TODOs in blockchian modules.
2019-12-06 20:59:59 -08:00
K Prasch
86cd87dad6
Merge pull request #963 from nucypher/doubtfire
...
[EPIC] Doubtfire: Modifications for Monitoring Applications
2019-12-06 12:18:56 -08:00
Kieran R. Prasch
b49636c25c
Remove superfluous registry assertion, since it is variable, often in-memory.
2019-12-04 18:53:58 -08:00
Kieran R. Prasch
42ee86b4d2
Ensure fresh mock registry for each module test.
2019-12-04 18:53:05 -08:00
Kieran R. Prasch
5d267e4fa5
Remove test allocation files at the end of deployer tests involving preallocations.
2019-12-04 17:45:50 -08:00
Kieran R. Prasch
e814cc464e
Include min password length when asking for it.
2019-12-04 17:44:57 -08:00
vzotova
e0e648cf40
Reentrancy tests
2019-12-04 12:41:01 +01:00
David Núñez
376b8d1857
Merge pull request #1121 from vzotova/optimization
...
Contracts size optimizations
2019-12-04 11:23:26 +00:00
Kieran R. Prasch
57df8069a4
use random worker private key in manual worker fixture; remove stale script.
2019-12-03 21:05:25 -08:00
Kieran R. Prasch
aa2c6b191e
Fixes #1343 - Move StakeHolder to blockchain Actors.
2019-12-02 18:28:02 -08:00
derekpierre
e3acb7788b
Remove Moe CLI test.
2019-12-02 10:45:02 -05:00
Victoria
fd5d0be500
Apply suggestions from code review #1121
...
Co-Authored-By: David Núñez <david@nucypher.com>
2019-11-27 10:09:48 +01:00
vzotova
131ebda9cc
Few more contract optimizations
2019-11-27 11:50:24 +03:00
vzotova
693928c4e6
EstimateGas script refactoring
2019-11-27 11:50:24 +03:00
vzotova
a14b4e5e8b
createPolicy optimization
2019-11-27 11:50:24 +03:00
vzotova
4718569128
Small optimization for PolicyManager
2019-11-27 11:50:23 +03:00
vzotova
5d777b6a68
Few more size optimizations for StakingEscrow
2019-11-27 11:50:23 +03:00
vzotova
854b4d9eb7
First optimization step for StakingEscrow
2019-11-27 11:50:22 +03:00
derekpierre
1cacffa153
Fix in memory SQLite test case
2019-11-25 21:57:37 -05:00
Kieran R. Prasch
b27aaa8f5d
Use in-memory sqlite for sql node storage testing.
2019-11-25 17:09:09 -08:00
Kieran R. Prasch
a4ce120e1d
Removes selenium conftest setup.
2019-11-25 16:22:50 -08:00
Kieran R. Prasch
9059ddf660
Extricate Status Apps.
2019-11-25 16:22:50 -08:00
derekpierre
1da11ed1d6
Initial code for SQLiteForgetfulNodeStorage to eventually be used for tracking network status
2019-11-25 16:22:50 -08:00
derekpierre
83ca610c6a
Initial separation of Moe crawler vs dashboard
2019-11-25 16:22:50 -08:00
derekpierre
0417f3540a
Fixed Ursula status pages test to pass once federated ursula status pages work
...
Add circleci_only marker for tests
2019-11-25 16:22:50 -08:00
derekpierre
748fd0e34d
Update reasoning for skipping Ursula status page tests
2019-11-25 16:22:50 -08:00
derekpierre
95bbc502f0
Remove pytest-dash from all dependencies
...
Rebuild dependencies to include dash[testing]
2019-11-25 16:22:50 -08:00
derekpierre
7daedf4bf6
Initial code to transition tests to dash[testing] from pytest-dash.
...
Note, tests are skipped and don't yet work with dash[testing] - this is to allow for CI builds to pass
2019-11-25 16:22:50 -08:00
derekpierre
b2e98930e4
Setup tests to work once latest stable Chrome version can be used by instapy-chromedriver
...
Specify named parameters to UrsulaStatusPage
2019-11-25 16:22:50 -08:00
derekpierre
5335eae273
Moe/Ursula status page: separate network tests for status pages into subfolder.
...
Only tests in the network folder itself are run (not subdirectories)
Created status subdirectory for status tests so that they are run separately
2019-11-25 16:22:50 -08:00
derekpierre
9106231ccb
Moe/Ursula status page: Updated unit tests for ursula status page
...
Hooked up pytest-dash/selenium for UI test
Removed extra logging
2019-11-25 16:22:50 -08:00
Kieran R. Prasch
6105ffe235
Accommodate inter-test-module transacting power unlocking where needed (eth-test =>0.3.0b0).
2019-11-25 13:32:04 -08:00
Kieran R. Prasch
fede665c49
Fixes for #1463 .
2019-11-22 15:08:43 -08:00
Victoria
3743ccde1b
Apply suggestions from code review
...
Co-Authored-By: MacLane S Wilkison <maclane@nucypher.com>
2019-11-19 16:12:37 +03:00
vzotova
1dee796bbd
Added marker for "light" client to blockchain interface, used "light" parameter for pagination, test for pagination
2019-11-19 16:12:37 +03:00
vzotova
f428984401
Pagination for getAllACtiveStakers method
2019-11-19 16:12:36 +03:00
David Núñez
9613aeb6a2
Improve collection of allocation receipts
2019-11-07 23:21:36 +01:00
K Prasch
88d5d38b66
Merge pull request #1327 from nucypher/biznaga
...
[EPIC] Biznaga: Integration of testnet with staking contracts
2019-10-25 15:36:42 -07:00
K Prasch
a518aa9767
Merge pull request #1364 from szotov/extract-sample
...
Extract sample() from solidity to python
2019-10-25 15:34:40 -07:00
David Núñez
a2b4cc9d82
Apply suggestions from code review
...
Co-Authored-By: MacLane S Wilkison <maclane@nucypher.com>
Co-Authored-By: Derek Pierre <derek.pierre@gmail.com>
2019-10-23 22:06:48 +02:00
David Núñez
e124fe50e6
Merge remote-tracking branch 'upstream/master' into biznaga
...
Fix conflicts in nucypher stake and nucypher-deploy
2019-10-22 22:53:23 +02:00
derekpierre
e84f3b56a7
RFC changes based on reviews for PR 1417.
2019-10-21 09:27:23 -04:00
David Núñez
72fca457c9
test_blockchain_ursulas_reencrypt now works for N=10. Also test for down nodes.
2019-10-21 01:56:35 +02:00
David Núñez
6f33b2b53a
Adapt test for sampling distribution and relocate to agent tests
2019-10-20 19:11:21 +02:00
David Núñez
9d88930e3c
Remove test for sampling in contract
2019-10-20 18:15:32 +02:00
szotov
f330f5504b
Fixed tests for new method
2019-10-20 17:50:47 +02:00
David Núñez
c157a51312
RFCs to PR #1402 (vol 2)
2019-10-20 00:29:45 +02:00
David Núñez
0a3683286d
RFCs to PR #1402
2019-10-19 23:59:42 +02:00
David Núñez
377eb0dcf9
Test IndividualAllocationRegistry. Fix some broken stuff.
2019-10-19 23:59:37 +02:00
David Núñez
09591a1a78
Simplify UX of CLI when staking via contract
...
* Remove --escrow flag
* No account selection; use individual allocation file or explicit addresses
2019-10-19 23:59:37 +02:00
David Núñez
d363108661
Stake should be the locked tokens, not locked + rewards. Fix #1369
2019-10-19 23:59:36 +02:00
David Núñez
d968cdd848
Add account selection to collect-reward. Complete tests for stake via contract.
2019-10-19 23:59:30 +02:00