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

🛁 Use XC-20 standard for contracts-watr TrueUSD #1252

Merged
merged 104 commits into from
Apr 14, 2023
Merged

🛁 Use XC-20 standard for contracts-watr TrueUSD #1252

merged 104 commits into from
Apr 14, 2023

Conversation

abam-iksde
Copy link
Collaborator

No description provided.

abam-iksde and others added 30 commits March 1, 2023 15:54
@abam-iksde
WIP deployment script
c319da6
@abam-iksde
Add initialize method to contracts
548673e
@abam-iksde
Deployment script
1dec588
@abam-iksde
Make test showOwner script
6ca7aab
@abam-iksde
Add network parameter and prompt for PRIVATE_KEY in script
6f81400
@abam-iksde
Add canary generation to build
826450e
@abam-iksde
Change pnpm to yarn
106917a
@abam-iksde
Don't pass args
ec77b85
@abam-iksde
Add Registry to deployment
069d102
@abam-iksde
Create IClaimableOwnable interface
692a708
@abam-iksde
Remove constructor from interface
20706b6
@abam-iksde
Implement IClaimableOwnable interface
80954e0
@abam-iksde
Lint
29689af
@abam-iksde
Verify ownership with tests
62c62ed
@abam-iksde
Verify registry with test
74186ab
@abam-iksde
Use transferProxyOwnership
c6d9e48
@abam-iksde
Handle proxy ownership
4b8ee20
@abam-iksde
Add upgradeTo
68235c2
@abam-iksde
Use deployed implementation address
d310d0a
@abam-iksde
Add ownership transfer
6503d22
@abam-iksde
Refactor deployment
317e452
@abam-iksde
Verify proxy ownership with test
e2a68df
@tt-krzysztof
Hello mints
ced264e
@tt-krzysztof
WIP on xc-20
5074e64
@tt-krzysztof
remove deployments
d75f88e
@tt-krzysztof
WIP2
c15a9f3
@abam-iksde
Work in heavy progress
c355e95
@tt-krzysztof
little cleanup, use astar interface
f13ddd9
@abam-iksde
Use native assets
4af9e61
@abam-iksde
Test native token for ERC20 functionality
84e6141
@tt-krzysztof
Copy link
Contributor

For redemptions to work, we also need to call setBurnBounds on the token (or through controller). Eth mainnet values seem to be 1k-1bn.

tt-krzysztof
tt-krzysztof reviewed Apr 13, 2023
View reviewed changes
packages/contracts-watr/contracts/common/XC20Wrapper.sol Outdated
Comment on lines 101 to 107
function name() public pure virtual returns (string memory) {
return "";
}

