Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit cdb41ad

Browse files
bitbeckersbitbeckers
authored
Merge pull request #1279 from hypercerts-org/fix/isMakerBid_strategies_deployment
fix(split): split allows for implicit transfer
2 parents 5d24b66 + ddfd669 commit cdb41ad

File tree

11 files changed

+441
-121
lines changed

11 files changed

+441
-121
lines changed

‎contracts/.openzeppelin/sepolia.json‎

Lines changed: 366 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,372 @@
371371
},
372372
"namespaces": {}
373373
}
374+
},
375+
"125db54394ee349f18c5e7b6f717dff5868c4ccab68a96eeef38a6321b3f05b2": {
376+
"address": "0x0c4e5Be5D99B33A2a860C21D9B9f5C98Be8A758C",
377+
"txHash": "0x8350264379987de7496543b843aea532c11608bdfae6a47d301d5fe45acdd720",
378+
"layout": {
379+
"solcVersion": "0.8.17",
380+
"storage": [
381+
{
382+
"label": "_initialized",
383+
"offset": 0,
384+
"slot": "0",
385+
"type": "t_uint8",
386+
"contract": "Initializable",
387+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol:62",
388+
"retypedFrom": "bool"
389+
},
390+
{
391+
"label": "_initializing",
392+
"offset": 1,
393+
"slot": "0",
394+
"type": "t_bool",
395+
"contract": "Initializable",
396+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol:67"
397+
},
398+
{
399+
"label": "__gap",
400+
"offset": 0,
401+
"slot": "1",
402+
"type": "t_array(t_uint256)50_storage",
403+
"contract": "ContextUpgradeable",
404+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/utils/ContextUpgradeable.sol:36"
405+
},
406+
{
407+
"label": "__gap",
408+
"offset": 0,
409+
"slot": "51",
410+
"type": "t_array(t_uint256)50_storage",
411+
"contract": "ERC165Upgradeable",
412+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/ERC165Upgradeable.sol:41"
413+
},
414+
{
415+
"label": "_balances",
416+
"offset": 0,
417+
"slot": "101",
418+
"type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))",
419+
"contract": "ERC1155Upgradeable",
420+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol:25"
421+
},
422+
{
423+
"label": "_operatorApprovals",
424+
"offset": 0,
425+
"slot": "102",
426+
"type": "t_mapping(t_address,t_mapping(t_address,t_bool))",
427+
"contract": "ERC1155Upgradeable",
428+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol:28"
429+
},
430+
{
431+
"label": "_uri",
432+
"offset": 0,
433+
"slot": "103",
434+
"type": "t_string_storage",
435+
"contract": "ERC1155Upgradeable",
436+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol:31"
437+
},
438+
{
439+
"label": "__gap",
440+
"offset": 0,
441+
"slot": "104",
442+
"type": "t_array(t_uint256)47_storage",
443+
"contract": "ERC1155Upgradeable",
444+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol:528"
445+
},
446+
{
447+
"label": "__gap",
448+
"offset": 0,
449+
"slot": "151",
450+
"type": "t_array(t_uint256)50_storage",
451+
"contract": "ERC1155BurnableUpgradeable",
452+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol:52"
453+
},
454+
{
455+
"label": "_baseURI",
456+
"offset": 0,
457+
"slot": "201",
458+
"type": "t_string_storage",
459+
"contract": "ERC1155URIStorageUpgradeable",
460+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/ERC1155URIStorageUpgradeable.sol:27"
461+
},
462+
{
463+
"label": "_tokenURIs",
464+
"offset": 0,
465+
"slot": "202",
466+
"type": "t_mapping(t_uint256,t_string_storage)",
467+
"contract": "ERC1155URIStorageUpgradeable",
468+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/ERC1155URIStorageUpgradeable.sol:30"
469+
},
470+
{
471+
"label": "__gap",
472+
"offset": 0,
473+
"slot": "203",
474+
"type": "t_array(t_uint256)48_storage",
475+
"contract": "ERC1155URIStorageUpgradeable",
476+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/ERC1155URIStorageUpgradeable.sol:77"
477+
},
478+
{
479+
"label": "_owner",
480+
"offset": 0,
481+
"slot": "251",
482+
"type": "t_address",
483+
"contract": "OwnableUpgradeable",
484+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol:22"
485+
},
486+
{
487+
"label": "__gap",
488+
"offset": 0,
489+
"slot": "252",
490+
"type": "t_array(t_uint256)49_storage",
491+
"contract": "OwnableUpgradeable",
492+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol:94"
493+
},
494+
{
495+
"label": "__gap",
496+
"offset": 0,
497+
"slot": "301",
498+
"type": "t_array(t_uint256)50_storage",
499+
"contract": "ERC1967UpgradeUpgradeable",
500+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211"
501+
},
502+
{
503+
"label": "__gap",
504+
"offset": 0,
505+
"slot": "351",
506+
"type": "t_array(t_uint256)50_storage",
507+
"contract": "UUPSUpgradeable",
508+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol:107"
509+
},
510+
{
511+
"label": "typeCounter",
512+
"offset": 0,
513+
"slot": "401",
514+
"type": "t_uint256",
515+
"contract": "SemiFungible1155",
516+
"src": "src/protocol/SemiFungible1155.sol:27"
517+
},
518+
{
519+
"label": "owners",
520+
"offset": 0,
521+
"slot": "402",
522+
"type": "t_mapping(t_uint256,t_address)",
523+
"contract": "SemiFungible1155",
524+
"src": "src/protocol/SemiFungible1155.sol:38"
525+
},
526+
{
527+
"label": "creators",
528+
"offset": 0,
529+
"slot": "403",
530+
"type": "t_mapping(t_uint256,t_address)",
531+
"contract": "SemiFungible1155",
532+
"src": "src/protocol/SemiFungible1155.sol:41"
533+
},
534+
{
535+
"label": "tokenValues",
536+
"offset": 0,
537+
"slot": "404",
538+
"type": "t_mapping(t_uint256,t_uint256)",
539+
"contract": "SemiFungible1155",
540+
"src": "src/protocol/SemiFungible1155.sol:44"
541+
},
542+
{
543+
"label": "maxIndex",
544+
"offset": 0,
545+
"slot": "405",
546+
"type": "t_mapping(t_uint256,t_uint256)",
547+
"contract": "SemiFungible1155",
548+
"src": "src/protocol/SemiFungible1155.sol:47"
549+
},
550+
{
551+
"label": "__gap",
552+
"offset": 0,
553+
"slot": "406",
554+
"type": "t_array(t_uint256)25_storage",
555+
"contract": "SemiFungible1155",
556+
"src": "src/protocol/SemiFungible1155.sol:648"
557+
},
558+
{
559+
"label": "merkleRoots",
560+
"offset": 0,
561+
"slot": "431",
562+
"type": "t_mapping(t_uint256,t_bytes32)",
563+
"contract": "AllowlistMinter",
564+
"src": "src/protocol/AllowlistMinter.sol:17"
565+
},
566+
{
567+
"label": "hasBeenClaimed",
568+
"offset": 0,
569+
"slot": "432",
570+
"type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_bool))",
571+
"contract": "AllowlistMinter",
572+
"src": "src/protocol/AllowlistMinter.sol:18"
573+
},
574+
{
575+
"label": "maxUnits",
576+
"offset": 0,
577+
"slot": "433",
578+
"type": "t_mapping(t_uint256,t_uint256)",
579+
"contract": "AllowlistMinter",
580+
"src": "src/protocol/AllowlistMinter.sol:19"
581+
},
582+
{
583+
"label": "minted",
584+
"offset": 0,
585+
"slot": "434",
586+
"type": "t_mapping(t_uint256,t_uint256)",
587+
"contract": "AllowlistMinter",
588+
"src": "src/protocol/AllowlistMinter.sol:20"
589+
},
590+
{
591+
"label": "__gap",
592+
"offset": 0,
593+
"slot": "435",
594+
"type": "t_array(t_uint256)26_storage",
595+
"contract": "AllowlistMinter",
596+
"src": "src/protocol/AllowlistMinter.sol:75"
597+
},
598+
{
599+
"label": "_paused",
600+
"offset": 0,
601+
"slot": "461",
602+
"type": "t_bool",
603+
"contract": "PausableUpgradeable",
604+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/security/PausableUpgradeable.sol:29"
605+
},
606+
{
607+
"label": "__gap",
608+
"offset": 0,
609+
"slot": "462",
610+
"type": "t_array(t_uint256)49_storage",
611+
"contract": "PausableUpgradeable",
612+
"src": "lib/openzeppelin-contracts-upgradeable/contracts/security/PausableUpgradeable.sol:116"
613+
},
614+
{
615+
"label": "typeRestrictions",
616+
"offset": 0,
617+
"slot": "511",
618+
"type": "t_mapping(t_uint256,t_enum(TransferRestrictions)19459)",
619+
"contract": "HypercertMinter",
620+
"src": "src/protocol/HypercertMinter.sol:20"
621+
},
622+
{
623+
"label": "__gap",
624+
"offset": 0,
625+
"slot": "512",
626+
"type": "t_array(t_uint256)29_storage",
627+
"contract": "HypercertMinter",
628+
"src": "src/protocol/HypercertMinter.sol:258"
629+
}
630+
],
631+
"types": {
632+
"t_address": {
633+
"label": "address",
634+
"numberOfBytes": "20"
635+
},
636+
"t_array(t_uint256)25_storage": {
637+
"label": "uint256[25]",
638+
"numberOfBytes": "800"
639+
},
640+
"t_array(t_uint256)26_storage": {
641+
"label": "uint256[26]",
642+
"numberOfBytes": "832"
643+
},
644+
"t_array(t_uint256)29_storage": {
645+
"label": "uint256[29]",
646+
"numberOfBytes": "928"
647+
},
648+
"t_array(t_uint256)47_storage": {
649+
"label": "uint256[47]",
650+
"numberOfBytes": "1504"
651+
},
652+
"t_array(t_uint256)48_storage": {
653+
"label": "uint256[48]",
654+
"numberOfBytes": "1536"
655+
},
656+
"t_array(t_uint256)49_storage": {
657+
"label": "uint256[49]",
658+
"numberOfBytes": "1568"
659+
},
660+
"t_array(t_uint256)50_storage": {
661+
"label": "uint256[50]",
662+
"numberOfBytes": "1600"
663+
},
664+
"t_bool": {
665+
"label": "bool",
666+
"numberOfBytes": "1"
667+
},
668+
"t_bytes32": {
669+
"label": "bytes32",
670+
"numberOfBytes": "32"
671+
},
672+
"t_enum(TransferRestrictions)19459": {
673+
"label": "enum IHypercertToken.TransferRestrictions",
674+
"members": [
675+
"AllowAll",
676+
"DisallowAll",
677+
"FromCreatorOnly"
678+
],
679+
"numberOfBytes": "1"
680+
},
681+
"t_mapping(t_address,t_bool)": {
682+
"label": "mapping(address => bool)",
683+
"numberOfBytes": "32"
684+
},
685+
"t_mapping(t_address,t_mapping(t_address,t_bool))": {
686+
"label": "mapping(address => mapping(address => bool))",
687+
"numberOfBytes": "32"
688+
},
689+
"t_mapping(t_address,t_uint256)": {
690+
"label": "mapping(address => uint256)",
691+
"numberOfBytes": "32"
692+
},
693+
"t_mapping(t_bytes32,t_bool)": {
694+
"label": "mapping(bytes32 => bool)",
695+
"numberOfBytes": "32"
696+
},
697+
"t_mapping(t_uint256,t_address)": {
698+
"label": "mapping(uint256 => address)",
699+
"numberOfBytes": "32"
700+
},
701+
"t_mapping(t_uint256,t_bytes32)": {
702+
"label": "mapping(uint256 => bytes32)",
703+
"numberOfBytes": "32"
704+
},
705+
"t_mapping(t_uint256,t_enum(TransferRestrictions)19459)": {
706+
"label": "mapping(uint256 => enum IHypercertToken.TransferRestrictions)",
707+
"numberOfBytes": "32"
708+
},
709+
"t_mapping(t_uint256,t_mapping(t_address,t_uint256))": {
710+
"label": "mapping(uint256 => mapping(address => uint256))",
711+
"numberOfBytes": "32"
712+
},
713+
"t_mapping(t_uint256,t_mapping(t_bytes32,t_bool))": {
714+
"label": "mapping(uint256 => mapping(bytes32 => bool))",
715+
"numberOfBytes": "32"
716+
},
717+
"t_mapping(t_uint256,t_string_storage)": {
718+
"label": "mapping(uint256 => string)",
719+
"numberOfBytes": "32"
720+
},
721+
"t_mapping(t_uint256,t_uint256)": {
722+
"label": "mapping(uint256 => uint256)",
723+
"numberOfBytes": "32"
724+
},
725+
"t_string_storage": {
726+
"label": "string",
727+
"numberOfBytes": "32"
728+
},
729+
"t_uint256": {
730+
"label": "uint256",
731+
"numberOfBytes": "32"
732+
},
733+
"t_uint8": {
734+
"label": "uint8",
735+
"numberOfBytes": "1"
736+
}
737+
},
738+
"namespaces": {}
739+
}
374740
}
375741
}
376742
}

‎contracts/contracts/HypercertMinter.sol‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,8 @@ contract HypercertMinter is IHypercertToken, SemiFungible1155, AllowlistMinter,
116116

117117
/// @notice Split a claimtokens value into parts with summed value equal to the original
118118
/// @dev see {IHypercertToken}
119-
function splitFraction(address _account, uint256 _tokenID, uint256[] calldata _newFractions)
120-
external
121-
whenNotPaused
122-
{
123-
_splitTokenUnits(_account, _tokenID, _newFractions);
119+
function splitFraction(address _to, uint256 _tokenID, uint256[] calldata _newFractions) external whenNotPaused {
120+
_splitTokenUnits(_to, _tokenID, _newFractions);
124121
}
125122

126123
/// @notice Merge the value of tokens belonging to the same claim

0 commit comments

Comments
 (0)