From 34c8c9a89251ee8135263d31cc5b9ebae9c74a4a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 22 Feb 2022 16:07:01 +0100 Subject: [PATCH] perform afterTokrnTransfer hooks before acceptance check --- contracts/token/ERC1155/ERC1155.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/token/ERC1155/ERC1155.sol b/contracts/token/ERC1155/ERC1155.sol index bc3de9ce160..a9a61984201 100644 --- a/contracts/token/ERC1155/ERC1155.sol +++ b/contracts/token/ERC1155/ERC1155.sol @@ -181,9 +181,9 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI { emit TransferSingle(operator, from, to, id, amount); - _doSafeTransferAcceptanceCheck(operator, from, to, id, amount, data); - _afterTokenTransfer(operator, from, to, ids, amounts, data); + + _doSafeTransferAcceptanceCheck(operator, from, to, id, amount, data); } /** @@ -224,9 +224,9 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI { emit TransferBatch(operator, from, to, ids, amounts); - _doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, amounts, data); - _afterTokenTransfer(operator, from, to, ids, amounts, data); + + _doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, amounts, data); } /** @@ -280,9 +280,9 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI { _balances[id][to] += amount; emit TransferSingle(operator, address(0), to, id, amount); - _doSafeTransferAcceptanceCheck(operator, address(0), to, id, amount, data); - _afterTokenTransfer(operator, address(0), to, ids, amounts, data); + + _doSafeTransferAcceptanceCheck(operator, address(0), to, id, amount, data); } /** @@ -313,9 +313,9 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI { emit TransferBatch(operator, address(0), to, ids, amounts); - _doSafeBatchTransferAcceptanceCheck(operator, address(0), to, ids, amounts, data); - _afterTokenTransfer(operator, address(0), to, ids, amounts, data); + + _doSafeBatchTransferAcceptanceCheck(operator, address(0), to, ids, amounts, data); } /**