Skip to content

Commit

Permalink
Merge pull request #1580 from thesandboxgame/chore/testnet-deploy-lan…
Browse files Browse the repository at this point in the history 
…dsale-58

chore: Land sale 58 on testnet, second attempt.
  • Loading branch information
@adjisb
adjisb authored Sep 2, 2024
2 parents f7e209a + 4131f2c commit 03da397
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 148 deletions.
4 changes: 2 additions & 2 deletions packages/core/data/landSales/LandPreSale_35/bundles.testnet.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"198": [
"1879073777507537447029520769267953353987681801241708"
"199": [
"378390863599062370172033407345143911589283164033054"
]
}
50 changes: 1 addition & 49 deletions packages/core/data/landSales/LandPreSale_35/sectors.testnet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,59 +3,11 @@
"sector": 58,
"limit": 10000,
"lands": [
{
"coordinateX": -105,
"coordinateY": 60,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -105,
"coordinateY": 61,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -105,
"coordinateY": 62,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -104,
"coordinateY": 60,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -104,
"coordinateY": 61,
"ownerAddress": "",
"bundleId": "198"
},
{
"coordinateX": -104,
"coordinateY": 62,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -103,
"coordinateY": 60,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -103,
"coordinateY": 61,
"ownerAddress": "",
"bundleId": ""
},
{
"coordinateX": -103,
"coordinateY": 62,
"ownerAddress": "",
"bundleId": ""
"bundleId": "199"
}
],
"estates": []
Expand Down
122 changes: 25 additions & 97 deletions packages/core/deployments/amoy/PolygonLandPreSale_58.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x0D24A34C384306C4bD9f535F97d0E5c02da509E2",
"address": "0xeEBa7E1B42202Ed4a71032803fC974460F415686",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -641,47 +641,47 @@
"type": "function"
}
],
"transactionHash": "0xcbdee4ba980156a108bc6e6c0707849fd537f08f3ee9bfe802c8cbdfa0f2b2e6",
"transactionHash": "0x0b604698bafb56230b1e094ffe1af18e0b9678457d47d603097c88e13221f6fe",
"receipt": {
"to": null,
"from": "0x5F890c9522dCE5670d741D4277BFCC2d9cA8Af02",
"contractAddress": "0x0D24A34C384306C4bD9f535F97d0E5c02da509E2",
"transactionIndex": 2,
"contractAddress": "0xeEBa7E1B42202Ed4a71032803fC974460F415686",
"transactionIndex": 0,
"gasUsed": "2668417",
"logsBloom": "0x00000000000000000000000000000000000000002000000000040000000000000002000000000000000000000000000000008000000000000000000040000000000000000000000000000000000000800000000000000000000100000000002000000000000000100000000000000000000000000000000080040001010000000000000000000000000000000000000000000000000000000000000000200000200000000000000000000000000000000000000000000000000000000000004000000000000000000001000000000000000000000000000000108008000000000000000000000000000000000000000000000000000000000000000000100000",
"blockHash": "0x63d4c0e4ec4065eb2bd7b7852cdab17fa17d6865160b7def080c30b079312d14",
"transactionHash": "0xcbdee4ba980156a108bc6e6c0707849fd537f08f3ee9bfe802c8cbdfa0f2b2e6",
"logsBloom": "0x00000000000000000000000000000000000000040000000000040000000000000002000000000000002000000000000000008000000000000000000000800000000000000000000000000000000000800000000000000000000100000000000000000000000000000000000000000000000000000000000080000000010000000000000000000000000000000000000000000000000000000008000000200000208000000001000000000000000000000000000000000000000000000000004000000000000000000001000000000000000000000000000000108008000000000000000000000000000000000000000000000000000000000000000000100000",
"blockHash": "0x9e0094e88e1c2bf962bd14568ef5861e343b122ab83b3c04f48d36d8f4a31760",
"transactionHash": "0x0b604698bafb56230b1e094ffe1af18e0b9678457d47d603097c88e13221f6fe",
"logs": [
{
"transactionIndex": 2,
"blockNumber": 10785657,
"transactionHash": "0xcbdee4ba980156a108bc6e6c0707849fd537f08f3ee9bfe802c8cbdfa0f2b2e6",
"address": "0x0D24A34C384306C4bD9f535F97d0E5c02da509E2",
"transactionIndex": 0,
"blockNumber": 11326556,
"transactionHash": "0x0b604698bafb56230b1e094ffe1af18e0b9678457d47d603097c88e13221f6fe",
"address": "0xeEBa7E1B42202Ed4a71032803fC974460F415686",
"topics": [
"0xb21eb88b4e33b3f1281830a7178d74d8aa73220416215726b68ae23d539515cb"
],
"data": "0x000000000000000000000000d20fbd836e80dabfb777e6aabbe52e96c07ecd1b0000000000000000000000000000000000000000000000000000000000000001",
"logIndex": 6,
"blockHash": "0x63d4c0e4ec4065eb2bd7b7852cdab17fa17d6865160b7def080c30b079312d14"
"logIndex": 0,
"blockHash": "0x9e0094e88e1c2bf962bd14568ef5861e343b122ab83b3c04f48d36d8f4a31760"
},
{
"transactionIndex": 2,
"blockNumber": 10785657,
"transactionHash": "0xcbdee4ba980156a108bc6e6c0707849fd537f08f3ee9bfe802c8cbdfa0f2b2e6",
"transactionIndex": 0,
"blockNumber": 11326556,
"transactionHash": "0x0b604698bafb56230b1e094ffe1af18e0b9678457d47d603097c88e13221f6fe",
"address": "0x0000000000000000000000000000000000001010",
"topics": [
"0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
"0x0000000000000000000000000000000000000000000000000000000000001010",
"0x0000000000000000000000005f890c9522dce5670d741d4277bfcc2d9ca8af02",
"0x0000000000000000000000004631753190f2f5a15a7ba172bbac102b7d95fa22"
"0x000000000000000000000000bb583a9dde59ca64aaa14807f37a4c665c0d72c7"
],
"data": "0x000000000000000000000000000000000000000000000000011c67556b8aeb71000000000000000000000000000000000000000000000002321a2678f90f512400000000000000000000000000000000000000000000016f2417467cb707651300000000000000000000000000000000000000000000000230fdbf238d8465b300000000000000000000000000000000000000000000016f2533add222925084",
"logIndex": 7,
"blockHash": "0x63d4c0e4ec4065eb2bd7b7852cdab17fa17d6865160b7def080c30b079312d14"
"data": "0x00000000000000000000000000000000000000000000000000ed00c730f0ba0000000000000000000000000000000000000000000000000214219f55331f132c0000000000000000000000000000000000000000000000d1a8aa936e9642460800000000000000000000000000000000000000000000000213349e8e022e592c0000000000000000000000000000000000000000000000d1a9979435c7330008",
"logIndex": 1,
"blockHash": "0x9e0094e88e1c2bf962bd14568ef5861e343b122ab83b3c04f48d36d8f4a31760"
}
],
"blockNumber": 10785657,
"cumulativeGasUsed": "2814076",
"blockNumber": 11326556,
"cumulativeGasUsed": "2668417",
"status": 1,
"byzantium": true
},
Expand All @@ -691,7 +691,7 @@
"0xD20fbd836e80DabFb777E6AaBbe52e96c07eCD1B",
"0x49c4D4C94829B9c44052C5f5Cb164Fc612181165",
"0xa5Eb9C9Eb4F4c35B9Be8cFaAA7909F9ebe6Cb609",
"0x2fcec1cfbb1762dea0885df5d6d1c1a099db2b4d154b42c6400c9ecc33fa92e1",
"0x02e3e355ea193d22a0a87a55a5216153638b11e61bb0a512fee8c9ea857647ad",
2040206400,
"0xB7060D3FeCAC3AE1F0A0AA416E3e8E472257950e",
2000,
Expand All @@ -702,88 +702,16 @@
],
"numDeployments": 1,
"linkedData": [
{
"x": 99,
"y": 264,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0x0ce8f9d0c5a13d9b0f0dee190823623847a53b41276323b1caf14f6cea9fce02",
"assetIds": []
},
{
"x": 99,
"y": 265,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0xcf4976f2b1ef88f02245229c8714ec679fa3af14341b20535b892d5d3b2f9fd6",
"assetIds": []
},
{
"x": 99,
"y": 266,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0xdbb2f533860ad32b9902c5eedd20aac0716aaddaf3da48446dc183fdc2630315",
"assetIds": []
},
{
"x": 100,
"y": 264,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0xec8aff06f20dce590e209198b4ab0b9fec25889f4ae658f0baa9c7795b733a78",
"assetIds": []
},
{
"x": 100,
"y": 265,
"size": 1,
"price": "4683000000000000000000",
"reserved": "",
"salt": "0x8bd112405c36e647c7a85041d12a6bbc5237b2af087d7ef65c26fc30133faf8f",
"salt": "0xa10e2cb0b59289bf0c986a282d6e864da14933032c10c25ad383bb2b6d370091",
"assetIds": [
"1879073777507537447029520769267953353987681801241708"
"378390863599062370172033407345143911589283164033054"
]
},
{
"x": 100,
"y": 266,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0x356c793b017a436ea3c3dc59211b0f4b911a695490f0ad9cdae615c566f369cb",
"assetIds": []
},
{
"x": 101,
"y": 264,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0x96da01048677b7eae8a6baba5b91f80f444ec6cfdcb936d25194ed77dbd1ec05",
"assetIds": []
},
{
"x": 101,
"y": 265,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0xad18b2a77c642cdbc58e7313f32984ec73e51ebf04b0cdeed55c62a8764c1f7e",
"assetIds": []
},
{
"x": 101,
"y": 266,
"size": 1,
"price": "1011000000000000000000",
"reserved": "",
"salt": "0x853004f6f3dcb01699a0dbef3df1c23be7047b2327338d282c6bda2cba0659b3",
"assetIds": []
}
],
"solcInputHash": "b42a863a795806b4ea3a8f05dfa42539",
Expand Down

