From 5869007f15c21f667cfb60f44423990c49d34d3d Mon Sep 17 00:00:00 2001 From: yu23ki14 Date: Mon, 9 Dec 2024 22:13:53 +0900 Subject: [PATCH] fix deploy script --- pkgs/contract/.openzeppelin/sepolia.json | 398 +++++++++++++++++++ pkgs/contract/outputs/contracts-sepolia.json | 10 +- pkgs/contract/scripts/deploy/all.ts | 4 +- 3 files changed, 404 insertions(+), 8 deletions(-) diff --git a/pkgs/contract/.openzeppelin/sepolia.json b/pkgs/contract/.openzeppelin/sepolia.json index 663bc41..3da8ea8 100644 --- a/pkgs/contract/.openzeppelin/sepolia.json +++ b/pkgs/contract/.openzeppelin/sepolia.json @@ -10,6 +10,21 @@ "address": "0x08EA1AFcF193b19EcEd95538AcCDA4D770eeC147", "txHash": "0x8eef64bbc8e38b4543da5f873ad325f83628fae3cfea00452f740cd1eccfa5f8", "kind": "transparent" + }, + { + "address": "0xd921517fdF141d97C289bDb9686f51A1375dCc69", + "txHash": "0x66972a35a2daff39ec5f5280361cfb9016ce53b19e5730310c9a033d71e4b634", + "kind": "transparent" + }, + { + "address": "0xbe985Fdd213d85d72C82cf34774C5D830e806FcB", + "txHash": "0xd28cccaf12be77f3503c8e663699b89b157872299a2f153c8c5bbea55b565bcd", + "kind": "transparent" + }, + { + "address": "0x08B4c53b98f46B14E2AD00189C2Aa3b9F3d0c8f3", + "txHash": "0x0b7d0cacd542bf718e6d99c13f12690b07a0f3228c31d013a2aa399cb67ae04e", + "kind": "transparent" } ], "impls": { @@ -684,6 +699,389 @@ ] } } + }, + "a50d3370e9a1f0391a140cda5e767c98982881d6b86245dea5f89ba08e4f5493": { + "address": "0xCe060E28bb926d914583972fda686694e6703Cf4", + "txHash": "0x13369a16af7294d59e33b95630e8c28ddac8bf56df06b06ef410e3388396be72", + "layout": { + "solcVersion": "0.8.24", + "storage": [ + { + "label": "TOKEN_SUPPLY", + "offset": 0, + "slot": "0", + "type": "t_uint256", + "contract": "FractionToken", + "src": "contracts/fractiontoken/FractionToken.sol:8" + }, + { + "label": "tokenRecipients", + "offset": 0, + "slot": "1", + "type": "t_mapping(t_uint256,t_array(t_address)dyn_storage)", + "contract": "FractionToken", + "src": "contracts/fractiontoken/FractionToken.sol:10" + }, + { + "label": "hatsContract", + "offset": 0, + "slot": "2", + "type": "t_contract(IHats)16981", + "contract": "FractionToken", + "src": "contracts/fractiontoken/FractionToken.sol:12" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_bool))": { + "label": "mapping(address => mapping(address => bool))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(ERC1155Storage)166_storage": { + "label": "struct ERC1155Upgradeable.ERC1155Storage", + "members": [ + { + "label": "_balances", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "offset": 0, + "slot": "0" + }, + { + "label": "_operatorApprovals", + "type": "t_mapping(t_address,t_mapping(t_address,t_bool))", + "offset": 0, + "slot": "1" + }, + { + "label": "_uri", + "type": "t_string_storage", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(InitializableStorage)73_storage": { + "label": "struct Initializable.InitializableStorage", + "members": [ + { + "label": "_initialized", + "type": "t_uint64", + "offset": 0, + "slot": "0" + }, + { + "label": "_initializing", + "type": "t_bool", + "offset": 8, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_array(t_address)dyn_storage": { + "label": "address[]", + "numberOfBytes": "32" + }, + "t_contract(IHats)16981": { + "label": "contract IHats", + "numberOfBytes": "20" + }, + "t_mapping(t_uint256,t_array(t_address)dyn_storage)": { + "label": "mapping(uint256 => address[])", + "numberOfBytes": "32" + } + }, + "namespaces": { + "erc7201:openzeppelin.storage.ERC1155": [ + { + "contract": "ERC1155Upgradeable", + "label": "_balances", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "src": "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol:27", + "offset": 0, + "slot": "0" + }, + { + "contract": "ERC1155Upgradeable", + "label": "_operatorApprovals", + "type": "t_mapping(t_address,t_mapping(t_address,t_bool))", + "src": "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol:29", + "offset": 0, + "slot": "1" + }, + { + "contract": "ERC1155Upgradeable", + "label": "_uri", + "type": "t_string_storage", + "src": "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol:32", + "offset": 0, + "slot": "2" + } + ], + "erc7201:openzeppelin.storage.Initializable": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_uint64", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69", + "offset": 0, + "slot": "0" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73", + "offset": 8, + "slot": "0" + } + ] + } + } + }, + "44db4a69fff808b4e6acc9c9856b1d7b212464248b554fcc4f1508639eb93381": { + "address": "0xf3d9c56946Fa9E974b86e220645e563615D654Cc", + "txHash": "0x5227ef554354e74bad8b056ba94c62e0414e90cd773e90dcaf398c456f60802d", + "layout": { + "solcVersion": "0.8.24", + "storage": [ + { + "label": "SPLITS_CREATOR_IMPLEMENTATION", + "offset": 0, + "slot": "0", + "type": "t_address", + "contract": "SplitsCreatorFactory", + "src": "contracts/splitscreator/SplitsCreatorFactory.sol:20" + } + ], + "types": { + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_struct(InitializableStorage)7_storage": { + "label": "struct Initializable.InitializableStorage", + "members": [ + { + "label": "_initialized", + "type": "t_uint64", + "offset": 0, + "slot": "0" + }, + { + "label": "_initializing", + "type": "t_bool", + "offset": 8, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_address": { + "label": "address", + "numberOfBytes": "20" + } + }, + "namespaces": { + "erc7201:openzeppelin.storage.Initializable": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_uint64", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69", + "offset": 0, + "slot": "0" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73", + "offset": 8, + "slot": "0" + } + ] + } + } + }, + "7840b8c8fb43a65c86b7b0642058baa343a8b6f483c8d9d2370e87beeb6c44ce": { + "address": "0x6AcF43dCe73D9EA7029180A4C51C7De80552B4d7", + "txHash": "0xc134fddba4992574c96b67408e24d8cc1b1b8a63529bd0b628e83c1aa26004ca", + "layout": { + "solcVersion": "0.8.24", + "storage": [ + { + "label": "Hats", + "offset": 0, + "slot": "0", + "type": "t_contract(IHats)16981", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:11" + }, + { + "label": "HatsModuleFactory", + "offset": 0, + "slot": "1", + "type": "t_contract(IHatsModuleFactory)9741", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:13" + }, + { + "label": "SplitsCreatorFactory", + "offset": 0, + "slot": "2", + "type": "t_contract(ISplitsCreatorFactory)21158", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:15" + }, + { + "label": "HatsTimeFrameModule_IMPL", + "offset": 0, + "slot": "3", + "type": "t_address", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:17" + }, + { + "label": "SplitsFactoryV2", + "offset": 0, + "slot": "4", + "type": "t_address", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:19" + }, + { + "label": "FractionToken", + "offset": 0, + "slot": "5", + "type": "t_address", + "contract": "BigBang", + "src": "contracts/bigbang/BigBang.sol:21" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_struct(InitializableStorage)73_storage": { + "label": "struct Initializable.InitializableStorage", + "members": [ + { + "label": "_initialized", + "type": "t_uint64", + "offset": 0, + "slot": "0" + }, + { + "label": "_initializing", + "type": "t_bool", + "offset": 8, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(OwnableStorage)13_storage": { + "label": "struct OwnableUpgradeable.OwnableStorage", + "members": [ + { + "label": "_owner", + "type": "t_address", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_contract(IHats)16981": { + "label": "contract IHats", + "numberOfBytes": "20" + }, + "t_contract(IHatsModuleFactory)9741": { + "label": "contract IHatsModuleFactory", + "numberOfBytes": "20" + }, + "t_contract(ISplitsCreatorFactory)21158": { + "label": "contract ISplitsCreatorFactory", + "numberOfBytes": "20" + } + }, + "namespaces": { + "erc7201:openzeppelin.storage.Ownable": [ + { + "contract": "OwnableUpgradeable", + "label": "_owner", + "type": "t_address", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:24", + "offset": 0, + "slot": "0" + } + ], + "erc7201:openzeppelin.storage.Initializable": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_uint64", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69", + "offset": 0, + "slot": "0" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73", + "offset": 8, + "slot": "0" + } + ] + } + } } } } diff --git a/pkgs/contract/outputs/contracts-sepolia.json b/pkgs/contract/outputs/contracts-sepolia.json index a556fe7..95f38b0 100644 --- a/pkgs/contract/outputs/contracts-sepolia.json +++ b/pkgs/contract/outputs/contracts-sepolia.json @@ -3,10 +3,10 @@ "Hats": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137", "HatsModuleFactory": "0x0a3f85fa597B6a967271286aA0724811acDF5CD9", "PullSplitsFactory": "0x80f1B766817D04870f115fEBbcCADF8DBF75E017", - "BigBang": "0x08EA1AFcF193b19EcEd95538AcCDA4D770eeC147", - "FractionToken": "0x4747b535f1C4a48bbfc88CA68DC8973DD38Eb413", - "SplitsCreatorFactory": "0x96bbed9989387bb512ea29a8fa54f03d33bad169", - "SplitsCreator": "0x9c3648df4bb82fdf067a9b083900a986f9b27e9a", - "HatsTimeFrameModule": "0x8760411d317e560021db83b35971ab0dded4e205" + "BigBang": "0x08B4c53b98f46B14E2AD00189C2Aa3b9F3d0c8f3", + "FractionToken": "0xd921517fdF141d97C289bDb9686f51A1375dCc69", + "SplitsCreatorFactory": "0xbe985Fdd213d85d72C82cf34774C5D830e806FcB", + "SplitsCreator": "0x6b5d2e27ff74e9adf4d23aebb9efb52867823583", + "HatsTimeFrameModule": "0x9878f0905bcea0c2380be801f24dd5654f9b678f" } } \ No newline at end of file diff --git a/pkgs/contract/scripts/deploy/all.ts b/pkgs/contract/scripts/deploy/all.ts index 0f3fc7b..4a0addb 100644 --- a/pkgs/contract/scripts/deploy/all.ts +++ b/pkgs/contract/scripts/deploy/all.ts @@ -34,8 +34,7 @@ const deployAll = async () => { const { FractionToken } = await deployFractionToken( "", 10000n, - Hats as Address, - zeroAddress + Hats as Address ); const { SplitsCreator } = await deploySplitsCreator(); @@ -45,7 +44,6 @@ const deployAll = async () => { ); const { BigBang } = await deployBigBang({ - trustedForwarder: zeroAddress, hatsContractAddress: Hats as Address, hatsModuleFacotryAddress: HatsModuleFactory as Address, hatsTimeFrameModule_impl: HatsTimeFrameModule.address,