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

Implement L2 Claim Contract #8

Merged
merged 58 commits into from
Jan 15, 2024
Merged

Implement L2 Claim Contract #8

merged 58 commits into from
Jan 15, 2024

Conversation

Phanco
Copy link
Member

@Phanco Phanco commented Nov 22, 2023 •
edited
Loading

What was the problem?

This PR resolves #15

How was it solved?

Created 2 Smart contracts

L2Claim.sol
ED25519.sol

How was it tested?

L2Claim.t.sol created to test regular accounts, and multisig accounts in the following scenario:

M: MandatoryKeys, O: OptionalKeys

1. 3M
2. 1M + 2O (req : 2)
3. 3M + 3O (req: 5)
4. 64M (req: 64)

matjazv and others added 28 commits November 1, 2023 16:50
@matjazv
Implement dummy Claim contract
071e855
@matjazv
Implement scripts for deploying lisk token and claim contracts
6936d67
@matjazv
Implement Lisk token for L2
a3e882d
@matjazv
Implement Transfer funds script
5a08f56
@matjazv
Sending tokens from L1 to L2 is working
dd897e4
@matjazv
Update deployContracts script to support L1 and L2 RPC providers
df931cf
@matjazv
Remove duplicated import
f60b6a8
@matjazv
Fix number of claimed tokens
0feeb2f
@matjazv
Implement test claim tokens script
d31d5d7
@matjazv
Add some additional loggings
0919f75
@matjazv
Add source code comments
7ef83b1
@matjazv
Readme update.
f780a35
@matjazv
Fix formatting.
a3865ab
@matjazv
Deployed contracts can be verified on Etherscan
fefaad3
@matjazv
Readme and comment updated
75fe16e
@matjazv
It's possible to run L1 and L2 private networks.
b6af260
@matjazv
Readme updated
dae1a0f
@matjazv
Readme updated
4c5f91e
@matjazv
Comments regarding fork RPC urls are improved
f1e675a
@matjazv
Improved deployContracts script file
def4675
@matjazv
Readme updated.
5e42642
@matjazv
Logs and readme improvements.
11c2133
@matjazv
Fix formatting error.
f06da9e
@Phanco
Update L2 Claim implementation
1980dd9
@Phanco
Merge branch 'main' of github.com:LiskHQ/lisk-contracts into 115-impl…
f409c65 
…ement-claim
@Phanco
Added Merkle Tree Builder and updated test cases
0ba9328
@Phanco
Lower optimizer run for ED25519 contract
9c7f756
@Phanco
Separate Merkle Tree from Claim Contract PR
c68b908
matjazv
matjazv requested changes Jan 3, 2024
View reviewed changes
src/L2/L2Claim.sol Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
src/utils/Ed25519.sol Outdated Show resolved Hide resolved
AndreasKendziorra
AndreasKendziorra requested changes Jan 3, 2024
View reviewed changes
script/Utils.sol Outdated Show resolved Hide resolved
script/example/L2ClaimTokens.s.sol Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
matjazv
matjazv requested changes Jan 4, 2024
View reviewed changes
Copy link
Contributor

@matjazv matjazv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than this small change it look very good to me!

.env.example Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
@Phanco Phanco requested a review from matjazv January 4, 2024 17:17
AndreasKendziorra
AndreasKendziorra requested changes Jan 5, 2024
View reviewed changes
.env.example Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Outdated Show resolved Hide resolved
@Phanco Phanco force-pushed the 115-implement-claim branch 2 times, most recently from 9fdf556 to ed78618 Compare January 10, 2024 12:12
AndreasKendziorra
AndreasKendziorra requested changes Jan 11, 2024
View reviewed changes
script/Utils.sol Outdated Show resolved Hide resolved
src/L2/L2Claim.sol Show resolved Hide resolved
script/L2Claim.s.sol Show resolved Hide resolved
script/L2Claim.s.sol Show resolved Hide resolved
test/L2/L2Claim.t.sol Show resolved Hide resolved
matjazv
matjazv approved these changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@matjazv matjazv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from my side 🚀

@shuse2 shuse2 merged commit 0a72c07 into main Jan 15, 2024
3 checks passed
@shuse2 shuse2 deleted the 115-implement-claim branch January 15, 2024 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shuse2 shuse2 shuse2 left review comments

@AndreasKendziorra AndreasKendziorra AndreasKendziorra approved these changes

@matjazv matjazv matjazv approved these changes

Assignees

@Phanco Phanco

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement L2 Claim Contract
4 participants
@Phanco @matjazv @shuse2 @AndreasKendziorra