From 1dba4e979da0b4ed38909b8b5ee3640fad463c1b Mon Sep 17 00:00:00 2001 From: Vectorized Date: Thu, 30 May 2024 17:40:30 +0000 Subject: [PATCH] T --- .gas-snapshot | 83 ++++++++++++++++++------------------- test/DN404.t.sol | 38 ----------------- test/DN404ZeroIndexed.t.sol | 42 ------------------- 3 files changed, 40 insertions(+), 123 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 5eb5239..cc0dec2 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -118,57 +118,54 @@ DN404OnlyERC20Test:testTransferFromInsufficientBalanceReverts(address,uint256,ui DN404OnlyERC20Test:testTransferInsufficientBalanceReverts() (gas: 43963) DN404OnlyERC20Test:testTransferInsufficientBalanceReverts(address,uint256,uint256) (runs: 272, μ: 45118, ~: 45072) DN404OnlyERC20Test:test__codesize() (gas: 28414) -DN404Test:testBatchNFTLog() (gas: 326636) -DN404Test:testBurnOnTransfer(uint32,address) (runs: 270, μ: 274992, ~: 274992) +DN404Test:testBatchNFTLog() (gas: 326614) +DN404Test:testBurnOnTransfer(uint32,address) (runs: 270, μ: 274970, ~: 274970) DN404Test:testFnSelectorNotRecognized() (gas: 6268) -DN404Test:testInitialize(uint32,address) (runs: 272, μ: 111028, ~: 113114) -DN404Test:testMintAndBurn() (gas: 345854) -DN404Test:testMintAndBurn2() (gas: 282499) +DN404Test:testInitialize(uint32,address) (runs: 272, μ: 110919, ~: 113114) +DN404Test:testMintAndBurn() (gas: 345839) +DN404Test:testMintAndBurn2() (gas: 282462) DN404Test:testMintNext() (gas: 704365) -DN404Test:testMintNextContiguous(uint256) (runs: 272, μ: 565279, ~: 541689) -DN404Test:testMintOnTransfer(uint32,address) (runs: 270, μ: 289571, ~: 289571) -DN404Test:testMixed(bytes32) (runs: 272, μ: 556865, ~: 469545) -DN404Test:testNameAndSymbol(string,string) (runs: 272, μ: 205734, ~: 206137) +DN404Test:testMintNextContiguous(uint256) (runs: 272, μ: 560794, ~: 516685) +DN404Test:testMintOnTransfer(uint32,address) (runs: 270, μ: 289549, ~: 289549) +DN404Test:testMixed(bytes32) (runs: 272, μ: 559985, ~: 498455) +DN404Test:testNameAndSymbol(string,string) (runs: 272, μ: 205779, ~: 206182) DN404Test:testNumAliasesOverflowReverts() (gas: 40944) DN404Test:testOwnedIds() (gas: 360447) -DN404Test:testOwnedIds(uint256) (runs: 272, μ: 269418, ~: 288384) -DN404Test:testPermit2() (gas: 455701) -DN404Test:testRegisterAndResolveAlias(address,address) (runs: 272, μ: 120117, ~: 120191) -DN404Test:testSetAndGetAux(address,uint88) (runs: 272, μ: 22004, ~: 22289) +DN404Test:testOwnedIds(uint256) (runs: 272, μ: 271239, ~: 286246) +DN404Test:testPermit2() (gas: 455657) +DN404Test:testRegisterAndResolveAlias(address,address) (runs: 272, μ: 120044, ~: 120191) +DN404Test:testSetAndGetAux(address,uint88) (runs: 272, μ: 21953, ~: 22272) DN404Test:testSetAndGetOperatorApprovals(address,address,bool) (runs: 272, μ: 129690, ~: 119887) -DN404Test:testSetAndGetSkipNFT() (gas: 708390) -DN404Test:testTokenURI(string,uint256) (runs: 272, μ: 155844, ~: 155989) -DN404Test:testTransferWithMirrorEvent() (gas: 410230) +DN404Test:testSetAndGetSkipNFT() (gas: 708368) +DN404Test:testTokenURI(string,uint256) (runs: 272, μ: 155822, ~: 155967) +DN404Test:testTransferWithMirrorEvent() (gas: 410295) DN404Test:testTransfersAndBurns() (gas: 487312) -DN404Test:testWrapAround(uint32,uint256) (runs: 272, μ: 393407, ~: 388546) -DN404Test:testZZZ() (gas: 593359) -DN404Test:test__codesize() (gas: 63838) -DN404ZeroIndexedTest:testBatchNFTLog() (gas: 326075) -DN404ZeroIndexedTest:testBurnOnTransfer(uint32,address) (runs: 269, μ: 254902, ~: 254912) -DN404ZeroIndexedTest:testFnSelectorNotRecognized() (gas: 6290) -DN404ZeroIndexedTest:testInitialize(uint32,address) (runs: 272, μ: 109068, ~: 113108) -DN404ZeroIndexedTest:testMintAndBurn() (gas: 342735) -DN404ZeroIndexedTest:testMintAndBurn2() (gas: 280061) +DN404Test:testWrapAround(uint32,uint256) (runs: 272, μ: 394166, ~: 388680) +DN404Test:test__codesize() (gas: 61241) +DN404ZeroIndexedTest:testBatchNFTLog() (gas: 326053) +DN404ZeroIndexedTest:testBurnOnTransfer(uint32,address) (runs: 270, μ: 254890, ~: 254890) +DN404ZeroIndexedTest:testFnSelectorNotRecognized() (gas: 6268) +DN404ZeroIndexedTest:testInitialize(uint32,address) (runs: 272, μ: 108762, ~: 113108) +DN404ZeroIndexedTest:testMintAndBurn() (gas: 342720) +DN404ZeroIndexedTest:testMintAndBurn2() (gas: 280024) DN404ZeroIndexedTest:testMintNext() (gas: 701366) -DN404ZeroIndexedTest:testMintNextContiguous(uint256) (runs: 272, μ: 575086, ~: 538596) -DN404ZeroIndexedTest:testMintOnTransfer(uint32,address) (runs: 269, μ: 269505, ~: 269515) -DN404ZeroIndexedTest:testMixed(bytes32) (runs: 272, μ: 578220, ~: 527241) -DN404ZeroIndexedTest:testNameAndSymbol(string,string) (runs: 272, μ: 205728, ~: 206131) +DN404ZeroIndexedTest:testMintNextContiguous(uint256) (runs: 272, μ: 550140, ~: 517317) +DN404ZeroIndexedTest:testMintOnTransfer(uint32,address) (runs: 270, μ: 269493, ~: 269493) +DN404ZeroIndexedTest:testMixed(bytes32) (runs: 272, μ: 592207, ~: 521125) +DN404ZeroIndexedTest:testNameAndSymbol(string,string) (runs: 272, μ: 205773, ~: 206176) DN404ZeroIndexedTest:testNumAliasesOverflowReverts() (gas: 40944) -DN404ZeroIndexedTest:testOwnedIds() (gas: 347358) -DN404ZeroIndexedTest:testOwnedIds(uint256) (runs: 272, μ: 263740, ~: 283831) -DN404ZeroIndexedTest:testPermit2() (gas: 455314) -DN404ZeroIndexedTest:testRegisterAndResolveAlias(address,address) (runs: 272, μ: 120191, ~: 120191) -DN404ZeroIndexedTest:testSetAndGetAux(address,uint88) (runs: 272, μ: 22004, ~: 22289) -DN404ZeroIndexedTest:testSetAndGetOperatorApprovals(address,address,bool) (runs: 272, μ: 129706, ~: 119903) -DN404ZeroIndexedTest:testSetAndGetSkipNFT() (gas: 708390) -DN404ZeroIndexedTest:testTokenURI(string,uint256) (runs: 272, μ: 155838, ~: 155983) -DN404ZeroIndexedTest:testTransferWithMirrorEvent() (gas: 409736) -DN404ZeroIndexedTest:testTransfersAndBurns() (gas: 485369) -DN404ZeroIndexedTest:testWrapAround(uint32,uint256) (runs: 272, μ: 379685, ~: 383309) -DN404ZeroIndexedTest:testYYY() (gas: 1198126) -DN404ZeroIndexedTest:testZZZ() (gas: 591907) -DN404ZeroIndexedTest:test__codesize() (gas: 63705) +DN404ZeroIndexedTest:testOwnedIds() (gas: 347336) +DN404ZeroIndexedTest:testOwnedIds(uint256) (runs: 272, μ: 265437, ~: 287924) +DN404ZeroIndexedTest:testPermit2() (gas: 455270) +DN404ZeroIndexedTest:testRegisterAndResolveAlias(address,address) (runs: 272, μ: 120044, ~: 120191) +DN404ZeroIndexedTest:testSetAndGetAux(address,uint88) (runs: 272, μ: 21953, ~: 22272) +DN404ZeroIndexedTest:testSetAndGetOperatorApprovals(address,address,bool) (runs: 272, μ: 129684, ~: 119881) +DN404ZeroIndexedTest:testSetAndGetSkipNFT() (gas: 708368) +DN404ZeroIndexedTest:testTokenURI(string,uint256) (runs: 272, μ: 155816, ~: 155961) +DN404ZeroIndexedTest:testTransferWithMirrorEvent() (gas: 409801) +DN404ZeroIndexedTest:testTransfersAndBurns() (gas: 485347) +DN404ZeroIndexedTest:testWrapAround(uint32,uint256) (runs: 272, μ: 380100, ~: 383882) +DN404ZeroIndexedTest:test__codesize() (gas: 60950) DN420OnlyERC20Test:testApprove() (gas: 35770) DN420OnlyERC20Test:testApprove(address,uint256) (runs: 272, μ: 30882, ~: 31321) DN420OnlyERC20Test:testBurn() (gas: 49034) diff --git a/test/DN404.t.sol b/test/DN404.t.sol index f905427..e813e56 100644 --- a/test/DN404.t.sol +++ b/test/DN404.t.sol @@ -807,42 +807,4 @@ contract DN404Test is SoladyTest { } } } - - function testZZZ() public { - address alice = address(111); - address bob = address(222); - - dn.initializeDN404(0, address(this), address(mirror)); - dn.mint(alice, 10 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 10); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - vm.prank(alice); - dn.transfer(bob, 9 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 9); - - vm.prank(alice); - dn.setSkipNFT(true); - - vm.prank(bob); - dn.transfer(alice, 9 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - dn.mint(alice, 3 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - assertEq(dn.totalSupply(), 13 * _WAD); - assertEq(dn.balanceOf(alice), 13 * _WAD); - } } diff --git a/test/DN404ZeroIndexed.t.sol b/test/DN404ZeroIndexed.t.sol index 2844f73..00f313a 100644 --- a/test/DN404ZeroIndexed.t.sol +++ b/test/DN404ZeroIndexed.t.sol @@ -441,10 +441,6 @@ contract DN404ZeroIndexedTest is SoladyTest { dn.mint(to, amount); } - function testYYY() public { - this.testMixed(0x3937eb195ad0e444a9fa9f55d4931def40609c2d7dd7c69f5e0189c032d5ca2c); - } - function testMixed(bytes32) public { dn.setUseExistsLookup(_random() % 2 == 0); @@ -810,42 +806,4 @@ contract DN404ZeroIndexedTest is SoladyTest { } } } - - function testZZZ() public { - address alice = address(111); - address bob = address(222); - - dn.initializeDN404(0, address(this), address(mirror)); - dn.mint(alice, 10 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 10); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - vm.prank(alice); - dn.transfer(bob, 9 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 9); - - vm.prank(alice); - dn.setSkipNFT(true); - - vm.prank(bob); - dn.transfer(alice, 9 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - dn.mint(alice, 3 * _WAD); - assertEq(dn.tokensOf(alice).length, mirror.balanceOf(alice)); - assertEq(mirror.balanceOf(alice), 1); - assertEq(dn.tokensOf(bob).length, mirror.balanceOf(bob)); - assertEq(mirror.balanceOf(bob), 0); - - assertEq(dn.totalSupply(), 13 * _WAD); - assertEq(dn.balanceOf(alice), 13 * _WAD); - } }