support binding new sale data v2

bitmark-inc · Feb 16, 2024 · 231f2fd · 231f2fd
1 parent c73f742
commit 231f2fd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/contracts/feralfile-english-auction/english_auction.go b/contracts/feralfile-english-auction/english_auction.go
@@ -160,6 +160,7 @@ func (c *FeralfileEnglishAuctionContract) Call(wallet *ethereum.Wallet, method,
 					Bps       ethereum.BigInt
 				}
 				PayByVaultContract bool
+				BiddingUnix        ethereum.BigInt
 			}
 			R string
 			S string
@@ -196,27 +197,28 @@ func (c *FeralfileEnglishAuctionContract) Call(wallet *ethereum.Wallet, method,
 			tokenIDs = append(tokenIDs, &tokenID)
 		}
 
-		revenueShares := make([][]IFeralfileSaleDataRevenueShare, 0)
+		revenueShares := make([][]IFeralfileSaleDataV2RevenueShare, 0)
 		for _, v := range params.SaleData.RevenueShares {
-			revenueShare := make([]IFeralfileSaleDataRevenueShare, 0)
+			revenueShare := make([]IFeralfileSaleDataV2RevenueShare, 0)
 			for _, vv := range v {
 				bps := vv.Bps.Int
-				revenueShare = append(revenueShare, IFeralfileSaleDataRevenueShare{
+				revenueShare = append(revenueShare, IFeralfileSaleDataV2RevenueShare{
 					Recipient: vv.Recipient,
 					Bps:       &bps,
 				})
 			}
 			revenueShares = append(revenueShares, revenueShare)
 		}
 
-		saleData := IFeralfileSaleDataSaleData{
+		saleData := IFeralfileSaleDataV2SaleData{
 			Price:              &params.SaleData.Price.Int,
 			Cost:               &params.SaleData.Cost.Int,
 			ExpiryTime:         &params.SaleData.ExpiryTime.Int,
 			Destination:        params.SaleData.Destination,
 			TokenIds:           tokenIDs,
 			RevenueShares:      revenueShares,
 			PayByVaultContract: params.SaleData.PayByVaultContract,
+			BiddingUnix:        &params.SaleData.BiddingUnix.Int,
 		}
 
 		tx, err := contract.SettleAuction(t, &params.AuctionID.Int, params.ContractAddress, params.VaultAddress, saleData, r32Val, s32Val, uint8(vVal))

diff --git a/contracts/feralfile-exhibition-v5/feralfile.go b/contracts/feralfile-exhibition-v5/feralfile.go
@@ -198,20 +198,20 @@ func (c *FeralfileExhibitionV5Contract) Call(wallet *ethereum.Wallet, method, fu
 			tokenIDs = append(tokenIDs, &tokenID)
 		}
 
-		revenueShares := make([][]IFeralfileSaleDataRevenueShare, 0)
+		revenueShares := make([][]IFeralfileSaleDataV2RevenueShare, 0)
 		for _, v := range params.SaleData.RevenueShares {
-			revenueShare := make([]IFeralfileSaleDataRevenueShare, 0)
+			revenueShare := make([]IFeralfileSaleDataV2RevenueShare, 0)
 			for _, vv := range v {
 				bps := vv.Bps.Int
-				revenueShare = append(revenueShare, IFeralfileSaleDataRevenueShare{
+				revenueShare = append(revenueShare, IFeralfileSaleDataV2RevenueShare{
 					Recipient: vv.Recipient,
 					Bps:       &bps,
 				})
 			}
 			revenueShares = append(revenueShares, revenueShare)
 		}
 
-		saleData := IFeralfileSaleDataSaleData{
+		saleData := IFeralfileSaleDataV2SaleData{
 			Price:              &params.SaleData.Price.Int,
 			Cost:               &params.SaleData.Cost.Int,
 			ExpiryTime:         &params.SaleData.ExpiryTime.Int,

diff --git a/sub_modules/feralfile-exhibition-smart-contract b/sub_modules/feralfile-exhibition-smart-contract
+104 −53		contracts/FeralfileArtworkV5.sol
+7 −5		contracts/FeralfileEnglishAuction.sol
+37 −0		contracts/FeralfileSaleDataV2.sol
+71 −0		contracts/FeralfileVaultV2.sol
+0 −1		contracts/IFeralfileSaleData.sol
+11 −0		migrations/321_feralfile_vault_v2.js
+248 −23		test/feralfile_exhibition_v5.js