Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions contracts/v2/FiatTokenUtil.sol
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,11 @@ contract FiatTokenUtil {
address addr1;
address addr2;
assembly {
addr1 := mload(add(packed, 20))
addr2 := mload(add(packed, 40))
// Account for 32-byte length prefix in memory
// First address starts at offset 32 (after length field)
addr1 := mload(add(packed, 32))
// Second address starts at offset 52 (32 + 20 bytes of first address)
addr2 := mload(add(packed, 52))
}
return abi.encode(addr1, addr2);
}
Expand Down
8 changes: 4 additions & 4 deletions contracts/v2/NativeFiatTokenV2_2.sol
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ contract NativeFiatTokenV2_2 is FiatTokenV2_2 {
uint256 validBefore,
bytes32 nonce,
bytes memory signature
) external virtual override whenNotPaused {
) external virtual override whenNotPaused notBlacklisted(from) notBlacklisted(to) {
_transferWithAuthorization(
from,
to,
Expand Down Expand Up @@ -341,7 +341,7 @@ contract NativeFiatTokenV2_2 is FiatTokenV2_2 {
uint256 validBefore,
bytes32 nonce,
bytes memory signature
) external virtual override whenNotPaused {
) external virtual override whenNotPaused notBlacklisted(from) notBlacklisted(to) {
_receiveWithAuthorization(
from,
to,
Expand Down Expand Up @@ -375,7 +375,7 @@ contract NativeFiatTokenV2_2 is FiatTokenV2_2 {
uint8 v,
bytes32 r,
bytes32 s
) external virtual override whenNotPaused {
) external virtual override whenNotPaused notBlacklisted(from) notBlacklisted(to) {
_transferWithAuthorization(
from,
to,
Expand Down Expand Up @@ -413,7 +413,7 @@ contract NativeFiatTokenV2_2 is FiatTokenV2_2 {
uint8 v,
bytes32 r,
bytes32 s
) external virtual override whenNotPaused {
) external virtual override whenNotPaused notBlacklisted(from) notBlacklisted(to) {
_receiveWithAuthorization(
from,
to,
Expand Down