Skip to content

Commit

Permalink
Copy of #1668 (#1673)
Browse files Browse the repository at this point in the history 
* POC - bring CW721 pointer contract up to spec

* fixes to cw721 bindings

* uses cw2981 ExecuteMsg/QueryMsg and implements extensions

* attempt fix royalty info response

* Update dummy ERC721.sol

* Update EVM bindings for 721 queries

* Fix bigInt handling

* Fix up typing

* Tidy up cwerc721 queries

* Add more tests

* Bug fixes

* Update cwerc721.wasm builds

* Fix contract syntax

* Fix query_test for EVM query handlers

* minor fixes

* Update cwerc721 build

* Add more cwerc721 pointer tests

* Implement check_royalties

* syncs up events with whats emitted by current cw nfts

* adds evm_address extension query

* no op query_all_operators

* Update build

* Update pointer contract api/bin/wasm files

* Fix typo in contract test ABI

* rebase

---------

Co-authored-by: davyli <[email protected]>
Co-authored-by: shab <[email protected]>
  • Loading branch information
@codchen @dvli2007 @dirtyshab
3 people authored May 16, 2024
1 parent b096dc7 commit 915e44c
Show file tree
Hide file tree
Showing 22 changed files with 394 additions and 74 deletions.
14 changes: 14 additions & 0 deletions contracts/src/ERC721.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ contract ERC721 is IERC721 {
bool approved
);

// Keeps track of current token supply
uint256 internal _totalSupply = 0;

// Mapping from token ID to owner address
mapping(uint => address) internal _ownerOf;

Expand Down Expand Up @@ -79,6 +82,10 @@ contract ERC721 is IERC721 {
return _balanceOf[owner];
}

function totalSupply() external view returns (uint256) {
return _totalSupply;
}

function setApprovalForAll(address operator, bool approved) external {
isApprovedForAll[msg.sender][operator] = approved;
emit ApprovalForAll(msg.sender, operator, approved);
Expand Down Expand Up @@ -158,6 +165,7 @@ contract ERC721 is IERC721 {
require(_ownerOf[id] == address(0), "already minted");

_balanceOf[to]++;
_totalSupply++;
_ownerOf[id] = to;

emit Transfer(address(0), to, id);
Expand All @@ -168,6 +176,7 @@ contract ERC721 is IERC721 {
require(owner != address(0), "not minted");

_balanceOf[owner] -= 1;
_totalSupply--;

delete _ownerOf[id];
delete _approvals[id];
Expand Down Expand Up @@ -222,4 +231,9 @@ contract MyNFT is ERC721 {
require(msg.sender == _ownerOf[id], "not owner");
_burn(id);
}

function royaltyInfo(uint, uint256 salePrice) external pure returns (address receiver, uint256 royaltyAmount) {
receiver = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
royaltyAmount = (salePrice * 500) / 10_000;
}
}
53 changes: 31 additions & 22 deletions contracts/test/CW721toERC721PointerTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,39 +73,48 @@ describe("CW721 to ERC721 Pointer", function () {
});
});

it("should retrieve number of circulating tokens", async function () {
const result = await queryWasm(pointer, "num_tokens", {});
expect(result).to.deep.equal({data:{count:3}});
});

it("should retrieve contract information", async function () {
const result = await queryWasm(pointer, "contract_info", {});
expect(result).to.deep.equal({data:{name:"MyNFT",symbol:"MYNFT"}});
});

it("should fetch NFT info based on token ID", async function () {
const result = await queryWasm(pointer, "nft_info", { token_id: "1" });
expect(result).to.deep.equal({ data: { token_uri: 'https://sei.io/token/1', extension: '' } });
});

it("should fetch all information about an NFT", async function () {
const result = await queryWasm(pointer, "all_nft_info", { token_id: "1" });
expect(result).to.deep.equal({
data: {
access: {
owner: accounts[0].seiAddress,
approvals: [
{
spender: accounts[1].seiAddress,
expires: {
never: {}
}
}
]
},
info: {
token_uri: "https://sei.io/token/1",
extension: ""
expect(result.data.access).to.deep.equal({
owner: accounts[0].seiAddress,
approvals: [
{
spender: accounts[1].seiAddress,
expires: {
never: {}
}
}
}
]
});
expect(result.data.info.token_uri).to.equal('https://sei.io/token/1');
expect(result.data.info.extension.royalty_percentage).to.equal(5);
expect(result.data.info.extension.royalty_payment_address).to.include("sei1");
});

it("should retrieve all minted NFT token ids", async function () {
const result = await queryWasm(pointer, "all_tokens", {});
expect(result).to.deep.equal({data:{tokens:["1","2","3"]}});
});

it("should retrieve list of 1 minted NFT token id after token id 1", async function () {
const result = await queryWasm(pointer, "all_tokens", { start_after: "1", limit: 1 });
expect(result).to.deep.equal({data:{tokens:["2"]}});
});

it("should retrieve list of NFT token ids owned by admin", async function () {
const result = await queryWasm(pointer, "tokens", { owner: admin.seiAddress });
expect(result).to.deep.equal({data:{tokens:["3"]}});
});
})

describe("execute operations", function () {
Expand Down
1 change: 1 addition & 0 deletions contracts/test/lib.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const ABI = {
"function symbol() view returns (string)",
"function totalSupply() view returns (uint256)",
"function tokenURI(uint256 tokenId) view returns (string)",
"function royaltyInfo(uint256 tokenId, uint256 salePrice) view returns (address, uint256)",
"function balanceOf(address owner) view returns (uint256 balance)",
"function ownerOf(uint256 tokenId) view returns (address owner)",
"function getApproved(uint256 tokenId) view returns (address operator)",
Expand Down
Binary file modified contracts/wasm/cwerc721.wasm
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion example/contracts/erc721/DummyERC721.abi
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"randomAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"randomAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"uint256","name":"salePrice","type":"uint256"}],"name":"royaltyInfo","outputs":[{"internalType":"address","name":"receiver","type":"address"},{"internalType":"uint256","name":"royaltyAmount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"supply","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]
Loading

0 comments on commit 915e44c

Please sign in to comment.