1 comment on commit 03da397

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage for this commit

80.61%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
packages/avatar/contracts/avatar
   AvatarCollection.sol74.25%56.56%73.81%90.37%285, 329–337, 339–340, 345, 403–407, 425, 442, 459, 483–487, 491–492, 495, 526, 537, 545, 545–546, 565, 599, 621, 631, 712, 732, 745, 745, 745, 763, 763, 765, 774, 774, 776, 786, 786–787, 797, 797–798, 809, 809–810, 823, 832, 861–862, 992–993, 996, 999
   CollectionAccessControl.sol60.87%53.33%63.64%67.86%120, 130–131, 140, 150–151, 161–162, 162, 162, 164–165, 167, 173, 173–174, 185, 192, 192–194, 98–99
   ERC721BurnMemoryEnumerableUpgradeable.sol93.33%75%100%100%62, 75
packages/avatar/contracts/common
   IERC4906.sol100%100%100%100%
   IERC5313.sol100%100%100%100%
packages/avatar/contracts/common/BaseWithStorage/ERC2771
   ERC2771HandlerUpgradeable.sol44.44%25%60%44.44%23, 27, 30, 39, 39, 39–40, 42
packages/avatar/contracts/common/OperatorFilterer
   IOperatorFilterRegistry.sol100%100%100%100%
   UpdatableOperatorFiltererUpgradeable.sol11.11%10%25%9.52%18, 23–24, 24, 24–25, 27, 27, 27–28, 30, 38, 38, 38, 42, 42, 42–44, 46, 46, 46–47, 50, 55, 55, 55–56, 56, 56–57, 60, 68, 68, 68–69, 71
