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.

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

🎦 Fix: add CI test #2

Merged
merged 10 commits into from
Aug 8, 2023
Merged

🎦 Fix: add CI test #2

merged 10 commits into from
Aug 8, 2023

Conversation

qiwihui
Copy link

@qiwihui qiwihui commented Aug 8, 2023

No description provided.

@qiwihui qiwihui merged commit c2aee5e into main Aug 8, 2023
4 checks passed
@qiwihui qiwihui deleted the feature/fix-ci branch August 8, 2023 11:17
qiwihui added a commit that referenced this pull request Aug 9, 2023
* 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 that referenced this pull request Aug 9, 2023
* 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 that referenced this pull request Aug 9, 2023
* 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 that referenced this pull request Aug 9, 2023
* 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 that referenced this pull request Aug 9, 2023
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant