feat: support erc1155. Impl Batcher for supporting erc721/erc1155 in batch #16

nxqbao · 2024-03-18T11:18:54Z

Description

Side Batcher for handle batcher request

Checklist

I have clearly commented on all the main functions following the NatSpec Format
The box that allows repo maintainers to update this PR is checked
I tested locally to make sure this feature/fix works

src/libraries/LibRequestBatch.sol

src/libraries/LibTokenInfoBatch.sol

src/libraries/LibTokenOwner.sol

TuDo1403 · 2024-04-01T10:10:06Z

src/mainchain/MainchainGatewayBatcher.sol

+    request.info.handleAssetIn(msg.sender, request.tokenAddr, fHandleAssetIn);
+
+    // Approve all tokens from this Batcher to the actual Gateway
+    IERC721(request.tokenAddr).setApprovalForAll(address(_mainchainGateway), true);


this share same interface with IERC1155, please rewrite for clarity

src/mainchain/MainchainGatewayV3.sol

src/ronin/gateway/RoninGatewayV3.sol

src/libraries/LibTokenInfo.sol

src/libraries/LibTokenInfoBatch.sol

Co-authored-by: tu-do.ron <[email protected]> Signed-off-by: Bao <[email protected]>

nxqbao added 30 commits March 13, 2024 11:52

fix(Token): nit prettier Token lib

5078d3e

fix(Token): rename _ for internal lib

cb1706f

fix(Owner): move TokenOwner to a separate lib

079fa61

fix(Info): move to LibTokenInfo

c7751f5

fix(Info): add two array fields for info

d4c7a9b

fix(Info): validate erc1155 and erc721 batch

77396ac

fix(Info): add router

8d0becb

fix(Info): restrict scope of tryTransfer to private

68b9c86

feat(Info): support hash batch

6efc05a

fix(Info): move helpers to EoF

66b166a

fix(Info): refactor handleAssetTransfer

eb9a888

feat(Info): rename transferFrom to handleTransferFrom

fe51f39

fix(Info): rename to ERC1155Batch

f65c25d

fix(Info): return instead of nested if-else

5090262

feat(Info): impl transfer1155

ec8adac

feat(Info): mint and transfer 1155 in batch

87c1c15

fix(Gateway): rename tranferFrom to handleAssetIn

a9649a5

fix((Info): rework the transfer methods

f722a9c

fix(Info): transfer in ERC721 by private method

bb4d8b9

fix(Info): support ERC721Batch

69df309

fix(Info): chore: update docs

3d39232

fix(Info): fix validation

e9d6435

test: add test for ERC721 Batch

2ca888e

fea(GatewayBatcher): init commit

4e04462

feat(GatewayBatcher): separate to two -Batch lib

7d7c5d5

feat(GatewayBatcher): refactor by dispatcher

65bbf4c

feat(TokenInfo): remove batch action in legacy TokenInfo

a0e0e36

feat(GatewayBatcher): fix validation erc1155

7a8e1ef

test(GatewayBatcher): init first 1155 batch test

d5aca70

feat(*Gateway): inherit ERC1155Holder

a8ca9ee

test(ERC1155): fix the first test

9b8fc4a