packages/avatar/contracts/proxy
   CollectionFactory.sol86.59%89.06%75%87.50%149, 230, 293, 362–366, 368, 385, 402, 410, 410–411, 423, 423–424
   CollectionProxy.sol88.24%50%100%100%55, 70
packages/avatar/contracts/raffle
   DanceFight.sol75%50%100%100%20
   FistOfTheNorthStar.sol75%50%100%100%20
   GenericRaffle.sol67.92%52.22%62.07%84.95%178, 189–195, 225–229, 252–259, 266–267, 270, 288, 288–289, 289, 289–290, 308, 381, 390, 409, 409–410, 419, 419, 421, 430, 430, 432, 442, 442–443, 453, 453–454, 465, 465–466, 566, 575, 626–627, 630, 633
   HellsKitchen.sol75%50%100%100%20
   MadBalls.sol75%50%100%100%20
   ParisHilton.sol75%50%100%100%20
   Rabbids.sol75%50%100%100%20
packages/core/src/solc_0.8/OperatorFilterer/contracts
   OperatorFilterRegistrant.sol62.50%50%100%66.67%17, 19–20
packages/core/src/solc_0.8/OperatorFilterer/contracts/upgradeable
   DefaultOperatorFiltererUpgradeable.sol0%0%0%0%12, 12–13
   OperatorFiltererUpgradeable.sol81.82%80%75%85%16, 16–17, 52–53, 62–63
