Withdraw ERC1155 and EVM based chains support added for NFT PoC #1704

laruh · 2023-03-09T12:25:28Z

related to #900

implements withdraw_erc1155 method
support for Avalanche, Fantom, Polygon chains was added. Use uppercase for chain names.

If there is no amount param for withdraw_nft, amount = 1 by default.

withdraw_nft req for ERC1155 token without amount param

{
  "userpass": "'$USERPASS'",
  "method": "withdraw_nft",
  "mmrpc": "2.0",
  "params": {
    "type": "WithdrawErc1155",
    "withdraw_data": {
      "chain": "POLYGON",
      "from": "0xf622a6C52C94b500542E2AE6bcAD24C53Bc5b6a2",
      "to": "0x6FAD0eC6bb76914b2a2a800686acc22970645820",
      "token_address": "0x48c75fbf0452fa8ff2928ddf46b0fe7629cca2ff",
      "token_id": "5"
    }
  }
}

withdraw_nft res for ERC1155 token without amount param

{
  "mmrpc": "2.0",
  "result": {
    "tx_hex": "f9014c808526f52f5416830109b49448c75fbf0452fa8ff2928ddf46b0fe7629cca2ff80b8e4f242432a000000000000000000000000f622a6c52c94b500542e2ae6bcad24c53bc5b6a20000000000000000000000006fad0ec6bb76914b2a2a800686acc229706458200000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000023078000000000000000000000000000000000000000000000000000000000000820136a0f8b50c8a98ac1b550aad13532e999ad128343f10d4269a64de242fb4c338c42aa022fbdb9a7570ef8513ab7654e49beb71a20372aec4c61e3d85ec7a81403f6f3a",
    "tx_hash": "fe8d5fc480c534625d7e6fc81eadff8b8f6c986cd46f00d5993b6e21d6bd28c9",
    "from": [
      "0xf622a6C52C94b500542E2AE6bcAD24C53Bc5b6a2"
    ],
    "to": [
      "0x6FAD0eC6bb76914b2a2a800686acc22970645820"
    ],
    "contract_type": "ERC1155",
    "token_address": "0x48c75fbf0452fa8ff2928ddf46b0fe7629cca2ff",
    "token_id": "5",
    "amount": "1",
    "fee_details": {
      "type": "Eth",
      "coin": "MATIC",
      "gas": 68020,
      "gas_price": "0.000000167322276886",
      "total_fee": "0.01138126127378572"
    },
    "coin": "MATIC",
    "block_height": 0,
    "timestamp": 1678269896,
    "internal_id": 0,
    "transaction_type": "NftTransfer"
  },
  "id": null
}

send_raw_transaction req

{
  "method": "send_raw_transaction",
  "coin": "MATIC",
  "tx_hex": "f9014c808526f52f5416830109b49448c75fbf0452fa8ff2928ddf46b0fe7629cca2ff80b8e4f242432a000000000000000000000000f622a6c52c94b500542e2ae6bcad24c53bc5b6a20000000000000000000000006fad0ec6bb76914b2a2a800686acc229706458200000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000023078000000000000000000000000000000000000000000000000000000000000820136a0f8b50c8a98ac1b550aad13532e999ad128343f10d4269a64de242fb4c338c42aa022fbdb9a7570ef8513ab7654e49beb71a20372aec4c61e3d85ec7a81403f6f3a",
  "userpass": "'$USERPASS'"
}

send_raw_transaction res

{"tx_hash":"fe8d5fc480c534625d7e6fc81eadff8b8f6c986cd46f00d5993b6e21d6bd28c9"}

polygonscan result

Another withdraw_nft request example with max param.

withdraw_nft req for ERC1155 with max:true

{
  "userpass": "'$USERPASS'",
  "method": "withdraw_nft",
  "mmrpc": "2.0",
  "params": {
    "type": "WithdrawErc1155",
    "withdraw_data": {
      "chain": "POLYGON",
      "from": "0xf622a6C52C94b500542E2AE6bcAD24C53Bc5b6a2",
      "to": "0x6FAD0eC6bb76914b2a2a800686acc22970645820",
      "token_address": "0x48c75fbf0452fa8ff2928ddf46b0fe7629cca2ff",
      "token_id": "5",
      "max": true
    }
  }
}

withdraw_nft res for ERC1155 with max:true

{
  "mmrpc": "2.0",
  "result": {
    "tx_hex": "f9014c01852c61bc8e85830109b49448c75fbf0452fa8ff2928ddf46b0fe7629cca2ff80b8e4f242432a000000000000000000000000f622a6c52c94b500542e2ae6bcad24c53bc5b6a20000000000000000000000006fad0ec6bb76914b2a2a800686acc229706458200000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000023078000000000000000000000000000000000000000000000000000000000000820136a0af066015590d840579baf398c4bd5e46b2dd71daaa3eae5fbb9909e30834edeea02ba9754f643571920eec1cab076f5f74e1cb5e2879d6fdaea7f90d8e43505655",
    "tx_hash": "9c32db57fdcfd0ccdae193c895cf709aaac5aef1582da825579ddbb831c1f700",
    "from": [
      "0xf622a6C52C94b500542E2AE6bcAD24C53Bc5b6a2"
    ],
    "to": [
      "0x6FAD0eC6bb76914b2a2a800686acc22970645820"
    ],
    "contract_type": "ERC1155",
    "token_address": "0x48c75fbf0452fa8ff2928ddf46b0fe7629cca2ff",
    "token_id": "5",
    "amount": "2",
    "fee_details": {
      "type": "Eth",
      "coin": "MATIC",
      "gas": 68020,
      "gas_price": "0.000000190618308229",
      "total_fee": "0.01296585732573658"
    },
    "coin": "MATIC",
    "block_height": 0,
    "timestamp": 1678351719,
    "internal_id": 0,
    "transaction_type": "NftTransfer"
  },
  "id": null
}

send_raw_transaction req

{
  "method": "send_raw_transaction",
  "coin": "MATIC",
  "tx_hex": "f9014c01852c61bc8e85830109b49448c75fbf0452fa8ff2928ddf46b0fe7629cca2ff80b8e4f242432a000000000000000000000000f622a6c52c94b500542e2ae6bcad24c53bc5b6a20000000000000000000000006fad0ec6bb76914b2a2a800686acc229706458200000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000023078000000000000000000000000000000000000000000000000000000000000820136a0af066015590d840579baf398c4bd5e46b2dd71daaa3eae5fbb9909e30834edeea02ba9754f643571920eec1cab076f5f74e1cb5e2879d6fdaea7f90d8e43505655",
  "userpass": "'$USERPASS'"
}

send_raw_transaction res

{"tx_hash":"9c32db57fdcfd0ccdae193c895cf709aaac5aef1582da825579ddbb831c1f700"}

polygonscan result

laruh · 2023-03-17T08:01:34Z

Q:Why do we have count field in NftList ?

Oh, it is from previous nft list / history struct versions, when there were different nft lists grouped by chain.
Since each Nft struct has Chain type field, it is not necessary to count nfts in chain groups, bcz we dont have such groups anymore.
I removed count from NftList and NftsTransferHistoryList.

…aw-erc1155

shamardy

Thanks you for the fixes! Next iteration

mm2src/coins/eth.rs

shamardy · 2023-03-21T20:06:28Z

mm2src/coins/eth.rs

