Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Reward escrow v2 migration contract #960

Merged
merged 150 commits into from Dec 11, 2020
Merged

Reward escrow v2 migration contract #960

merged 150 commits into from Dec 11, 2020

Conversation

jacko125
Copy link
Contributor

@jacko125 jacko125 commented Dec 11, 2020 •
edited

image

jjgonecrypto and others added 30 commits October 22, 2020 15:25
@jjgonecrypto
Sending rewards into L2
2c0289e
@jjgonecrypto
Fixing broken parts
75f4bab
@jjgonecrypto
Unit tests
a21bfd4
@jjgonecrypto
New unit tests
2ec2d54
@jjgonecrypto
Adding coverage for migrate
b95fb89
@jjgonecrypto
Merge branch 'develop' into send-rewards-into-l2
b4be348
@i-stam
Remove duplicate tests
0141aa4
@i-stam
Use smock to test L2 contracts (#820)
b2df91b
@i-stam
Remove MintableSynthetixMock.sol
6a4881c
@i-stam
Remove test:multi (implemented in external PR)
b7840bb
@i-stam
Remove secondary contract refs (#823)
2246003
@jjgonecrypto
Merge branch 'develop' into send-rewards-into-l2
217aa3c
@i-stam
Merge branch 'develop' into send-rewards-into-l2 and update package-l…
08259ac 
…ock.json
@i-stam
New messenger interface (#825)
640679e
@i-stam
Merge branch 'develop' into send-rewards-into-l2
0f6eb99
@i-stam
Add initial tests
95db1f0
@i-stam
Add loop for initializing the array
b11ebf0
@i-stam
Add test for importVestingEntries()
0f70624
@i-stam
Comment out expected data tests
d1e1a29
@i-stam
Import new IRewardEscrowV2 interface
d77128c
@i-stam
Fix SynthetixBridgeToOptimism unit tests
9a9c71a
@i-stam
Fix SynthetixBridgeToBase unit tests
571937d
@i-stam
Merge branch 'develop' into test-escrow-migration
b0e863a
@i-stam
Add more tests
45ca463
@i-stam
Use V2 suffix for rewardEscrow view function
4ce3110
@i-stam
Add RewardEscrowV2 for mocking
d82c185
@i-stam
Minor fix
1d5e903
@i-stam
Merge branch 'develop' into develop-L2-escrowV2-integration
14608b3
@theethernaut
Adds a new script to connect l2 bridge (#894)
a96b306 
* Adds a new script to connect l2 bridge

* Bugfix on new command
@theethernaut
Skip vsynth prod test (#895)
4a16e66
jacko125 and others added 23 commits December 10, 2020 11:12
@jacko125
update TODO require()'s for account merging
b6811a0
@jacko125
fix vest function loop
64629c2
@jacko125
add vesting tests
b0e537c
@jacko125
fix getVestingQuantity view iteration and add vesting tests
9ee2e32
@theethernaut
Refactoring L2 prod tests
d0888ff
@i-stam
Update interfaces
d397e96
@theethernaut
Deposits working in L2 tests
ef33ae0
@theethernaut
Progress with L2 withdrawal tests
0deb9cf
@theethernaut
Linter fixes
a67a63a
@theethernaut
Withdrawals working in L2 prod tests
306e202
@i-stam
Refactor depositAndMigrateEscrow() and add unit tests
37a5419
@i-stam
Merge branch 'sip-60-reward-escrow-v2' into develop-L2-escrowV2-integ…
199bdbe 
…ration
@i-stam
Add extra safety checks
cf58cbe
@i-stam
Merge branch 'start-dual-chain-cmd-add-prod-tests' into develop-L2-es…
a151065 
…crowV2-integration
@i-stam
Use new addressResolver
8072925
@jacko125
Merge branch 'sip-60-reward-escrow-v2' of github.com:Synthetixio/synt…
903e642 
…hetix into reward-escrow-v2-migration-contract
@i-stam
Deploy RewardEscrowV2 on local and local-ovm
28e28cc
@jacko125
add smockit for issuer and issuer() contract for debtBalanceOf to Bas…
b1b6cad 
…eRewardEscrowV2
@jacko125
update IRewardEscrowV2 interface and BaseRewardEscrow tests to smock
64a08bf
@jacko125
update smockit and mocking SNX token for vesting
e1a9b72
@jacko125
remove unused var
224818d
@jacko125
Merge branch 'develop-L2-escrowV2-integration' of github.com:Syntheti…
b942482 
…xio/synthetix into reward-escrow-v2-migration-contract
@jacko125
update BaseRewardEscrowV2 tests with new MixinResolver
df64f56
@jacko125 jacko125 requested a review from i-stam December 11, 2020 13:58
@jacko125 jacko125 changed the base branch from develop-L2-escrowV2-integration to sip-60-reward-escrow-v2 December 11, 2020 22:14
@jacko125 jacko125 merged commit 9daec8d into sip-60-reward-escrow-v2 Dec 11, 2020
@i-stam i-stam deleted the reward-escrow-v2-migration-contract branch December 12, 2020 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjgonecrypto jjgonecrypto jjgonecrypto left review comments

@i-stam i-stam Awaiting requested review from i-stam

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jacko125 @jjgonecrypto @i-stam @theethernaut @zyzek