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

contract: add erc20 functions #100

Merged
merged 16 commits into from
Feb 10, 2025
Merged

contract: add erc20 functions #100

merged 16 commits into from
Feb 10, 2025
+2,519 −1,920

Conversation

kroist
Copy link
Collaborator

@kroist kroist commented Jan 30, 2025

No description provided.

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 31, 2025 •
edited
Loading

Transaction NameMainCurrentDifference (%)
NewAccount200099120009910.00000%
Deposit182868818286880.00000%
Withdraw189875518987550.00000%

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 31, 2025 •
edited
Loading

📊 Coverage Report

📈 Total Coverage Summary

Type Covered Total Coverage
📝 Lines 2008 3151 🟠 63.72%
📄 Statements 2008 3151 🟠 63.72%
⚡ Functions 69 77 🟡 89.61%
🔀 Branches 197 200 🟡 98.5%

Coverage Legend

  • ✅ 100% Coverage
  • 🟡 80-99% Coverage
  • 🟠 50-79% Coverage
  • ❌ 0-49% Coverage

📁 File Coverage

📋 Detailed Coverage Report
File Lines Statements Functions Branches
✅ zkOS-monorepo/ts/shielder-sdk/src/_generated/abi_v0_0_1.ts 100% 100% 100% 100%
❌ zkOS-monorepo/ts/shielder-sdk/src/_generated/abi.ts 0% 0% 0% 0%
✅ zkOS-monorepo/ts/shielder-sdk/src/actions/deposit.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/actions/index.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/actions/newAccount.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/actions/utils.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/actions/withdraw.ts 100% 100% 100% 100%
❌ zkOS-monorepo/ts/shielder-sdk/src/chain/contract.ts 9.09% 9.09% 25% 100%
❌ zkOS-monorepo/ts/shielder-sdk/src/chain/relayer.ts 20.75% 20.75% 33.33% 50%
✅ zkOS-monorepo/ts/shielder-sdk/src/client.ts 100% 100% 93.75% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/constants.ts 100% 100% 100% 100%
❌ zkOS-monorepo/ts/shielder-sdk/src/index.ts 0% 0% 0% 0%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/events.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/index.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/manager.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/storageSchema.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/sync.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/state/types.ts 100% 100% 100% 100%
✅ zkOS-monorepo/ts/shielder-sdk/src/utils.ts 100% 100% 100% 100%

@kroist kroist marked this pull request as ready for review February 3, 2025 09:07
@kroist kroist changed the title add erc20 functions contract: add erc20 functions Feb 3, 2025
pmikolajczyk41
pmikolajczyk41 reviewed Feb 3, 2025
View reviewed changes
.github/workflows/_measure-gas.yml Outdated Show resolved Hide resolved
contracts/DepositLimit.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
crates/shielder-account/src/shielder_action.rs Show resolved Hide resolved
guspiel
guspiel reviewed Feb 4, 2025
View reviewed changes
Copy link
Contributor

@guspiel guspiel left a comment

Choose a reason for hiding this comment

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

Awesome!

Haven't read everything, but posting some initial comments. Will finish reviewing today.

crates/shielder-cli/src/recovery.rs Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
.github/workflows/_measure-gas.yml Outdated Show resolved Hide resolved
crates/integration-tests/src/shielder/calls/deposit_native.rs Show resolved Hide resolved
guspiel
guspiel reviewed Feb 4, 2025
View reviewed changes
contracts/Shielder.sol Show resolved Hide resolved
crates/shielder-contract/src/types.rs Show resolved Hide resolved
crates/shielder-account/src/shielder_action.rs Show resolved Hide resolved
contracts/DepositLimit.sol Outdated Show resolved Hide resolved
contracts/DepositLimit.sol Outdated Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
crates/integration-tests/src/shielder/calls/new_account_native.rs Outdated Show resolved Hide resolved
crates/integration-tests/src/shielder/calls/new_account_native.rs Outdated Show resolved Hide resolved
contracts/Shielder.sol Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
pmikolajczyk41
pmikolajczyk41 approved these changes Feb 6, 2025
View reviewed changes
Copy link
Member

@pmikolajczyk41 pmikolajczyk41 left a comment

Choose a reason for hiding this comment

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

nice work, kudos!

for future, I'd suggest doing preliminary, no-brainer PR for simply renaming contract functions and applying this to >20 files, and then, proper PR with semantic changes

contracts/Shielder.sol Show resolved Hide resolved
contracts/Shielder.sol Show resolved Hide resolved
contracts/Shielder.sol Outdated Show resolved Hide resolved
guspiel
guspiel approved these changes Feb 7, 2025
View reviewed changes
Copy link
Contributor

@guspiel guspiel left a comment

Choose a reason for hiding this comment

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

LGTM

.github/workflows/_measure-gas.yml Outdated Show resolved Hide resolved
@kroist kroist merged commit dbd9ac4 into main Feb 10, 2025
11 checks passed
@kroist kroist deleted the erc20-contract branch February 10, 2025 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guspiel guspiel guspiel approved these changes

@pmikolajczyk41 pmikolajczyk41 pmikolajczyk41 approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@kroist @guspiel @pmikolajczyk41