ON-468: Fee amount per second

OriumNetwork · Sep 21, 2023 · 20ecfed · 20ecfed
1 parent 2384ae2
commit 20ecfed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/contracts/OriumMarketplace.sol b/contracts/OriumMarketplace.sol
@@ -64,7 +64,7 @@ contract OriumMarketplace is Initializable, OwnableUpgradeable, PausableUpgradea
         address tokenAddress;
         uint256 tokenId;
         address feeTokenAddress;
-        uint256 feeAmount;
+        uint256 feeAmountPerSecond;
         uint256 nonce;
         uint64 deadline;
         bytes32[] roles;
@@ -107,7 +107,7 @@ contract OriumMarketplace is Initializable, OwnableUpgradeable, PausableUpgradea
      * @param tokenAddress address of the contract of the NFT to rent
      * @param tokenId tokenId of the NFT to rent
      * @param feeTokenAddress address of the ERC20 token for rental fees
-     * @param feeAmount amount of the upfront rental cost
+     * @param feeAmountPerSecond amount of fee per second
      * @param deadline until when the rental offer is valid
      * @param roles array of roles to be assigned to the borrower
      * @param rolesData array of data for each role
@@ -119,7 +119,7 @@ contract OriumMarketplace is Initializable, OwnableUpgradeable, PausableUpgradea
         address tokenAddress,
         uint256 tokenId,
         address feeTokenAddress,
-        uint256 feeAmount,
+        uint256 feeAmountPerSecond,
         uint256 deadline,
         bytes32[] roles,
         bytes[] rolesData
@@ -182,7 +182,7 @@ contract OriumMarketplace is Initializable, OwnableUpgradeable, PausableUpgradea
             _offer.tokenAddress,
             _offer.tokenId,
             _offer.feeTokenAddress,
-            _offer.feeAmount,
+            _offer.feeAmountPerSecond,
             _offer.deadline,
             _offer.roles,
             _offer.rolesData
@@ -209,7 +209,7 @@ contract OriumMarketplace is Initializable, OwnableUpgradeable, PausableUpgradea
                         _offer.tokenAddress,
                         _offer.tokenId,
                         _offer.feeTokenAddress,
-                        _offer.feeAmount,
+                        _offer.feeAmountPerSecond,
                         _offer.nonce,
                         _offer.deadline,
                         _offer.roles,

diff --git a/test/OriumMarketplace.test.ts b/test/OriumMarketplace.test.ts
@@ -59,7 +59,7 @@ describe('OriumMarketplace', () => {
             tokenAddress: nft.address,
             tokenId,
             feeTokenAddress: paymentToken.address,
-            feeAmount: ethers.BigNumber.from(0),
+            feeAmountPerSecond: ethers.BigNumber.from(0),
             deadline: blockTimestamp + ONE_DAY,
             roles: [],
             rolesData: [],
@@ -75,7 +75,7 @@ describe('OriumMarketplace', () => {
               rentalOffer.tokenAddress,
               rentalOffer.tokenId,
               rentalOffer.feeTokenAddress,
-              rentalOffer.feeAmount,
+              rentalOffer.feeAmountPerSecond,
               rentalOffer.deadline,
               rentalOffer.roles,
               rentalOffer.rolesData,

diff --git a/utils/types.ts b/utils/types.ts
@@ -18,7 +18,7 @@ export interface RentalOffer {
   tokenAddress: string
   tokenId: number
   feeTokenAddress: string
-  feeAmount: BigNumber
+  feeAmountPerSecond: BigNumber
   deadline: number
   roles: string[]
   rolesData: string[]