Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add feralfile exhibition v4_2 & feralfile token contracts #41

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

add feralfile exhibition v4_2 & feralfile token contracts #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a6e0c3a
add feralfile token contract
hvthhien May 21, 2024
50f6bfe
add batchMint supported
hvthhien May 22, 2024
4ae7c2f
add FeralfileArtworkV4_2 contract
hvthhien May 22, 2024
0e0c7d1
update tests
hvthhien May 23, 2024
fc2331f
update abi gen
hvthhien May 23, 2024
3bb7a53
Generate ABIs for PR #41
hvthhien May 23, 2024
5b9dfc7
update contract
hvthhien May 23, 2024
3dc7fbc
udpate rename
hvthhien May 23, 2024
b680aeb
refactor & update abi gen
hvthhien May 23, 2024
9ea5f01
update iframe html
hvthhien May 24, 2024
674aac3
update place holder uris functions
hvthhien May 24, 2024
86fc450
adjust animation url fallback placeholder value
hvthhien May 24, 2024
15a83fe
update token uri response format
hvthhien May 28, 2024
eae8c9e
update contract to mint & transfer erc20 token
hvthhien May 28, 2024
e1b774e
refactor function for reuse
hvthhien May 29, 2024
7bf26c7
update test
hvthhien May 29, 2024
0b6972b
Generate ABIs for PR #41
hvthhien May 29, 2024
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
20 changes: 16 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,20 @@ merge: sol-merger-check
mkdir /tmp/sol-merger && mkdir ./contracts/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileArtworkV2.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileArtworkV3.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileArtworkV4_1.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileArtworkV4_1.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileArtworkV4_2.sol /tmp/sol-merger && \
hvthhien marked this conversation as resolved.
Show resolved Hide resolved
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileEnglishAuction.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralFileAirdropV1.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/OwnerData.sol /tmp/sol-merger && \
sol-merger --export-plugin SPDXLicenseRemovePlugin ./contracts/FeralfileToken.sol /tmp/sol-merger && \
mv /tmp/sol-merger/FeralfileArtworkV2.sol ./contracts/sol-merger/FeralfileExhibitionV2.sol && \
mv /tmp/sol-merger/FeralfileArtworkV3.sol ./contracts/sol-merger/FeralfileExhibitionV3.sol && \
mv /tmp/sol-merger/FeralfileArtworkV4_1.sol ./contracts/sol-merger/FeralfileExhibitionV4.sol && \
mv /tmp/sol-merger/FeralfileArtworkV4_2.sol ./contracts/sol-merger/FeralfileExhibitionV4_2.sol && \
mv /tmp/sol-merger/FeralfileEnglishAuction.sol ./contracts/sol-merger/FeralfileEnglishAuction.sol && \
mv /tmp/sol-merger/FeralFileAirdropV1.sol ./contracts/sol-merger/FeralFileAirdropV1.sol && \
mv /tmp/sol-merger/OwnerData.sol ./contracts/sol-merger/OwnerData.sol
mv /tmp/sol-merger/OwnerData.sol ./contracts/sol-merger/OwnerData.sol && \
mv /tmp/sol-merger/FeralfileToken.sol ./contracts/sol-merger/FeralfileToken.sol

