diff --git a/deployments/8453.json b/deployments/8453.json index 42173d0..021d8f1 100644 --- a/deployments/8453.json +++ b/deployments/8453.json @@ -11,6 +11,16 @@ "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000000000000000000000000000000000000000000155061727479546f6b656e41646d696e455243373231000000000000000000000000000000000000000000000000000000000000000000000000000000000000065053433732310000000000000000000000000000000000000000000000000000", "version": "0.6.0", "address": "0xf14Ae15A9C780E2A5A687Ca4f24b1CF0250db2BE" + }, + { + "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000000000000000000000000000000000000000001050617274792041646d696e204e46547300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550414e4654000000000000000000000000000000000000000000000000000000", + "version": "1.0.0", + "address": "0xBd33c7734Da02f8168ed7247DE10522df925ed2a" + }, + { + "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000000000000000000000000000000000000000001250617274792043726561746f72204e4654730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550434e4654000000000000000000000000000000000000000000000000000000", + "version": "1.0.0", + "address": "0x736C6145C7D5b90b8bd586a9114C2E462318b3FF" } ], "constructorArgs": ["nft_name", "nft_symbol", "partyDao"] @@ -26,6 +36,16 @@ "deployedArgs": "0x000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be", "version": "0.3.0", "address": "0x9a8cF8b3285dA5F11b4d41D942655Ab66e7D99d6" + }, + { + "deployedArgs": "0x000000000000000000000000bd33c7734da02f8168ed7247de10522df925ed2a", + "version": "1.0.0", + "address": "0xb982BcAd61828DADFe097931a12eC6A8fc534d7b" + }, + { + "deployedArgs": "0x000000000000000000000000736c6145c7d5b90b8bd586a9114c2e462318b3ff", + "version": "1.0.0", + "address": "0x36AaFCD0Fd5F7eb6Ed407e8033BF686AdE75812e" } ], "constructorArgs": ["PartyTokenAdminERC721"] @@ -41,6 +61,16 @@ "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000003a520b32c04bf3beef7beb72e919cf822ed34f1000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be000000000000000000000000231278edd38b00b07fbd52120cef685b9baebcc1", "version": "0.3.0", "address": "0x17E2C57eB18aDD6eBf4c6C12E2845e11F9c34293" + }, + { + "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000003a520b32c04bf3beef7beb72e919cf822ed34f1000000000000000000000000bd33c7734da02f8168ed7247de10522df925ed2a000000000000000000000000231278edd38b00b07fbd52120cef685b9baebcc1", + "version": "1.0.0", + "address": "0xf44AbaC6278fC9eD3BdE9DD237d77BAF6f2bbad5" + }, + { + "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000003a520b32c04bf3beef7beb72e919cf822ed34f1000000000000000000000000736c6145c7d5b90b8bd586a9114c2e462318b3ff000000000000000000000000231278edd38b00b07fbd52120cef685b9baebcc1", + "version": "1.0.0", + "address": "0xEd14c01EF4DEaeA2526b44e86d22DCf0942eF74B" } ], "constructorArgs": ["partyDao", "positionManager", "PartyTokenAdminERC721", "uncx"] @@ -56,6 +86,11 @@ "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be0000000000000000000000009a8cf8b3285da5f11b4d41d942655ab66e7d99d600000000000000000000000003a520b32c04bf3beef7beb72e919cf822ed34f100000000000000000000000033128a8fc17869897dce68ed026d694621f6fdfd0000000000000000000000004200000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000271000000000000000000000000017e2c57eb18add6ebf4c6c12e2845e11f9c34293", "version": "0.7.0", "address": "0x9d9453C4258c556c9833Ba49Fc54adBcd6C64999" + }, + { + "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000736c6145c7d5b90b8bd586a9114c2e462318b3ff00000000000000000000000036aafcd0fd5f7eb6ed407e8033bf686ade75812e00000000000000000000000003a520b32c04bf3beef7beb72e919cf822ed34f100000000000000000000000033128a8fc17869897dce68ed026d694621f6fdfd00000000000000000000000042000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000002710000000000000000000000000ed14c01ef4deaea2526b44e86d22dcf0942ef74b", + "version": "1.0.0", + "address": "0x418FBe3309cc2f7b9218C9f4A675A431FB0FaB60" } ], "constructorArgs": [ @@ -72,8 +107,8 @@ }, "constants": { "partyDao": "0x0e63D6f414b40BaFCa676810ef1aBf05ECc8E459", - "nft_name": "PartyTokenAdminERC721", - "nft_symbol": "PSC721", + "nft_name": "Party Creator NFTs", + "nft_symbol": "PCNFT", "positionManager": "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1", "uniswapFactory": "0x33128a8fC17869897dcE68Ed026d694621f6FDfD", "weth": "0x4200000000000000000000000000000000000006", diff --git a/deployments/84532.json b/deployments/84532.json index 5b3a815..cf5a942 100644 --- a/deployments/84532.json +++ b/deployments/84532.json @@ -16,7 +16,6 @@ "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000000000000000000000000000000000000000000155061727479546f6b656e41646d696e455243373231000000000000000000000000000000000000000000000000000000000000000000000000000000000000065053433732310000000000000000000000000000000000000000000000000000", "version": "0.3.0", "address": "0xA8b00B4A02a320D86f11e32374C7469fD67b46c7" -<<<<<<< HEAD }, { "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e4590000000000000000000000000000000000000000000000000000000000000004546573740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035453540000000000000000000000000000000000000000000000000000000000", @@ -27,14 +26,11 @@ "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000000000000000000000000000000000000000000155061727479546f6b656e41646d696e455243373231000000000000000000000000000000000000000000000000000000000000000000000000000000000000065053433732310000000000000000000000000000000000000000000000000000", "version": "0.6.0", "address": "0xf14Ae15A9C780E2A5A687Ca4f24b1CF0250db2BE" -||||||| bdcae4c -======= }, { - "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e4590000000000000000000000000000000000000000000000000000000000000004546573740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035453540000000000000000000000000000000000000000000000000000000000", - "version": "0.5.0", - "address": "0x56b106aa4B78D3FE21F825D8147962533726880C" ->>>>>>> 81fe3997f61bb5aa0f965f724c60aaf11d8b8013 + "deployedArgs": "0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000000000000000000000000000000000000000001250617274792043726561746f72204e4654730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550434e4654000000000000000000000000000000000000000000000000000000", + "version": "1.0.0", + "address": "0x736C6145C7D5b90b8bd586a9114C2E462318b3FF" } ], "constructorArgs": ["nft_name", "nft_symbol", "partyDao"] @@ -50,6 +46,11 @@ "deployedArgs": "0x000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be", "version": "0.3.0", "address": "0x9a8cF8b3285dA5F11b4d41D942655Ab66e7D99d6" + }, + { + "deployedArgs": "0x000000000000000000000000736c6145c7d5b90b8bd586a9114c2e462318b3ff", + "version": "1.0.0", + "address": "0x36AaFCD0Fd5F7eb6Ed407e8033BF686AdE75812e" } ], "constructorArgs": ["PartyTokenAdminERC721"] @@ -65,6 +66,11 @@ "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000027f971cb582bf9e50f397e4d29a5c7a34f11faa2000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be00000000000000000000000021991ee4c19812eb73dd2cb0a6f2472174c4117c", "version": "0.3.0", "address": "0x216f3FA382fcF72B78C896Fcf015Ca1bcC741f08" + }, + { + "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e45900000000000000000000000027f971cb582bf9e50f397e4d29a5c7a34f11faa2000000000000000000000000736C6145C7D5b90b8bd586a9114C2E462318b3FF00000000000000000000000021991ee4c19812eb73dd2cb0a6f2472174c4117c", + "version": "1.0.0", + "address": "0xbc3ed7B890e97267Ceda243Beb43567c163254a8" } ], "constructorArgs": ["partyDao", "positionManager", "PartyTokenAdminERC721", "uncx"] @@ -105,6 +111,11 @@ "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000f14ae15a9c780e2a5a687ca4f24b1cf0250db2be0000000000000000000000009a8cf8b3285da5f11b4d41d942655ab66e7d99d600000000000000000000000027f971cb582bf9e50f397e4d29a5c7a34f11faa20000000000000000000000004752ba5dbc23f44d87826276bf6fd6b1c372ad2400000000000000000000000042000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000002710000000000000000000000000216f3fa382fcf72b78c896fcf015ca1bcc741f08", "version": "0.7.0", "address": "0x7E03C85910FDaa154480f3a2c4E294E3F8b2102c" + }, + { + "deployedArgs": "0x0000000000000000000000000e63d6f414b40bafca676810ef1abf05ecc8e459000000000000000000000000736c6145c7d5b90b8bd586a9114c2e462318b3ff00000000000000000000000036aafcd0fd5f7eb6ed407e8033bf686ade75812e00000000000000000000000027f971cb582bf9e50f397e4d29a5c7a34f11faa20000000000000000000000004752ba5dbc23f44d87826276bf6fd6b1c372ad2400000000000000000000000042000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000002710000000000000000000000000bc3ed7b890e97267ceda243beb43567c163254a8", + "version": "1.0.0", + "address": "0x4e982A87a9f109Ad45Ac18A60e546F7fA4E48CF6" } ], "constructorArgs": [ @@ -121,8 +132,8 @@ }, "constants": { "partyDao": "0x0e63D6f414b40BaFCa676810ef1aBf05ECc8E459", - "nft_name": "PartyTokenAdminERC721", - "nft_symbol": "PSC721", + "nft_name": "Party Creator NFTs", + "nft_symbol": "PCNFT", "positionManager": "0x27F971cb582BF9E50F397e4d29a5C7A34f11faA2", "uniswapFactory": "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24", "weth": "0x4200000000000000000000000000000000000006", diff --git a/script/deploy.ts b/script/deploy.ts index ff83624..1b371a8 100644 --- a/script/deploy.ts +++ b/script/deploy.ts @@ -78,9 +78,17 @@ async function runDeploy( constructorArgs = resolveConstructorArgs(contract, chainId); } + // Escape constructor arguments with spaces + const escapedConstructorArgs = constructorArgs.map((arg: any) => { + if (String(arg).includes(" ")) { + return `"${arg.replace(/"/g, '\\"')}"`; + } + return arg; + }); + const encodedConstructorArgs = encodeConstructorArgs(contract, constructorArgs); let newDeploy: Deploy = { deployedArgs: encodedConstructorArgs } as Deploy; - newDeploy.version = await getUndeployedContractVersion(contract, constructorArgs, rpcUrl); + newDeploy.version = await getUndeployedContractVersion(contract, escapedConstructorArgs, rpcUrl); validateDeploy(contract, newDeploy, chainId); diff --git a/src/PartyERC20.sol b/src/PartyERC20.sol index 185d078..7b2192f 100644 --- a/src/PartyERC20.sol +++ b/src/PartyERC20.sol @@ -163,7 +163,7 @@ contract PartyERC20 is ERC20PermitUpgradeable, ERC20VotesUpgradeable, OwnableUpg * change in ABI. */ function VERSION() external pure returns (string memory) { - return "0.3.0"; + return "1.0.0"; } /** diff --git a/src/PartyLPLocker.sol b/src/PartyLPLocker.sol index a2ed4e8..863fe67 100644 --- a/src/PartyLPLocker.sol +++ b/src/PartyLPLocker.sol @@ -182,7 +182,7 @@ contract PartyLPLocker is ILocker, IERC721Receiver, Ownable { * change in ABI. */ function VERSION() external pure returns (string memory) { - return "0.3.0"; + return "1.0.0"; } /** diff --git a/src/PartyTokenAdminERC721.sol b/src/PartyTokenAdminERC721.sol index 43b7953..b9d7e23 100644 --- a/src/PartyTokenAdminERC721.sol +++ b/src/PartyTokenAdminERC721.sol @@ -104,7 +104,7 @@ contract PartyTokenAdminERC721 is ERC721, Ownable, IERC4906 { string memory description = string.concat( "This NFT has metadata admin controls over the ERC20 token at ", tokenMetadata.token.toHexStringChecksummed(), - ". The holder of this NFT can change the image metadata of the token on-chain. The holder of this NFT can also claim LP fees from a permanently locked LP position for this token. The holder of this NFT cannot perform any actions that affect token functionality or supply." + ". The holder of this NFT can change the image metadata of the token on-chain. The holder of this NFT can also claim fees from a permanently locked LP position for its token. The holder of this NFT cannot perform any actions that affect token functionality or supply." ); return string.concat( @@ -150,6 +150,6 @@ contract PartyTokenAdminERC721 is ERC721, Ownable, IERC4906 { * change in ABI. */ function VERSION() external pure returns (string memory) { - return "0.6.0"; + return "1.0.0"; } } diff --git a/src/PartyTokenLauncher.sol b/src/PartyTokenLauncher.sol index ade0897..df15439 100644 --- a/src/PartyTokenLauncher.sol +++ b/src/PartyTokenLauncher.sol @@ -589,6 +589,6 @@ contract PartyTokenLauncher is Ownable, IERC721Receiver { * change in ABI. */ function VERSION() external pure returns (string memory) { - return "0.7.0"; + return "1.0.0"; } } diff --git a/test/PartyERC20.t.sol b/test/PartyERC20.t.sol index 969c8bd..3306587 100644 --- a/test/PartyERC20.t.sol +++ b/test/PartyERC20.t.sol @@ -106,6 +106,6 @@ contract PartyERC20Test is UseImmutableCreate2Factory { } function test_VERSION() external view { - assertEq(token.VERSION(), "0.3.0"); + assertEq(token.VERSION(), "1.0.0"); } } diff --git a/test/PartyLPLocker.t.sol b/test/PartyLPLocker.t.sol index 3bc6bb6..db0e085 100644 --- a/test/PartyLPLocker.t.sol +++ b/test/PartyLPLocker.t.sol @@ -234,7 +234,7 @@ contract PartyLPLockerTest is MockUniswapV3Deployer, Test { } function test_VERSION() external view { - assertEq(locker.VERSION(), "0.3.0"); + assertEq(locker.VERSION(), "1.0.0"); } function test_setUncxCountryCode_setsStorage() external { diff --git a/test/PartyTokenAdminERC721.t.sol b/test/PartyTokenAdminERC721.t.sol index 72b838c..0ffe692 100644 --- a/test/PartyTokenAdminERC721.t.sol +++ b/test/PartyTokenAdminERC721.t.sol @@ -94,6 +94,6 @@ contract PartyTokenAdminERC721Test is Test, LintJSON { } function test_VERSION() external view { - assertEq(adminNft.VERSION(), "0.6.0"); + assertEq(adminNft.VERSION(), "1.0.0"); } } diff --git a/test/PartyTokenLauncher.t.sol b/test/PartyTokenLauncher.t.sol index 1219722..7ff0b09 100644 --- a/test/PartyTokenLauncher.t.sol +++ b/test/PartyTokenLauncher.t.sol @@ -471,7 +471,7 @@ contract PartyTokenLauncherTest is Test, MockUniswapV3Deployer { } function test_VERSION_works() public view { - assertEq(launch.VERSION(), "0.7.0"); + assertEq(launch.VERSION(), "1.0.0"); } function test_createLaunch_invalidRecipient() public returns (uint32 launchId) {