Fix: Remove IncreaseAllowance & Add shared nonce (#1) #43
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
|
I would probably have split this PR into two separate PRs for the two main changes here, but for the sake of time, we'll just use this single PR here. |
cryptphil
requested changes
Jan 12, 2024
There was a problem hiding this comment.
I have some other remarks to the ERC20 Depositor, which I will just fix in a different branch in perun-network and will then create another PR there.
Edit: I'm not really able to write my suggestions as there are some more uncertainties regarding the implementation, so I'll add my questions in this PR.
cryptphil
reviewed
Jan 12, 2024
cryptphil
reviewed
Jan 12, 2024
cryptphil
reviewed
Jan 12, 2024
cryptphil
reviewed
Jan 12, 2024
cryptphil
reviewed
Jan 12, 2024
cryptphil
reviewed
Jan 12, 2024
channel/erc20_depositor.go
Outdated
| tx2, err := assetholder.Deposit(opts, req.FundingID, req.Balance) | ||
| err = cherrors.CheckIsChainNotReachableError(err) | ||
| return []*types.Transaction{tx1, tx2}, errors.WithMessage(err, "AssetHolderERC20 depositing") | ||
| return tx2, err |
cryptphil
reviewed
Jan 12, 2024
channel/erc20_depositor.go
Outdated
| var err1 error | ||
| lockAndUnlock(lock, func() { | ||
| allowance, err := token.Allowance(&callOpts, req.Account.Address, req.Asset.EthAddress()) | ||
| if err != nil { |
There was a problem hiding this comment.
If any of these ifs should be true, which means that an error has occurred, the function will still continue to execute
cryptphil
reviewed
Jan 19, 2024
cryptphil
reviewed
Jan 19, 2024
cryptphil
reviewed
Jan 19, 2024
cryptphil
reviewed
Jan 19, 2024
cryptphil
approved these changes
Feb 2, 2024
* channel: Include shared Nonce object, incrementing the nonce of an account while the transaction is broadcast. Implement sync.Mutex, locking the nonce incrementals. In erc20_depositor.go, the depositing process is locked during the "Approve" function call with ```lockKey```. The function ```(d *ERC20Depositor) Deposit``` is renamed to `````(d *ERC20Depositor) DepositOnly` * client: To avoid timeouts caused by the added locking mechanism during ERC20 deposits, ```context.WithTimeout``` and ```twoPartyTestTimeout``` has been increased in fund_test.go and payment_test.go. * client/test: Timeouts have been increased to avoid premature timeout errors due to the locking mechanism above. --------- Signed-off-by: Ilja von Hoessle <ilja@perun.network> Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
Remove unused SharedNonceMtx. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
refactor(erc20_depositor): - Create seperate function for Approval. - Rename lock and mutex. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
- Add description to Approve function. - Put Error as last return element in Approve function. fix(erc20_depositor): - remove unnecessary locking of depositLocksMtx. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
Fix comment and Argument order for Linter. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
Co-authored-by: Philipp Lehwalder <philipp.lehwalder@gmail.com> Signed-off-by: Sophia <118169531+sophia1ch@users.noreply.github.com>
- Change SharedMutex to SharedExpectedNoncesMutex. refactor(erc20_depositor): - Return directly if Approval returns error. - Fix comments. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
Change position of bracket. Signed-off-by: sophia1ch <sophia.koehler@outlook.com>
|
This PR enables Perun clients to
|
Closed
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.
This PR fixes #41 and modifies the depositing mechanism of the Ethereum backend for ERC20 assets. Both changes enable the backend to handle multiple payment channels for one Perun client.