build-contract: check
npm install && \
Expand All @@ -41,23 +45,31 @@ build-contract: check
jq -r ".abi" build/contracts/FeralfileExhibitionV3.json > ./build/FeralfileExhibitionV3.abi && \
jq -r ".bytecode" build/contracts/FeralfileExhibitionV4_1.json > ./build/FeralfileExhibitionV4.bin && \
jq -r ".abi" build/contracts/FeralfileExhibitionV4_1.json > ./build/FeralfileExhibitionV4.abi && \
jq -r ".bytecode" build/contracts/FeralfileExhibitionV4_2.json > ./build/FeralfileExhibitionV4_2.bin && \
jq -r ".abi" build/contracts/FeralfileExhibitionV4_2.json > ./build/FeralfileExhibitionV4_2.abi && \
jq -r ".bytecode" build/contracts/FeralfileEnglishAuction.json > ./build/FeralfileEnglishAuction.bin && \
jq -r ".abi" build/contracts/FeralfileEnglishAuction.json > ./build/FeralfileEnglishAuction.abi && \
jq -r ".bytecode" build/contracts/FeralFileAirdropV1.json > ./build/FeralFileAirdropV1.bin && \
jq -r ".abi" build/contracts/FeralFileAirdropV1.json > ./build/FeralFileAirdropV1.abi && \
jq -r ".bytecode" build/contracts/OwnerData.json > ./build/OwnerData.bin && \
jq -r ".abi" build/contracts/OwnerData.json > ./build/OwnerData.abi
jq -r ".abi" build/contracts/OwnerData.json > ./build/OwnerData.abi && \
jq -r ".bytecode" build/contracts/FeralfileToken.json > ./build/FeralfileToken.bin && \
jq -r ".abi" build/contracts/FeralfileToken.json > ./build/FeralfileToken.abi

build: build-contract
mkdir -p ./go-binding/feralfile-exhibition-v2 && \
mkdir -p ./go-binding/feralfile-exhibition-v3 && \
mkdir -p ./go-binding/feralfile-exhibition-v4 && \
mkdir -p ./go-binding/feralfile-exhibition-v4_2 && \
mkdir -p ./go-binding/feralfile-english-auction && \
mkdir -p ./go-binding/feralfile-airdrop-v1 && \
mkdir -p ./go-binding/owner-data && \
mkdir -p ./go-binding/feralfile-token && \
abigen --abi ./build/FeralfileExhibitionV2.abi --bin ./build/FeralfileExhibitionV2.bin --pkg feralfilev2 -type FeralfileExhibitionV2 --out ./go-binding/feralfile-exhibition-v2/abi.go
abigen --abi ./build/FeralfileExhibitionV3.abi --bin ./build/FeralfileExhibitionV3.bin --pkg feralfilev3 -type FeralfileExhibitionV3 --out ./go-binding/feralfile-exhibition-v3/abi.go
abigen --abi ./build/FeralfileExhibitionV4.abi --bin ./build/FeralfileExhibitionV4.bin --pkg feralfilev4 -type FeralfileExhibitionV4 --out ./go-binding/feralfile-exhibition-v4/abi.go
abigen --abi ./build/FeralfileExhibitionV4_2.abi --bin ./build/FeralfileExhibitionV4_2.bin --pkg feralfilev4_2 -type FeralfileExhibitionV4_2 --out ./go-binding/feralfile-exhibition-v4_2/abi.go
abigen --abi ./build/FeralfileEnglishAuction.abi --bin ./build/FeralfileEnglishAuction.bin --pkg english_auction -type FeralfileEnglishAuction --out ./go-binding/feralfile-english-auction/abi.go
abigen --abi ./build/FeralFileAirdropV1.abi --bin ./build/FeralFileAirdropV1.bin --pkg airdropv1 -type FeralFileAirdropV1 --out ./go-binding/feralfile-airdrop-v1/abi.go && \
abigen --abi ./build/OwnerData.abi --bin ./build/OwnerData.bin --pkg ownerdata -type OwnerData --out ./go-binding/owner-data/abi.go
abigen --abi ./build/OwnerData.abi --bin ./build/OwnerData.bin --pkg ownerdata -type OwnerData --out ./go-binding/owner-data/abi.go && \
abigen --abi ./build/FeralfileToken.abi --bin ./build/FeralfileToken.bin --pkg feralfiletoken -type FeralfileToken --out ./go-binding/feralfile-token/abi.go
2 changes: 1 addition & 1 deletion contracts/FeralfileArtworkV4_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ contract FeralfileExhibitionV4_1 is FeralfileExhibitionV4 {
bytes32 s_,
uint8 v_,
SaleData calldata saleData_
) external payable override {
) external payable override virtual {
require(_selling, "FeralfileExhibitionV4: sale is not started");
super._checkContractOwnedToken();
validateSaleData(saleData_);
Expand Down
Loading