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

🌊 Setup contracts-watr deployment #1251

Merged
merged 28 commits into from
Apr 14, 2023
Merged

🌊 Setup contracts-watr deployment #1251

merged 28 commits into from
Apr 14, 2023

Conversation

abam-iksde
Copy link
Collaborator

No description provided.

@abam-iksde
Create contracts-watr package
3bbb11f
@abam-iksde
Add initialize method to contracts
e40c0b5
@abam-iksde
Deployment script
6e30c4f
@abam-iksde
Make test showOwner script
3935f93
@abam-iksde
Add network parameter and prompt for PRIVATE_KEY in script
c28994b
@abam-iksde
Add canary generation to build
c35a211
@abam-iksde
Change pnpm to yarn
21d9030
@abam-iksde
Don't pass args
2749876
@abam-iksde
Add Registry to deployment
736abf8
@abam-iksde
Create IClaimableOwnable interface
c7e674d
@abam-iksde
Remove constructor from interface
cb8fc57
@abam-iksde
Implement IClaimableOwnable interface
12f66a0
@abam-iksde
Lint
f6500f9
@abam-iksde
Verify ownership with tests
c1a0894
@abam-iksde
Verify registry with test
d20ba3d
@abam-iksde
Use transferProxyOwnership
1cd84e2
@abam-iksde
Handle proxy ownership
720db28
@abam-iksde
Add upgradeTo
80953f0
@abam-iksde
Use deployed implementation address
4c12812
@abam-iksde
Add ownership transfer
7dc8927
@abam-iksde
Refactor deployment
c620a98
@abam-iksde
Verify proxy ownership with test
e80ab8c
@abam-iksde
Match TrueCurrencyWithProofOfReserve to contracts-por
b56a3b1
@abam-iksde
Match TrueUSD.test.ts to contracts-por
c48ce32
@abam-iksde
Merge branch 'watr-package' into watr-deployment
dc65658
Base automatically changed from watr-package to main April 12, 2023 11:05
tt-krzysztof
tt-krzysztof requested changes Apr 13, 2023
View reviewed changes
Copy link
Contributor

@tt-krzysztof tt-krzysztof left a comment

Choose a reason for hiding this comment

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

Extract the interface from ClaimableOwnable.

packages/contracts-watr/contracts/TokenControllerV3.sol Outdated
@@ -30,6 +30,12 @@ import {IProofOfReserveToken} from "./interface/IProofOfReserveToken.sol";
* which can only be refilled by the owner.
*/

interface HasOwner {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is handled better in #1245 : extracting the interface from ClaimableOwnable.

@tt-krzysztof tt-krzysztof merged commit b819e25 into main Apr 14, 2023
@tt-krzysztof tt-krzysztof deleted the watr-deployment branch April 14, 2023 10:12
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

@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.
2 participants
@abam-iksde @tt-krzysztof