refactor and fix: addressing recent changes #62
Conversation
kupermind
commented
Dec 23, 2024
kupermind
commented
- Addressing recent changes.
| @@ -35,7 +35,14 @@ contract BalanceTrackerFixedPriceNative is BalanceTrackerFixedPriceBase { | |||
| wrappedNativeToken = _wrappedNativeToken; | |||
| } | |||
|
|
|||
| function _checkNativeValue() internal virtual override {} | |||
| function _getOrRestrictNativeValue() internal virtual override returns (uint256) { | |||
There was a problem hiding this comment.
This is the current refactor of incoming payment.
| } | ||
|
|
||
| function _getRequiredFunds(address requester, uint256 balanceDiff) internal virtual override returns (uint256) { | ||
| // TODO check balances before and after | ||
| uint256 balanceBefore = IToken(olas).balanceOf(address(this)); |
There was a problem hiding this comment.
Additional check, although with OLAS it's pretty much safe by default.
| // Get salt | ||
| bytes32 salt = keccak256(abi.encode(block.timestamp, msg.sender, serviceId)); | ||
| bytes32 salt = keccak256(abi.encode(block.timestamp, msg.sender, serviceId, localNonce)); |
There was a problem hiding this comment.
Adding nonce as per audit suggestion
| @@ -5,13 +5,16 @@ import {OlasMech} from "./OlasMech.sol"; | |||
|
|
|||
| /// @title MechFixedPriceToken - Smart contract for OlasMech that accepts a fixed price payment for services in native token. | |||
| contract MechFixedPriceToken is OlasMech { | |||
| // keccak256(FixedPriceToken) = 3679d66ef546e66ce9057c4a052f317b135bc8e8c509638f7966edfd4fcf45e9 | |||
| bytes32 public constant PAYMENT_TYPE = 0x3679d66ef546e66ce9057c4a052f317b135bc8e8c509638f7966edfd4fcf45e9; | |||
There was a problem hiding this comment.
Hashing approach always wins :). Although in this case it feels like we maybe need to call it FixedPriceOlas? Either way is fine.
There was a problem hiding this comment.
hm I think the token can be different kinds for the same factory contract (different factory instance) no?
There was a problem hiding this comment.
Makes sense, maybe encode it on a level of factory? There we can combine FixedPriceToken + token address or anything else.
There was a problem hiding this comment.
Hm, I'll think about it.
| // Increase the amount of mech delivery counts | ||
| mapAgentMechDeliveryCounts[msg.sender]++; | ||
| mapMechDeliveryCounts[msg.sender]++; | ||
| // Increase the amount of mech service multisig delivered requests | ||
| mapMechServiceDeliveryCounts[mechServiceMultisig]++; |
There was a problem hiding this comment.
We still need both - one is for mech statistics, another is for multisig activity tracker.
| /// @dev Gets the requests count for a specific account. | ||
| /// @param account Account address. | ||
| /// @return Requests count. | ||
| function getRequestsCount(address account) external view returns (uint256) { |
There was a problem hiding this comment.
Default ABI is enough
