Merkle root for Airdrop contract is set inside deployment script #161
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matjazv
force-pushed
the
160-airdrop-merkle-root
branch
from
b39d5d0
to
02e308e
Compare
Phanco
approved these changes
Jun 10, 2024
matjazv
force-pushed
the
160-airdrop-merkle-root
branch
from
02e308e
to
2682128
Compare
sergeyshemyakov
approved these changes
Jun 17, 2024
matjazv
added a commit
that referenced
this pull request
Jun 18, 2024
Set Merkle root on Airdrop contract deployment
matjazv
added a commit
that referenced
this pull request
Jun 21, 2024
Set Merkle root on Airdrop contract deployment
matjazv
added a commit
that referenced
this pull request
Jun 24, 2024
Set Merkle root on Airdrop contract deployment
matjazv
added a commit
that referenced
this pull request
Jun 26, 2024
Set Merkle root on Airdrop contract deployment
shuse2
pushed a commit
that referenced
this pull request
Jun 26, 2024
Set Merkle root on Airdrop contract deployment
shuse2
pushed a commit
that referenced
this pull request
Jul 11, 2024
* Add SwapAndBridge contract and Lido deployment and tests * SwapAndBridge: Remove duplicate variables, add check against 0 address in constructor, and add slippage check * SwapAndBridge: Remove duplicate variables, add check against 0 address in constructor, and add slippage check * Added e2e tests. * clean up deploy.sh * SwapAndBridge.sol: add docs to constructor * Clean up test * update .env.example * Clean up deployment script * Clean up env file * Add more balance for tests * Add unit tests * forge install: solady v0.0.180 * remove unused contracts, update tests * automate deployment * fix env.example * cleanup SwapAndBridge tests * address review * update contract license * address review * Fix E2E tests for Diva * Minor fixes to Utils.sol * Update Utils.sol with SwapAndBridge functionalities * Fix import in Utils.sol * Fix import in Utils.sol * Fix variable usage * Move env variables to contract constants to fix CI * Fix formatting * Remove use of env variables * remove unused TOKEN_HOLDER_PRIV_KEY variable * Save temporary data files to local storage * fix fmt * Move e2e tests to script * Move integration tests to script; add unit tests * remove old test folder * Fix integration tests * remove unnecessary function * Add new unit tests * Add mock contracts * add tests for L2WdivETH * Add AccessControl to VestingWallet * Add NatSpec comments * Update contract owner * Added NatSpec and beneficiary check * Remove redundant mappings * Improve contract interface * Increase test coverage * Update data for Testnet migration (#135) Merkle root was added and unneeded account removed from accounts_2.json * Add address checking to contract * Update error message * Add virtual to functions * Vesting Wallet on Ethereum L1 Mainnet (#123) * Added L1VestingWallet, added testnet Vesting Plans, Added L1 Vesting deployment script * Updated vesting plans script * Update vesting data * Add explanation to L1VestingWallet * Update format * Update READMEs * Update vesting amount * Update vesting amounts * Update devnet data * Update according to suggestion * Update L1 contract code and deployment scripts * Update README * Update PR review * Use OptimismMintableERC20Factory for Diva ERC20 * remove optimism library * remove unnecessary contracts * add deployment scripts * fixing e2e * fix e2e tests * remove optimism lib * fix e2e tests * Add Airdrop contract Testnet deployment data (#159) * Set 6_deployUSDTContract.sh script file as executable * Set 5_deployAirdropContract.sh script file as executable * Add Airdrop contract deployment data * Fix GitHub CI regarding Forge version * Added L2VotingPowerPaused and L2GovernorPaused contract with test cases (#165) * Added L2VotingPowerPaused and L2GovernorPaused contract with test cases * Add deployment script * Update git submodules * Add foundry.toml * Change version function to be independent * Update comments * Update gitsubmodule, added Custom Errors * Rearrange functions according to requirements * pump forge-std to 1.8.2 * Add onReceive ERC721 and ERC1155 check * Test adjustVotingPower is unpaused * Add deployPausedDAO.sh * Add forge clean to deploy script * Clean before every forge script runs * Used `../../` to navigate paused script * rename assertInitParamsEq * Merkle root for Airdrop contract is set inside deployment script (#161) Set Merkle root on Airdrop contract deployment * Add automated toolings for testing contracts (#151) * Add Slither support in GH actions * Add slither-mutate support for local execution * Add readme for test directory * Fix rebasing with development * Add Echidna support for local execution * Fix spelling typo * fix env files * forge install: openzeppelin-contracts v5.0.2 * forge install: openzeppelin-contracts-upgradeable v5.0.2 * forge install: openzeppelin-contracts 01ef448981be9d20ca85f2faf6ebdf591ce409f3 * forge install: openzeppelin-contracts-upgradeable fbdb824a735891908d5588b28e0da5852d7ed7ba * forge install: forge-std v1.8.2 * cleanup * cleanup * address Slither and Matjaz comments * add extra deployment checks * Update script/swap_and_bridge/example/README.md Co-authored-by: Matjaz Verbole <[email protected]> * Update pr.yaml * improving deployment script * improving testing scripts * improve test scripts and rename folder * Address review comments * Fix contracts folder path inside deployment directory * Fix typo in e2e test and move contracts to test folder * remove unnecessary interaction with deployment folder * Fix contracts folder path inside deployment directory * add testing contracts * merge from development * fix sed rule * remove store of L@_DIVA_TOKEN * Improve README file * add readme * fix typo * add readme * change folder structure * Update script/swap_and_bridge/README.md Co-authored-by: Matjaz Verbole <[email protected]> --------- Co-authored-by: Franco NG <[email protected]> Co-authored-by: Matjaz Verbole <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was the problem?
This PR resolves #160.
How was it solved?
When Airdrop contract is deployed, Merkle root is set automatically inside the script.
How was it tested?
Airdrop contract was deployed and Merkle root was set inside the script.
https://sepolia-blockscout.lisk.com/address/0x63c0Bb58c6ccc5b0b35Df20Cefa7EBF5A99A26a6