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

Feat/marketplace precompile trn 371 #797

Merged
merged 16 commits into from
Sep 10, 2024
Merged

Feat/marketplace precompile trn 371 #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebde6d4
SFT marketplace support - add sell sft support
KarishmaBothara Feb 26, 2024
aec2d64
Support sft in split_listing_tokens function
KarishmaBothara Feb 26, 2024
91f5209
Add support for auction marketplace sft
KarishmaBothara Feb 27, 2024
11c4e4c
Add test
KarishmaBothara Feb 27, 2024
3f4fc9f
Fix lint
KarishmaBothara Feb 28, 2024
33d1dd5
Add marketplace id to all events possible
KarishmaBothara Feb 28, 2024
f21008a
Remove all precompile marketplace - without marketplacdeId
KarishmaBothara Mar 22, 2024
4db72e8
Fix cargo fmt
KarishmaBothara Mar 24, 2024
27cd058
Format typescript e2e test
KarishmaBothara Mar 24, 2024
f3001d1
Address review comments
KarishmaBothara Mar 25, 2024
8a607ec
As per review comment
KarishmaBothara Mar 26, 2024
d0857c2
Use try from over truncate from
KarishmaBothara Apr 5, 2024
bb0cf35
Merge branch 'main' into feat/marketplace_precompile_trn_371
KarishmaBothara Aug 19, 2024
387ea2d
Cargo fmt
KarishmaBothara Aug 19, 2024
0ac84f3
Merge branch 'main' into feat/marketplace_precompile_trn_371
JasonTulp Aug 25, 2024
1dfbfa7
Merge branch 'main' into feat/marketplace_precompile_trn_371
JasonTulp Sep 10, 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
32 changes: 19 additions & 13 deletions e2e/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,28 +400,34 @@ export const FUTUREPASS_PRECOMPILE_ABI = [

export const MARKET_PLACE_ABI = [
"event MarketplaceRegister(address indexed sender, uint256 indexed marketplaceId, address marketplace_account)",
"event FixedPriceSaleList(address indexed seller, uint256 indexed listingId, uint256 indexed fixedPrice, uint256[] serialNumbers, address collectionAddress)",
"event FixedPriceSaleUpdate(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed newPrice, address sender, uint256[] serialNumbers)",
"event FixedPriceSaleComplete(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed fixedPrice, address sender, uint256[] serialNumbers)",
"event AuctionOpen(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed reservePrice, address sender, uint256[] serialNumbers)",
"event Bid(address indexed bidder, uint256 indexed listingId, uint256 indexed amount)",
"event FixedPriceSaleClose(uint256 indexed collectionId, uint256 indexed listingId, address sender, uint256[] serialNumbers)", //uint256,uint256,address,uint256[]
"event AuctionClose(uint256 indexed collectionId, uint256 indexed listingId, address sender, uint256[] serialNumbers)",
"event Offer(uint256 indexed offerId, address indexed sender, uint256 collectionId, uint256 seriesId)",
"event OfferCancel(uint256 indexed offerId, address indexed sender, uint256 collectionId, uint256 seriesId)",
"event OfferAccept(uint256 indexed offerId, uint256 indexed amount, address indexed sender, uint256 collectionId, uint256 seriesId)", // uint256,uint256,address,uint256
"event FixedPriceSaleListNFT(address indexed seller, uint256 indexed listingId, uint256 indexed fixedPrice, uint256[] serialNumbers, address collectionAddress, uint128 marketplace_id)",
"event FixedPriceSaleListSFT(address indexed seller, uint256 indexed listingId, uint256 indexed fixedPrice, uint256[] serialNumbers, address collectionAddress, uint128 marketplace_id, uint256[] quantities)",
"event FixedPriceSaleUpdate(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed newPrice, address sender, uint256[] serialNumbers, uint128 marketplace_id)",
"event FixedPriceSaleComplete(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed fixedPrice, address sender, uint256[] serialNumbers, uint128 marketplace_id)",
"event AuctionOpenNFT(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed reservePrice, address sender, uint256[] serialNumbers, uint128 marketplace_id)",
"event AuctionOpenSFT(uint256 indexed collectionId, uint256 indexed listingId, uint256 indexed reservePrice, address sender, uint256[] serialNumbers, uint128 marketplace_id)",
"event Bid(address indexed bidder, uint256 indexed listingId, uint256 indexed amount, uint128 marketplace_id)",
"event FixedPriceSaleClose(uint256 indexed collectionId, uint256 indexed listingId, address sender, uint256[] serialNumbers, uint128 marketplace_id)", //uint256,uint256,address,uint256[]
"event AuctionClose(uint256 indexed collectionId, uint256 indexed listingId, address sender, uint256[] serialNumbers, uint128 marketplace_id)",
"event Offer(uint256 indexed offerId, address indexed sender, uint256 collectionId, uint256 seriesId, uint128 marketplace_id)",
"event OfferCancel(uint256 indexed offerId, address indexed sender, uint256 collectionId, uint256 seriesId, uint128 marketplace_id)",
"event OfferAccept(uint256 indexed offerId, uint256 indexed amount, address indexed sender, uint256 collectionId, uint256 seriesId, uint128 marketplace_id)", // uint256,uint256,address,uint256

"function registerMarketplace(address marketplaceAccount, uint256 entitlement) external returns (uint marketplaceId)",
"function sellNftWithMarketplaceId(address collectionAddress, uint256[] calldata serialNumberIds, address buyer, address paymentAsset, uint256 fixedPrice, uint256 duration, uint32 marketplaceId) external returns (uint listingId)",
"function sellNftWithoutMarketplace(address collectionAddress, uint256[] calldata serialNumberIds, address buyer, address paymentAsset, uint256 fixedPrice, uint256 duration) external returns (uint listingId)",
"function sellNft(address collectionAddress, uint256[] calldata serialNumberIds, address buyer, address paymentAsset, uint256 fixedPrice, uint256 duration, uint32 marketplace_id) external returns (uint listingId)",
"function sellSftWithMarketplaceId(address collectionAddress, uint256[] calldata serialNumberIds, uint256[] calldata quantities, address buyer, address paymentAsset, uint256 fixedPrice, uint256 duration, uint32 marketplaceId) external returns (uint listingId)",
"function sellSft(address collectionAddress, uint256[] calldata serialNumberIds, uint256[] calldata quantities, address buyer, address paymentAsset, uint256 fixedPrice, uint256 duration, uint32 marketplace_id) external returns (uint listingId)",
"function updateFixedPrice(uint128 listingId, uint256 newPrice) external",
"function buy(uint128 listingId) external payable",
"function auctionNftWithMarketplaceId(address collectionAddress, uint256[] calldata serialNumberIds, address paymentAsset, uint256 reservePrice, uint256 duration, uint256 marketplaceId)",
"function auctionNftWithoutMarketplace(address collectionAddress, uint256[] calldata serialNumberIds, address paymentAsset, uint256 reservePrice, uint256 duration)",
"function auctionNft(address collectionAddress, uint256[] calldata serialNumberIds, address paymentAsset, uint256 reservePrice, uint256 duration, uint32 marketplaceId)",
"function auctionSftWithMarketplaceId(address collectionAddress, uint256[] calldata serialNumberIds, uint256[] calldata quantities, address paymentAsset, uint256 reservePrice, uint256 duration, uint32 marketplaceId)",
"function auctionSft(address collectionAddress, uint256[] calldata serialNumberIds, uint256[] calldata quantities, address paymentAsset, uint256 reservePrice, uint256 duration, uint32 marketplaceId)",
"function bid(uint128 listingId, uint256 amount) external",
"function cancelSale(uint128 listingId) external",
"function makeSimpleOfferWithMarketplaceId(address collectionAddress, uint32 serialNumber, uint256 amount, address assetId, uint32 marketplaceId) external returns (uint offerId)",
"function makeSimpleOfferWithoutMarketplace(address collectionAddress, uint32 serialNumber, uint256 amount, address assetId) external returns (uint offerId)",
"function makeSimpleOffer(address collectionAddress, uint32 serialNumber, uint256 amount, address assetId, uint32 marketplaceId) external returns (uint offerId)",
"function cancelOffer(uint64 offerId) external",
"function acceptOffer(uint64 offerId) external",

Expand Down
Loading
Loading