+}
+
+#[cfg(feature = "enable-nft-integration")]
+fn get_valid_eth_withdraw_addresses(


get_valid_eth_withdraw_addresses is used only for NFT so the name should probably be more indicative of this. I actually think there should be a common implementation for both withdraw NFT functions that gets used in both withdraw_erc721, withdraw_erc1155 since there is a lot of common code between them, this will make this function not needed and the code below will be included in only the common withdraw NFT impl.
Please consider this refactor in the next PRs.

changed to get_valid_nft_add_to_withdraw.
Yeah, there is a need for refactoring, noted it

…aw-erc1155 # Conflicts: # mm2src/coins/eth.rs

shamardy

Great Work 🔥

Only a non-blocker below and this #1704 (comment)

mm2src/coins/eth.rs

laruh · 2023-03-23T09:19:21Z

@ozkanonur Hi, its ready for next review iteration.

onur-ozkan

LGTM, only a few 'not so important' suggestions

mm2src/coins/nft.rs

mm2src/coins/eth.rs

…aw-erc1155

shamardy

Re-approve

laruh added 30 commits January 20, 2023 18:52

wip

c142d97

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

b233d01

wip

df5212a

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

4a50218

wip some structures were added

6ed1ee8

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

853d289

wip

a7dc383

wip

55e11b7

wip

5653da3

fn get_my_address was moved into lp_coins.rs

28dac60

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

bd3ac54

wip get_my_address

2af943a

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

2cbbc23

get_my_address works

551f895

send_moralis_request, errors, get_nft_list wip

cd1e11c

add targets for send_moralis_request

f617e5d

wip

28f3e63

wip

db638e9

wip use fn slurp_req_body in fn send_moralis_request

5fc4e8e

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

fd2aaef

wip fix wasm

778dd60

wip cursor in get_nft_list

f83a9ff

wip impl Deserialize for Wrap

8636599

get_nft_list

a33be79

remove unnecessary notes

f9ad871

Merge remote-tracking branch 'origin/dev' into NFT-integration-poc

5bef9bf

wip get_nft_transfers

36798e9

get_nft_transfers works

91cf067

polish code

f5f19c7

polish code

7860331

laruh added under review and removed in progress Changes will be made from the author labels Mar 17, 2023

Merge remote-tracking branch 'origin/dev' into NFT-integration-withdr…

3f5ae06

…aw-erc1155

shamardy requested changes Mar 21, 2023

View reviewed changes

Merge remote-tracking branch 'origin/dev' into NFT-integration-withdr…

11eca9e

…aw-erc1155 # Conflicts: # mm2src/coins/eth.rs

laruh added in progress Changes will be made from the author and removed under review labels Mar 22, 2023

laruh added 2 commits March 22, 2023 12:35

fix merge conflicts

9963fe1

get_valid_nft_add_to_withdraw, use just bool for max

72a7846

laruh added under review and removed in progress Changes will be made from the author labels Mar 22, 2023

shamardy previously approved these changes Mar 22, 2023

View reviewed changes

mm2src/coins/eth.rs Outdated Show resolved Hide resolved

polish eth_value_for_estimate

9a8f33d

laruh dismissed shamardy’s stale review via 9a8f33d March 23, 2023 06:06

remove nft: bool

06657f0

onur-ozkan previously approved these changes Mar 23, 2023

View reviewed changes

mm2src/coins/nft.rs Outdated Show resolved Hide resolved

mm2src/coins/eth.rs Outdated Show resolved Hide resolved

mm2src/coins/eth.rs Outdated Show resolved Hide resolved

add line spaces, add bold text

8245784

laruh dismissed onur-ozkan’s stale review via 8245784 March 23, 2023 10:51

Merge remote-tracking branch 'origin/dev' into NFT-integration-withdr…

c120952

…aw-erc1155

shamardy approved these changes Mar 24, 2023

View reviewed changes

shamardy merged commit 4d691ca into dev Mar 24, 2023

shamardy deleted the NFT-integration-withdraw-erc1155 branch March 24, 2023 18:04

ca333 mentioned this pull request Mar 27, 2023

[release] 1.0.1-beta #1721

Merged

laruh mentioned this pull request Apr 4, 2023

adex tool was introduced #1729

Merged

This was referenced May 5, 2023

Add proxy support #1775

Merged

ERC721/ERC1155 support adding for EVM protocols #900

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Withdraw ERC1155 and EVM based chains support added for NFT PoC #1704

Withdraw ERC1155 and EVM based chains support added for NFT PoC #1704

Withdraw ERC1155 and EVM based chains support added for NFT PoC #1704

Withdraw ERC1155 and EVM based chains support added for NFT PoC #1704

Conversation

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment