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

⬇️ Lower amount in Pool Curve integration test #1255

Merged
merged 2 commits into from
Apr 14, 2023

Conversation

abam-iksde
Copy link
Collaborator

No description provided.

@tt-krzysztof tt-krzysztof merged commit 3fa4b4e into main Apr 14, 2023
@tt-krzysztof tt-krzysztof deleted the fix-curve-integration-test branch April 14, 2023 09:04
qiwihui added a commit to tutoken/smart-contracts 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 to tutoken/smart-contracts 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 to tutoken/smart-contracts 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 to tutoken/smart-contracts 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 to tutoken/smart-contracts 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.

2 participants