Add chiru-labs#270

Vectorized · May 9, 2022 · 4ffb9b8 · 4ffb9b8
1 parent aed0402
commit 4ffb9b8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/contracts/ERC721A.sol b/contracts/ERC721A.sol
@@ -363,7 +363,7 @@ contract ERC721A is Context, ERC165, IERC721A {
                 uint256 packed;
                 assembly {
                     // uint256(uint160(to)) | (block.timestamp << 160)
-                    packed := or(to, shl(160, timestamp()))
+                    packed := or(or(to, shl(160, timestamp())), shl(225, eq(quantity, 1)))
                 }
                 _packedOwnerships[startTokenId] = packed;    
             }
@@ -418,7 +418,7 @@ contract ERC721A is Context, ERC165, IERC721A {
                 uint256 packed;
                 assembly {
                     // uint256(uint160(to)) | (block.timestamp << 160)
-                    packed := or(to, shl(160, timestamp()))
+                    packed := or(or(to, shl(160, timestamp())), shl(225, eq(quantity, 1)))
                 }
                 _packedOwnerships[startTokenId] = packed;    
             }
@@ -477,23 +477,24 @@ contract ERC721A is Context, ERC165, IERC721A {
             { // Scoped for extra gas optimization.
                 uint256 packed;
                 assembly {
-                    // uint256(uint160(to)) | (block.timestamp << 160)
-                    packed := or(to, shl(160, timestamp()))
+                    // uint256(uint160(to)) | (block.timestamp << 160) | (1 << 225)
+                    packed := or(or(to, shl(160, timestamp())), 
+                        0x200000000000000000000000000000000000000000000000000000000)
                 }
                 _packedOwnerships[tokenId] = packed;    
             }
 
             // If the ownership slot of tokenId+1 is not explicitly set, that means the transfer initiator owns it.
             // Set the slot of tokenId+1 explicitly in storage to maintain correctness for ownerOf(tokenId+1) calls.
-            uint256 nextTokenId = tokenId + 1;
-            uint256 packedNextSlot = _packedOwnerships[nextTokenId];
-            // We can directly check the entire packed slot.
-            if (packedNextSlot == 0) {
-                // This will suffice for checking _exists(nextTokenId),
-                // as a burned slot cannot contain the zero address.
-                if (nextTokenId != _currentIndex) {
-                    // Set the `addr` = `from`, and `startTimestamp` = `prevOwnership.startTimestamp`.
-                    _packedOwnerships[nextTokenId] = prevOwnershipPacked;
+            if (prevOwnershipPacked & (1 << 225) == 0) {
+                uint256 nextTokenId = tokenId + 1;
+                if (_packedOwnerships[nextTokenId] == 0) {
+                    // This will suffice for checking _exists(nextTokenId),
+                    // as a burned slot cannot contain the zero address.
+                    if (nextTokenId != _currentIndex) {
+                        // Set the `addr` = `from`, and `startTimestamp` = `prevOwnership.startTimestamp`.
+                        _packedOwnerships[nextTokenId] = prevOwnershipPacked;
+                    }
                 }
             }
         }
@@ -549,24 +550,24 @@ contract ERC721A is Context, ERC165, IERC721A {
                 assembly {
                     // Keep track of the previous owner, the timestamp of burning.
                     // Also sets `burned` to `true`.
-                    // uint256(uint160(from)) | (block.timestamp << 160) | (1 << 224)
+                    // uint256(uint160(from)) | (block.timestamp << 160) | (1 << 224) | (1 << 225)
                     packed := or(or(from, shl(160, timestamp())), 
-                        0x100000000000000000000000000000000000000000000000000000000)
+                        0x300000000000000000000000000000000000000000000000000000000)
                 }
                 _packedOwnerships[tokenId] = packed;    
             }
 
-            // If the ownership slot of tokenId+1 is not explicitly set, that means the burn initiator owns it.
+            // If the ownership slot of tokenId+1 is not explicitly set, that means the transfer initiator owns it.
             // Set the slot of tokenId+1 explicitly in storage to maintain correctness for ownerOf(tokenId+1) calls.
-            uint256 nextTokenId = tokenId + 1;
-            uint256 packedNextSlot = _packedOwnerships[nextTokenId];
-            // We can directly check the entire packed slot.
-            if (packedNextSlot == 0) {
-                // This will suffice for checking _exists(nextTokenId),
-                // as a burned slot cannot contain the zero address.
-                if (nextTokenId != _currentIndex) {
-                    // Set the `addr` = `from`, and `startTimestamp` = `prevOwnership.startTimestamp`.
-                    _packedOwnerships[nextTokenId] = prevOwnershipPacked;
+            if (prevOwnershipPacked & (1 << 225) == 0) {
+                uint256 nextTokenId = tokenId + 1;
+                if (_packedOwnerships[nextTokenId] == 0) {
+                    // This will suffice for checking _exists(nextTokenId),
+                    // as a burned slot cannot contain the zero address.
+                    if (nextTokenId != _currentIndex) {
+                        // Set the `addr` = `from`, and `startTimestamp` = `prevOwnership.startTimestamp`.
+                        _packedOwnerships[nextTokenId] = prevOwnershipPacked;
+                    }
                 }
             }
         }

diff --git a/test/GasUsage.test.js b/test/GasUsage.test.js
@@ -39,4 +39,15 @@ describe('ERC721A Gas Usage', function () {
       }
     });
   });
+
+  context('transferFrom', function () {
+    it('transfer to and fro', async function () {
+      await this.erc721a.mintTen(this.addr1.address);
+      await this.erc721a.mintTen(this.owner.address);
+      for (let i = 0; i < 10; ++i) {
+        await this.erc721a.connect(this.addr1).transferFrom(this.addr1.address, this.owner.address, 1);
+        await this.erc721a.connect(this.owner).transferFrom(this.owner.address, this.addr1.address, 1);  
+      }  
+    });
+  });
 });