function symbol() public pure virtual returns (string memory) {
return "";
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps those can be abstract / left unimplemented?

tt-krzysztof
tt-krzysztof reviewed Apr 13, 2023
View reviewed changes
packages/contracts-watr/contracts/interface/IERC20Plus.sol Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps we could include a reference to https://github.com/AstarNetwork/astar-frame/blob/polkadot-v0.9.39/precompiles/assets-erc20/ERC20.sol

Base automatically changed from watr-deployment to main April 14, 2023 10:12
@tt-krzysztof tt-krzysztof merged commit 3dc9d59 into main Apr 14, 2023
@tt-krzysztof tt-krzysztof deleted the watr-xc20 branch April 14, 2023 13:47
qiwihui added a commit to tutoken/smart-contracts that referenced this pull request Aug 9, 2023
@qiwihui
Merge branch 'main' into tron-tusd-contracts
f734afd 
* main:
  🎦 Fix: add CI test (#2)
  🏊‍♂️ Freeze Watr native token on blacklisting (trusttoken#1256)
  🛁 Use XC-20 standard for `contracts-watr` TrueUSD (trusttoken#1252)
  🌊 Setup `contracts-watr` deployment (trusttoken#1251)
  ⬇️ Lower amount in `Pool Curve integration` test (trusttoken#1255)
qiwihui added a commit to tutoken/smart-contracts that referenced this pull request Aug 9, 2023
@qiwihui
Merge branch 'main' into tron_blacklist
fc46137 
* main:
  🔗 Fix lint for tron contracts (#4)
  🏆 Feat: add TrueUSD on Tron (#3)
  🎦 Fix: add CI test (#2)
  🏊‍♂️ Freeze Watr native token on blacklisting (trusttoken#1256)
  🛁 Use XC-20 standard for `contracts-watr` TrueUSD (trusttoken#1252)
  🌊 Setup `contracts-watr` deployment (trusttoken#1251)
  ⬇️ Lower amount in `Pool Curve integration` test (trusttoken#1255)

# Conflicts:
#	packages/contracts-tron/contracts/OwnedUpgradeabilityProxy.sol
#	packages/contracts-tron/contracts/Registry.sol
#	packages/contracts-tron/contracts/TronTokenController.sol
#	packages/contracts-tron/contracts/TronTrueUSD.sol
#	packages/contracts-tron/contracts/common/BurnableTokenWithBounds.sol
#	packages/contracts-tron/contracts/common/ClaimableOwnable.sol
#	packages/contracts-tron/contracts/common/ProxyStorage.sol
#	packages/contracts-tron/contracts/common/ReclaimerToken.sol
#	packages/contracts-tron/contracts/common/TRC20.sol
#	packages/contracts-tron/contracts/common/TrueCurrency.sol
#	packages/contracts-tron/contracts/interface/ITRC20.sol
qiwihui added a commit to tutoken/smart-contracts that referenced this pull request Aug 9, 2023
@qiwihui
Merge branch 'main' into eth_blacklist
d0a2654 
* main:
  🔗 Fix lint for tron contracts (#4)
  🏆 Feat: add TrueUSD on Tron (#3)
  🎦 Fix: add CI test (#2)
  🏊‍♂️ Freeze Watr native token on blacklisting (trusttoken#1256)
  🛁 Use XC-20 standard for `contracts-watr` TrueUSD (trusttoken#1252)
  🌊 Setup `contracts-watr` deployment (trusttoken#1251)
  ⬇️ Lower amount in `Pool Curve integration` test (trusttoken#1255)
qiwihui added a commit to tutoken/smart-contracts that referenced this pull request Aug 9, 2023
@qiwihui
Merge branch 'main' into bsc_blacklist
fb02a14 
* main:
  🔗 Fix lint for tron contracts (#4)
  🏆 Feat: add TrueUSD on Tron (#3)
  🎦 Fix: add CI test (#2)
  🏊‍♂️ Freeze Watr native token on blacklisting (trusttoken#1256)
  🛁 Use XC-20 standard for `contracts-watr` TrueUSD (trusttoken#1252)
  🌊 Setup `contracts-watr` deployment (trusttoken#1251)
  ⬇️ Lower amount in `Pool Curve integration` test (trusttoken#1255)
qiwihui added a commit to tutoken/smart-contracts that referenced this pull request Aug 9, 2023
@qiwihui
Merge branch 'main' into avax_blacklist
374fb6b 
* main:
  🔗 Fix lint for tron contracts (#4)
  🏆 Feat: add TrueUSD on Tron (#3)
  🎦 Fix: add CI test (#2)
  🏊‍♂️ Freeze Watr native token on blacklisting (trusttoken#1256)
  🛁 Use XC-20 standard for `contracts-watr` TrueUSD (trusttoken#1252)
  🌊 Setup `contracts-watr` deployment (trusttoken#1251)
  ⬇️ Lower amount in `Pool Curve integration` test (trusttoken#1255)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akoszowski akoszowski akoszowski left review comments

@tt-krzysztof tt-krzysztof tt-krzysztof 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.
4 participants
@abam-iksde @tt-krzysztof @akoszowski @Wojstan