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

PP-567 Migrate Withdraw Task #93

Conversation

ironFe93
Copy link
Contributor

@ironFe93 ironFe93 commented Nov 16, 2022

What

Migrate withdraw task to hardhat version. Also includes reorganization of the repo and removal of unused files.

Why

  • to stick with the tooling that hardhat gives us

Refs

  • (optional: include links to other issues, PRs, tickets, etc)

@ironFe93 ironFe93 changed the title feat: new hardhat task PP-567 Migrate Withdraw Task Nov 18, 2022
@ironFe93 ironFe93 force-pushed the feature/PP-567/migrate-withdraw-task branch from f32355f to 0489164 Compare November 22, 2022 12:10
@ironFe93
Copy link
Contributor Author

ironFe93 commented Nov 22, 2022

Needs to be rebased, waiting for #95 and #97

@ironFe93 ironFe93 marked this pull request as ready for review November 22, 2022 12:12
@antomor antomor requested a review from a team November 22, 2022 22:18
scripts/withdraw.ts Outdated Show resolved Hide resolved
hardhat.config.ts Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
Copy link
Collaborator

@antomor antomor left a comment

Choose a reason for hiding this comment

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

@ironFe93 Apart from the comments left, I'd also remove the file tasks/withdraw.js if not necessary.

package.json Outdated Show resolved Hide resolved
scripts/withdraw.ts Outdated Show resolved Hide resolved
hardhat.config.ts Outdated Show resolved Hide resolved
hardhat.config.ts Outdated Show resolved Hide resolved
scripts/withdraw.ts Outdated Show resolved Hide resolved
test/scripts/withdraw.test.ts Outdated Show resolved Hide resolved
@ironFe93 ironFe93 force-pushed the feature/PP-567/migrate-withdraw-task branch from d1d64b8 to 0ac206f Compare November 24, 2022 13:58
@ironFe93 ironFe93 force-pushed the feature/PP-567/migrate-withdraw-task branch from 0ac206f to 09b5274 Compare November 24, 2022 14:09
Readme.md Outdated
@@ -44,38 +44,24 @@ The project is ready to be used at this point.
The contracts can be deployed in the following way:

1. Configure the `hardhat.config.ts` file on the root of the project to set your network
2. Run `npm run deploy <NETWORK_NAME>`
2. Run `npx run deploy --network <NETWORK_NAME>`
Copy link
Collaborator

Choose a reason for hiding this comment

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

shouldn't this be

Suggested change
2. Run `npx run deploy --network <NETWORK_NAME>`
2. Run `npx hardhat deploy --network <NETWORK_NAME>`

@@ -1,23 +0,0 @@
{
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wouldn't remove this sample file, because it may simplify the usage.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was removed by mistake

@@ -105,6 +106,14 @@ task('allowed-tokens', 'Retrieves a list of allowed tokens')
await getAllowedTokens(hre);
}
);
task('collector:withdraw', 'Withdraws funds from a collector contract')
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd include an empty line before

@ironFe93 ironFe93 merged commit 8746dfa into feature/PP-278/PP-329/upgrade_contracts Nov 25, 2022
antomor added a commit that referenced this pull request Nov 30, 2022
* 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>
@antomor antomor deleted the feature/PP-567/migrate-withdraw-task branch January 5, 2023 09:25
antomor pushed a commit that referenced this pull request Jan 26, 2023
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>
antomor pushed a commit that referenced this pull request Jan 26, 2023
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>
antomor added a commit that referenced this pull request Jan 27, 2023
* 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>
antomor added a commit that referenced this pull request Feb 3, 2023
* 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>
antomor added a commit that referenced this pull request Feb 6, 2023
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>
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.

None yet

3 participants