PP-566: migrate script deploy collector #95

AndresQuijano · 2022-11-16T22:21:15Z

What

Migrates the script to deploy to collector to use Hardhat and Ethers.js

Why

Modernization of the project

Refs

-PP-566

… Ethers.js

contracts/RelayHub.sol

-    {
+    function penalize(
+        address relayWorker,
+        address payable beneficiary


contracts/smartwallet/CustomSmartWallet.sol

-        returns (bool success, bytes memory ret)
-    {
+    function directExecute(
+        address to,


contracts/smartwallet/SmartWallet.sol

-        returns (bool success, bytes memory ret)
-    {
+    function directExecute(
+        address to,


contracts/Collector.sol

-        noBalanceToShare
-    {
+    function updateRemainderAddress(
+        address remainderAddress


hardhat.config.ts

package.json

hardhat.config.ts

… output file

antomor · 2022-11-22T22:15:40Z

All the changes to the solidity contracts are related to formatting rules. No logic has been changed there.

scripts/deployCollector.ts

package.json

scripts/deployCollector.ts

test/scripts/deployCollector.test.ts

scripts/deployCollector.ts

hardhat.config.ts

Readme.md

hardhat.config.ts

scripts/deployCollector.ts

package.json

ironFe93

--network option is missing in the package.json

edit: network CAN be specified without previously including the --network flag in the package json.

Remove some scripts from the package.json Use console.table to print the collector output Rename the input config file parameter

antomor · 2022-11-23T16:12:43Z

@franciscotobar: I applied the renaming of the input param.
@ironFe93: I decided to remove some tasks from the package.json because there was no point to have them there.
@jurajpiar I changed the way we log the output information, but we still use the old way to build the factory. Some tests were failing and that change may require some additional investigation.
Could you please review the changes? 🙏🏼

ironFe93

agree on removing stuff from package json

ironFe93 · 2022-11-23T16:55:15Z

package.json

@@ -65,9 +63,9 @@
    "ci:test": "npm run test",
    "clean": "rm -rf typechain-types cache bin dist artifacts contracts-exposed",
    "postclean": "hardhat clean",
+    "collector:deploy": "hardhat deploy-collector",
    "compile": "npm run clean && hardhat compile --force",
    "deploy": "hardhat deploy --network",


Agree with not cluttering the package json with scripts. Shouldn't the 'deploy' script also be removed from here?

I wasn't unsure about it. WDYT?

It falls under the same category as all other tasks, so yes, we could remove it.

jurajpiar

LG

* feat: dummy commit, create empty deployCollector.ts file * refactor: add script and task to deploy a Collector using Hardhat and Ethers.js * style: apply format rules * test: add the tests, remove the positional arguments and simplify the output file * fix: apply PR suggestions Remove some scripts from the package.json Use console.table to print the collector output Rename the input config file parameter Co-authored-by: Antonio Morrone <antonio@iovlabs.org>

feat(upgrade): re-create project with hardhat & ethers removing truffle and web3 chore: re-adds contracts chore: adds dev rules chore(contracts): fixes solidity lint errors chore(test): re-adds tests chore(upgrade): adds deployment tools chore(upgrade): add smock for contract mocking chore(upgrade): removes sol tests chore(upgrade): fixe pre-commit and update readme chore(upgrade): add more eslint rules chore(deps): move typechain to deps chore(upgrade): unignore dist from npm i chore(ethers): return util token for manual testing 👿 PP-565: migrate the removeTokens script to use Hardhat and Ethers.js (#92) * refactor: migrate the removeTokens script to use Hardhat and Ethers.js * fix: fix the task in hardhat.config, update Readme and apply format Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-566: migrate script deploy collector (#95) * feat: dummy commit, create empty deployCollector.ts file * refactor: add script and task to deploy a Collector using Hardhat and Ethers.js * style: apply format rules * test: add the tests, remove the positional arguments and simplify the output file * fix: apply PR suggestions Remove some scripts from the package.json Use console.table to print the collector output Rename the input config file parameter Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-569: migrate change partners (#97) * chore: change package.json version * feat: migrate the change-partners script to use ether.js * fix: change the parseJsonFile function to return undefined * fix: apply PR suggestions * Revert "style: include automatically formatted solidity files" This reverts commit 76ee863. * fix: remove the script from package.json and update Readme.md * style: apply formatting rules PP-567 Migrate Withdraw Task (#93) * feat: new hardhat task * feat: create withdraw task * chore: update readme * feat: complete withdrawal task and tests * chore: linted * fix: no from parameter on withdraw * chore: change readme, description of task * feat: reorganize tasks and tests * fix: restore .prepare script * fix: typo on script * fix: restore file permissions * fix: prettier issues, no waffle json file * fix: no prepare task * chore: remove unneeded rules * fix: change Readme.md to fix the command instruction * fix: restore the collector:deploy sample config file Co-authored-by: Christos Otarola <christos@Christoss-MacBook-Pro.local> Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-355/update-rif-relay-server (#96) * refactor(index): expose typing for relay-server * refactor: prettier fix: fix the collector and add the missing tests Fix the collector updateRemainderAddress Include the missing test for the stakeForAddress method fix: add config to use custom signers to run scripts (#106) feat: expiration mechanism (#105) * feat: expiration mechanism * fix: FWD to SW * feat: validate time on deploy Co-authored-by: Christos Otarola <christos@Christoss-MacBook-Pro.local> PP-602/RelayClient: _validateSmartWallet (#109) * refactor(SmartWallet): expose getOwner * refactor(index): expose PromiseOrValue * chore: github workflow PP-358: include the contracts in dist (#112) * fix: remove contracts from npmignore * chore: rename .prettierrc to prettier.json5 to be consistent among all the repos PP-357: Add a task to mint utility tokens (#113) * feat: add a task to mint utility tokens * fix: apply linting and format to tasks * refactor: expose RelayHubInterface * docs: readme Co-authored-by: Francisco Tobar <francisco.tobar@iovlabs.org>

* chore(ethers): change to ethers and updgrade dependencies feat(upgrade): re-create project with hardhat & ethers removing truffle and web3 chore: re-adds contracts chore: adds dev rules chore(contracts): fixes solidity lint errors chore(test): re-adds tests chore(upgrade): adds deployment tools chore(upgrade): add smock for contract mocking chore(upgrade): removes sol tests chore(upgrade): fixe pre-commit and update readme chore(upgrade): add more eslint rules chore(deps): move typechain to deps chore(upgrade): unignore dist from npm i chore(ethers): return util token for manual testing 👿 PP-565: migrate the removeTokens script to use Hardhat and Ethers.js (#92) * refactor: migrate the removeTokens script to use Hardhat and Ethers.js * fix: fix the task in hardhat.config, update Readme and apply format Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-566: migrate script deploy collector (#95) * feat: dummy commit, create empty deployCollector.ts file * refactor: add script and task to deploy a Collector using Hardhat and Ethers.js * style: apply format rules * test: add the tests, remove the positional arguments and simplify the output file * fix: apply PR suggestions Remove some scripts from the package.json Use console.table to print the collector output Rename the input config file parameter Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-569: migrate change partners (#97) * chore: change package.json version * feat: migrate the change-partners script to use ether.js * fix: change the parseJsonFile function to return undefined * fix: apply PR suggestions * Revert "style: include automatically formatted solidity files" This reverts commit 76ee863. * fix: remove the script from package.json and update Readme.md * style: apply formatting rules PP-567 Migrate Withdraw Task (#93) * feat: new hardhat task * feat: create withdraw task * chore: update readme * feat: complete withdrawal task and tests * chore: linted * fix: no from parameter on withdraw * chore: change readme, description of task * feat: reorganize tasks and tests * fix: restore .prepare script * fix: typo on script * fix: restore file permissions * fix: prettier issues, no waffle json file * fix: no prepare task * chore: remove unneeded rules * fix: change Readme.md to fix the command instruction * fix: restore the collector:deploy sample config file Co-authored-by: Christos Otarola <christos@Christoss-MacBook-Pro.local> Co-authored-by: Antonio Morrone <antonio@iovlabs.org> PP-355/update-rif-relay-server (#96) * refactor(index): expose typing for relay-server * refactor: prettier fix: fix the collector and add the missing tests Fix the collector updateRemainderAddress Include the missing test for the stakeForAddress method fix: add config to use custom signers to run scripts (#106) feat: expiration mechanism (#105) * feat: expiration mechanism * fix: FWD to SW * feat: validate time on deploy Co-authored-by: Christos Otarola <christos@Christoss-MacBook-Pro.local> PP-602/RelayClient: _validateSmartWallet (#109) * refactor(SmartWallet): expose getOwner * refactor(index): expose PromiseOrValue * chore: github workflow PP-358: include the contracts in dist (#112) * fix: remove contracts from npmignore * chore: rename .prettierrc to prettier.json5 to be consistent among all the repos PP-357: Add a task to mint utility tokens (#113) * feat: add a task to mint utility tokens * fix: apply linting and format to tasks * refactor: expose RelayHubInterface * docs: readme Co-authored-by: Francisco Tobar <francisco.tobar@iovlabs.org> * fix: apply format and lint rules --------- Co-authored-by: Francisco Tobar <francisco.tobar@iovlabs.org> Co-authored-by: Antonio Morrone <antonio@iovlabs.org>

feat(upgrade): re-create project with hardhat & ethers removing truffle and web3 * PP-565: migrate the removeTokens script to use Hardhat and Ethers.js (#92) * fix: fix the task in hardhat.config, update Readme and apply format * PP-566: migrate script deploy collector (#95) * test: add the tests, remove the positional arguments and simplify the output file * Rename the input config file parameter * PP-569: migrate change partners (#97) * chore: change package.json version * feat: migrate the change-partners script to use ether.js * fix: change the parseJsonFile function to return undefined * fix: apply PR suggestions * fix: remove the script from package.json and update Readme.md * PP-567 Migrate Withdraw Task (#93) * feat: new hardhat task * feat: create withdraw task * feat: complete withdrawal task and tests * fix: no from parameter on withdraw * feat: reorganize tasks and tests * fix: restore .prepare script * fix: no prepare task * chore: remove unneeded rules * fix: change Readme.md to fix the command instruction * fix: restore the collector:deploy sample config file * PP-355/update-rif-relay-server (#96) * refactor(index): expose typing for relay-server * fix: fix the collector and add the missing tests * Fix the collector updateRemainderAddress * Include the missing test for the stakeForAddress method * fix: add config to use custom signers to run scripts (#106) * feat: expiration mechanism (#105) * feat: expiration mechanism * feat: validate time on deploy * PP-602/RelayClient: _validateSmartWallet (#109) * refactor(SmartWallet): expose getOwner * refactor(index): expose PromiseOrValue * chore: github workflow * PP-358: include the contracts in dist (#112) * fix: remove contracts from npmignore * PP-357: Add a task to mint utility tokens (#113) * feat: add a task to mint utility tokens * fix: apply linting and format to tasks * refactor: expose RelayHubInterface * docs: readme * 2.0.0-beta.0 * fix: replace master with main on codeql workflow (#116) * fix: comment the NativeHolderSmartWallet unit tests and fix IForwarder --------- Co-authored-by: Antonio Morrone <antonio@iovlabs.org> Co-authored-by: Juraj <juraj.piar@icloud.com> Co-authored-by: Francisco Tobar <francisco.tobar@iovlabs.org> Co-authored-by: Christos Otarola <christos@Christoss-MacBook-Pro.local>

antomor mentioned this pull request Nov 18, 2022

PP-569: migrate change partners #97

Merged

AndresQuijano and others added 3 commits November 22, 2022 09:46

feat: dummy commit, create empty deployCollector.ts file

093d5d6

refactor: add script and task to deploy a Collector using Hardhat and…

0afe173

… Ethers.js

style: apply format rules

f2d637d

antomor force-pushed the PP566/migrate_script_deploy_collector branch from d5a4d5b to f2d637d Compare November 22, 2022 08:53

github-advanced-security bot found potential problems Nov 22, 2022

View reviewed changes

ironFe93 mentioned this pull request Nov 22, 2022

PP-567 Migrate Withdraw Task #93

Merged

antomor requested changes Nov 22, 2022

View reviewed changes

hardhat.config.ts Outdated Show resolved Hide resolved

package.json Outdated Show resolved Hide resolved

hardhat.config.ts Outdated Show resolved Hide resolved

test: add the tests, remove the positional arguments and simplify the…

e1a2be1

… output file

antomor marked this pull request as ready for review November 22, 2022 22:14

antomor assigned antomor and AndresQuijano Nov 22, 2022

antomor requested review from a team and ironFe93 November 22, 2022 22:16

jurajpiar reviewed Nov 22, 2022

View reviewed changes

scripts/deployCollector.ts Show resolved Hide resolved

jurajpiar reviewed Nov 22, 2022

View reviewed changes

package.json Show resolved Hide resolved

AndresQuijano commented Nov 23, 2022

View reviewed changes

scripts/deployCollector.ts Outdated Show resolved Hide resolved

AndresQuijano commented Nov 23, 2022

View reviewed changes

test/scripts/deployCollector.test.ts Show resolved Hide resolved

jurajpiar reviewed Nov 23, 2022

View reviewed changes

scripts/deployCollector.ts Outdated Show resolved Hide resolved

jurajpiar reviewed Nov 23, 2022

View reviewed changes

hardhat.config.ts Outdated Show resolved Hide resolved

franciscotobar reviewed Nov 23, 2022

View reviewed changes

Readme.md Outdated Show resolved Hide resolved

franciscotobar reviewed Nov 23, 2022

View reviewed changes

hardhat.config.ts Outdated Show resolved Hide resolved

franciscotobar reviewed Nov 23, 2022

View reviewed changes

scripts/deployCollector.ts Outdated Show resolved Hide resolved

franciscotobar reviewed Nov 23, 2022

View reviewed changes

scripts/deployCollector.ts Outdated Show resolved Hide resolved

franciscotobar reviewed Nov 23, 2022

View reviewed changes

scripts/deployCollector.ts Outdated Show resolved Hide resolved

ironFe93 reviewed Nov 23, 2022

View reviewed changes

package.json Show resolved Hide resolved

ironFe93 suggested changes Nov 23, 2022

View reviewed changes

ironFe93 approved these changes Nov 23, 2022

View reviewed changes

fix: apply PR suggestions

38e93ad

Remove some scripts from the package.json Use console.table to print the collector output Rename the input config file parameter

antomor requested review from jurajpiar and franciscotobar November 23, 2022 16:17

ironFe93 approved these changes Nov 23, 2022

View reviewed changes

jurajpiar approved these changes Nov 24, 2022

View reviewed changes

antomor approved these changes Nov 24, 2022

View reviewed changes

antomor merged commit e0ff1a6 into feature/PP-278/PP-329/upgrade_contracts Nov 24, 2022

antomor deleted the PP566/migrate_script_deploy_collector branch November 24, 2022 13:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PP-566: migrate script deploy collector #95

PP-566: migrate script deploy collector #95

AndresQuijano commented Nov 16, 2022

antomor commented Nov 22, 2022

ironFe93 left a comment •

edited

antomor commented Nov 23, 2022

ironFe93 left a comment

ironFe93 Nov 23, 2022

antomor Nov 23, 2022

ironFe93 Nov 23, 2022

jurajpiar left a comment

PP-566: migrate script deploy collector #95

PP-566: migrate script deploy collector #95

Conversation

AndresQuijano commented Nov 16, 2022

What

Why

Refs

antomor commented Nov 22, 2022

ironFe93 left a comment • edited

Choose a reason for hiding this comment

antomor commented Nov 23, 2022

ironFe93 left a comment

Choose a reason for hiding this comment

ironFe93 Nov 23, 2022

Choose a reason for hiding this comment

antomor Nov 23, 2022

Choose a reason for hiding this comment

ironFe93 Nov 23, 2022

Choose a reason for hiding this comment

jurajpiar left a comment

Choose a reason for hiding this comment

ironFe93 left a comment •

edited