packages/core/src/solc_0.8/OperatorFilterer/interfaces
   IOperatorFilterRegistry.sol100%100%100%100%
packages/core/src/solc_0.8/Sand
   SandBaseToken.sol100%100%100%100%
packages/core/src/solc_0.8/StarterPack
   PurchaseValidator.sol0%0%0%0%102–103, 112–115, 115, 115–117, 119, 29, 29, 29–30, 35, 35–36, 36, 36–37, 37, 37–39, 48, 53, 58, 64, 87, 87, 87–88
packages/core/src/solc_0.8/Utils
   Batch.sol85.48%59.09%100%100%34, 38, 44, 50, 56, 65, 75, 82, 88
packages/core/src/solc_0.8/catalyst/interfaces
   ICatalyst.sol100%100%100%100%
   ICollectionCatalystMigrations.sol100%100%100%100%
   IGem.sol100%100%100%100%
   IGemsCatalystsRegistry.sol100%100%100%100%
   IOldCatalystRegistry.sol100%100%100%100%
packages/core/src/solc_0.8/claims/AssetGiveaway
   AssetGiveaway.sol88.89%90%80%91.67%48, 72
   ClaimERC1155.sol100%100%100%100%
packages/core/src/solc_0.8/claims/MultiGiveaway
   ClaimERC1155ERC721ERC20.sol97.62%92.86%100%100%68
   MultiGiveaway.sol93.75%90.91%91.67%96.67%142, 36, 86
packages/core/src/solc_0.8/claims/MultiGiveawayV0
   MultiGiveawayV0.sol97.92%93.75%100%100%81
packages/core/src/solc_0.8/claims/signedGiveaway
   SignedERC20Giveaway.sol93.33%88.89%91.67%96.67%133, 36, 92
packages/core/src/solc_0.8/common/Base
   TheSandbox712.sol100%100%100%100%
packages/core/src/solc_0.8/common/BaseWithStorage
   ERC2771Handler.sol68.42%50%80%70%65, 65, 65–66, 68
   ERC2771HandlerV3.sol58.33%37.50%80%63.64%28, 40, 40, 40–41, 41, 41–42, 44
   ERC721BaseTokenV2.sol78.54%67.31%86.21%86.84%148, 170, 170, 170–173, 173, 173–174, 174, 174, 174, 174, 174, 180, 217, 244, 244, 244, 310–311, 318, 318, 322, 344, 356, 401–402, 402, 402–403, 405, 418–419, 419, 419–420, 422, 424, 439, 442, 442, 52, 52, 52, 73, 73, 73
   MetaTransactionReceiver.sol0%0%0%0%14, 14, 14–15, 19–20, 27
   WithAdmin.sol53.85%50%66.67%50%27, 27, 27–29
   WithAdminV2.sol92.86%75%100%100%35
   WithPermit.sol100%100%100%100%
   WithPermitUpgradeable.sol13.64%16.67%20%9.09%18,

Please sign in to comment.