From 63a09d2d7ad142708509a8d842e5ad5300ffdba6 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 12:29:39 +0000 Subject: [PATCH 1/8] Add fallback names and versions to facet versions script --- scripts/utils/Utils.sol | 23 +++++++++++++++++++ scripts/versions/FacetVersions.s.sol | 33 ++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/scripts/utils/Utils.sol b/scripts/utils/Utils.sol index d34c1ef..491d29b 100644 --- a/scripts/utils/Utils.sol +++ b/scripts/utils/Utils.sol @@ -5,6 +5,7 @@ import "forge-std/console.sol"; contract Utils is Script { error Utils_contractAddressNotFound(string contractName); + error Utils_contractNameNotFound(address contractAddress); string constant namesKey = "doNotRemoveUsedToParseFile"; @@ -20,6 +21,28 @@ contract Utils is Script { return abi.decode(contractAddress, (address)); } + function getContractDeploymentName(address contractAddress) internal returns (string memory) { + string memory deploymentFile = _readDeploymentFile(); + + // get all contract names from that file + string[] memory contractNames = abi.decode(vm.parseJson(deploymentFile, string.concat(".", namesKey)), (string[])); + + // search deployment file for contract address + for (uint256 i = 0; i < contractNames.length; i++){ + bytes memory matchBytes = vm.parseJson(deploymentFile, string.concat(".", contractNames[i], ".address")); + if (matchBytes.length == 0){ + continue; + } + + address matchAddress = abi.decode(matchBytes, (address)); + if (matchAddress == contractAddress){ + return contractNames[i]; + } + } + + return ""; + } + function exportFacetsVersions(address[] memory facetAddresses, string[] memory facetNames, string[] memory facetVersions, string[][] memory facetSelectors) internal { diff --git a/scripts/versions/FacetVersions.s.sol b/scripts/versions/FacetVersions.s.sol index 4bd30ad..31be553 100644 --- a/scripts/versions/FacetVersions.s.sol +++ b/scripts/versions/FacetVersions.s.sol @@ -35,11 +35,40 @@ contract FacetVersions is Script, Utils { facetVersions[i] = "-"; } else { - facetVersions[i] = IVersionable(facetAddresses[i]).facetVersion(); - facetNames[i] = IVersionable(facetAddresses[i]).facetName(); + facetNames[i] = getFacetName(facetAddresses[i]); + facetVersions[i] = getFacetVersion(facetAddresses[i]); } } exportFacetsVersions(facetAddresses, facetNames, facetVersions, facetSelectors); vm.stopBroadcast(); } + + // Helper function to retrieve facet version or fallback to "0.0.0" + function getFacetVersion(address facetAddress) private returns (string memory) { + try IVersionable(facetAddress).facetVersion() returns (string memory version) { + return version; + } catch { + return "0.0.0"; + } + } + + // Helper function to retrieve facet name + function getFacetName(address facetAddress) private returns (string memory) { + try IVersionable(facetAddress).facetName() returns (string memory name) { + return name; + } catch { + return getNameFromDeploymentFile(facetAddress); + } + } + + // Attempt to find name from deployment file or fallback to "Unknown-
" + function getNameFromDeploymentFile(address facetAddress) private returns (string memory) { + string memory facetName = getContractDeploymentName(facetAddress); + + if(bytes(facetName).length == 0){ + return string(abi.encodePacked("Unknown-", vm.toString(facetAddress))); + } + + return facetName; + } } \ No newline at end of file From 4f00f98b4d6ac7d8169bc9d9a7e9f0c1dac9fe6d Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 12:56:47 +0000 Subject: [PATCH 2/8] Update rpc list --- foundry.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/foundry.toml b/foundry.toml index 4a7c643..6370e32 100644 --- a/foundry.toml +++ b/foundry.toml @@ -14,12 +14,12 @@ optimizer_runs = 200 [rpc_endpoints] anvil = "http://127.0.0.1:8545" -mumbai = "https://matic-mumbai.chainstacklabs.com" -polygon = "${POLYGON_RPC_URL}" aurora = "https://mainnet.aurora.dev" aurora-testnet = "https://testnet.aurora.dev" base-sepolia = "https://sepolia.base.org" base = "https://mainnet.base.org" -arbitrum-testnet = "https://sepolia-rollup.arbitrum.io/rpc" -amoy = "https://rpc-amoy.polygon.technology/" +arbitrum = "${ARBITRUM_RPC_URL}" +arbitrum-sepolia = "https://sepolia-rollup.arbitrum.io/rpc" +polygon = "${POLYGON_RPC_URL}" +polygon-amoy = "https://rpc-amoy.polygon.technology/" turbo = "https://rpc-0x4e45415f.aurora-cloud.dev" From d3725f38ee80cc88bb128f60f8d77bcd09db0b23 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 14:23:02 +0000 Subject: [PATCH 3/8] Add arbitrum rpc url to example env --- .env.example | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 2dedd7c..1139119 100644 --- a/.env.example +++ b/.env.example @@ -2,9 +2,12 @@ # It must be kept secret, as anyone with access to this key can control your assets. PRIVATE_KEY= -# The POLYGON_RPC_URL is the endpoint for interacting with the Polygon blockchain network. +# The POLYGON_RPC_URL is the endpoint for interacting with the Polygon blockchain network. POLYGON_RPC_URL= +# The ARBITRUM_RPC_URL is the endpoint for interacting with the Arbitrum blockchain network. +ARBITRUM_RPC_URL= + # Used in scripts that engage with a particular app. An App ID can be generated at https://apps.openformat.tech/ APP_ID= From 11c892546fffa42fedf18c45fd327591f9a3f7b6 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 12:57:12 +0000 Subject: [PATCH 4/8] Add facet versions for all deployments --- deployed/1313161554.versions.json | 88 +++++++++++++++++++++++++++ deployed/1313161555.versions.json | 75 +++++++++++++++++++++++ deployed/137.versions.json | 75 +++++++++++++++++++++++ deployed/421614-staging.versions.json | 88 +++++++++++++++++++++++++++ deployed/421614.versions.json | 78 ++++++++++++++++++++++++ deployed/80002.versions.json | 75 +++++++++++++++++++++++ deployed/8453.versions.json | 88 +++++++++++++++++++++++++++ deployed/84532.versions.json | 88 +++++++++++++++++++++++++++ 8 files changed, 655 insertions(+) create mode 100644 deployed/1313161554.versions.json create mode 100644 deployed/1313161555.versions.json create mode 100644 deployed/137.versions.json create mode 100644 deployed/421614-staging.versions.json create mode 100644 deployed/421614.versions.json create mode 100644 deployed/80002.versions.json create mode 100644 deployed/8453.versions.json create mode 100644 deployed/84532.versions.json diff --git a/deployed/1313161554.versions.json b/deployed/1313161554.versions.json new file mode 100644 index 0000000..a3f3010 --- /dev/null +++ b/deployed/1313161554.versions.json @@ -0,0 +1,88 @@ +{ + "Facets": { + "ChargeFacet": { + "address": "0x8FA0b7ED4e1bD7CD2698F99F67f8E563440B4c73", + "selectors": [ + "0x10c3db96", + "0x23d3a539", + "0x9eaa34ec", + "0x20ecd1ec" + ], + "version": "0.0.0" + }, + "ERC20FactoryFacet": { + "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0x8eF67328a42e658AeaF35f8e127Ae02c762bbEf9", + "selectors": [ + "0xee4506f5", + "0x4fc06be4", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0x451f72Cf4174F15AcFb3AA5feEA9Ec8BE607f9E4", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x3a75C73042aDe9b219518ca3be59bB4652fd2db5", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0x04D8b9165f00933452D10dE556C04a5234ce3a58", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/1313161555.versions.json b/deployed/1313161555.versions.json new file mode 100644 index 0000000..7c2ad72 --- /dev/null +++ b/deployed/1313161555.versions.json @@ -0,0 +1,75 @@ +{ + "Facets": { + "ERC20FactoryFacet": { + "address": "0x3Cba847b1F9078eb441Bdf7707f0E0001e54ecC4", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0xf0180bEa1F2F180025005fE40658bF6c021de7d5", + "selectors": [ + "0xee4506f5", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x9aa6e827F5eFcF9d4FB4299D940F718590695D29", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x49c50D754F6118eB02DF6dDaD4a4d6D2a46AD837", + "selectors": [ + "0x595f5713", + "0x3a8e49c1", + "0x8662196c", + "0xcf141e3e", + "0xac9650d8" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0x609401678A22F7e2c7AaFd817F6F5a0bbBf44e8F", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/137.versions.json b/deployed/137.versions.json new file mode 100644 index 0000000..59374c4 --- /dev/null +++ b/deployed/137.versions.json @@ -0,0 +1,75 @@ +{ + "Facets": { + "ERC20FactoryFacet": { + "address": "0x87ee1Fbd30ec94d8e3A174e52c319d0E127f7898", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0x49A508CBd7419e5132aB670a0054962A1DA7E322", + "selectors": [ + "0xee4506f5", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x811aD13193D4a4d3a16E2e35F7Af57AA288C9AA7", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0x0f9b837652717caEDA5bC4D5912C7BD8467b3E0A", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x79a414D9778F5b2353943a9E6b6e3B3026ec932B", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0xe666904373557873d01008CC78A5fA3a2c36866F", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/421614-staging.versions.json b/deployed/421614-staging.versions.json new file mode 100644 index 0000000..7b76af3 --- /dev/null +++ b/deployed/421614-staging.versions.json @@ -0,0 +1,88 @@ +{ + "Facets": { + "ChargeFacet": { + "address": "0x87d62B44557F731c5B9D93fbBa096928Fb382799", + "selectors": [ + "0x10c3db96", + "0x20ecd1ec", + "0x23d3a539", + "0x9eaa34ec" + ], + "version": "0.0.0" + }, + "ERC20FactoryFacet": { + "address": "0x2C227862Be6F0B1A6fd398E0630A60C09B34A077", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0x9147Deb9D788e86b98757a16269a9d033974BfA3", + "selectors": [ + "0xee4506f5", + "0x4fc06be4", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x24FEdc64981C3ccD789AF7e695e3070Dc7006389", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0x11cd7aB1B36674a1f41BD19Bbc9e15EaAaF9857F", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x13dd8f63A9452adEA3f2152B12a13563AC433c41", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0xe0aaaf2A2F05DbE1feDa6aA6336fF2533D079BF0", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/421614.versions.json b/deployed/421614.versions.json new file mode 100644 index 0000000..0327443 --- /dev/null +++ b/deployed/421614.versions.json @@ -0,0 +1,78 @@ +{ + "Facets": { + "ERC20FactoryFacet": { + "address": "0xAdbbCC5B721F83b0fE349AB82D4fCC68AaCDFAC3", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0xeCAa77Ff32cfB4913f59a21Ed07D81E448209960", + "selectors": [ + "0xee4506f5", + "0x851ba287", + "0x0667aad5", + "0x4fc06be4" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x7E12434F0d9880957f67fF0Ce9c0F5ca83bdBD88", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0xcD288D67b371AB590962B2bd8FEd9866d8d6C69d", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x5D558E68b32E6f416b09d639B601f6eE8729Fbc7", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0xA09a42BbA9Ba0bF06dFE3ED77a0086C7Ee831163", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/80002.versions.json b/deployed/80002.versions.json new file mode 100644 index 0000000..71cdddd --- /dev/null +++ b/deployed/80002.versions.json @@ -0,0 +1,75 @@ +{ + "Facets": { + "ERC20FactoryFacet": { + "address": "0xc21125b654a1071D9Bc8162C71A71Cd88fD99E85", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0x19145dc9b36DDdd9a874195c6e51f4067aeb796a", + "selectors": [ + "0xee4506f5", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0x47b5760dDba0D3D80d83fc689D3c5Cb45efe93B4", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0x7aFE68988db5158B68ce64cEFBe750E5D3539e71", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0xaCde8917a4427DcE86aaDF7Bf853e730aa72A398", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0x3Fbe54Cc6B5f377830f6DE55a3A9B0f811AAfea9", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/8453.versions.json b/deployed/8453.versions.json new file mode 100644 index 0000000..1d23ce2 --- /dev/null +++ b/deployed/8453.versions.json @@ -0,0 +1,88 @@ +{ + "Facets": { + "ChargeFacet": { + "address": "0x2361Ce875ce1838FeE3DEcCC810ACE9ce9C08EeB", + "selectors": [ + "0x10c3db96", + "0x23d3a539", + "0x9eaa34ec", + "0x20ecd1ec" + ], + "version": "0.0.0" + }, + "ERC20FactoryFacet": { + "address": "0x0AA47E7048C7Ad0034b77F7564A04858Ce81D017", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0xCC3cfc5715b28bEFBC157DD67f4128B3f4EDAb1C", + "selectors": [ + "0xee4506f5", + "0x4fc06be4", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0xD9A431Db76055379e4662C02832C5AD61da45286", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0xC84dd634B26E0ac507f58Ef8bcbD8d8B2fD18fAD", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x19Ab40805A5E36f33Be8e7bB78028F8b6C5d04d3", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0x642f66d688bC49D37d961B27C41Bf00F6C2eF122", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/deployed/84532.versions.json b/deployed/84532.versions.json new file mode 100644 index 0000000..1d23ce2 --- /dev/null +++ b/deployed/84532.versions.json @@ -0,0 +1,88 @@ +{ + "Facets": { + "ChargeFacet": { + "address": "0x2361Ce875ce1838FeE3DEcCC810ACE9ce9C08EeB", + "selectors": [ + "0x10c3db96", + "0x23d3a539", + "0x9eaa34ec", + "0x20ecd1ec" + ], + "version": "0.0.0" + }, + "ERC20FactoryFacet": { + "address": "0x0AA47E7048C7Ad0034b77F7564A04858Ce81D017", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "0.0.0" + }, + "ERC721FactoryFacet": { + "address": "0xCC3cfc5715b28bEFBC157DD67f4128B3f4EDAb1C", + "selectors": [ + "0xee4506f5", + "0x4fc06be4", + "0x851ba287", + "0x0667aad5" + ], + "version": "0.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0xD9A431Db76055379e4662C02832C5AD61da45286", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "0.0.0" + }, + "Registry": { + "address": "0xC84dd634B26E0ac507f58Ef8bcbD8d8B2fD18fAD", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardFacet": { + "address": "0x19Ab40805A5E36f33Be8e7bB78028F8b6C5d04d3", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "0.0.0" + }, + "SettingsFacet": { + "address": "0x642f66d688bC49D37d961B27C41Bf00F6C2eF122", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "0.0.0" + } + } +} \ No newline at end of file From 8db5b5a16556bae9f4e4d3c99e407122a64cdab1 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 12:57:50 +0000 Subject: [PATCH 5/8] Remove mumbai deployment file --- deployed/80001.json | 69 --------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 deployed/80001.json diff --git a/deployed/80001.json b/deployed/80001.json deleted file mode 100644 index 96b21f5..0000000 --- a/deployed/80001.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "ERC721LazyDropFacet": { - "address": "0x22D294BA8F379CDac58B714f480EE9f1370b5C55", - "startBlock": 38765668 - }, - "Proxy": { - "startBlock": 38765582, - "address": "0x0f9b837652717caEDA5bC4D5912C7BD8467b3E0A" - }, - "ERC721FactoryFacet": { - "startBlock": 38765649, - "address": "0x49A508CBd7419e5132aB670a0054962A1DA7E322" - }, - "ERC20FactoryFacet": { - "address": "0x87ee1Fbd30ec94d8e3A174e52c319d0E127f7898", - "startBlock": 38765659 - }, - "doNotRemoveUsedToParseFile": [ - "Globals", - "Registry", - "Proxy", - "StarFactory", - "ERC20Base", - "ConstellationFactory", - "ERC721Base", - "ERC721LazyMint", - "RewardFacet", - "SettingsFacet", - "ERC721FactoryFacet", - "ERC20FactoryFacet", - "ERC721LazyDropFacet" - ], - "Globals": { - "address": "0x8a9D26cE2A12d97115ed73F4D90F8aA050D9a7a1", - "startBlock": 38765569 - }, - "Registry": { - "startBlock": 38765576, - "address": "0x60a0AAbDeb54c37b3dB67251Ad8b3A8Fbb53cAAf" - }, - "ERC721Base": { - "address": "0x91C69c996AE0Dc285f4e1BCf8b282703C24CD5cb", - "startBlock": 43171250 - }, - "StarFactory": { - "address": "0x429cB2c2A030952D3F5e10B534584aB49c303763", - "startBlock": 38765587 - }, - "SettingsFacet": { - "startBlock": 38765639, - "address": "0xe666904373557873d01008CC78A5fA3a2c36866F" - }, - "ConstellationFactory": { - "address": "0x609401678A22F7e2c7AaFd817F6F5a0bbBf44e8F", - "startBlock": 38765602 - }, - "ERC20Base": { - "startBlock": 38765593, - "address": "0x49c50D754F6118eB02DF6dDaD4a4d6D2a46AD837" - }, - "ERC721LazyMint": { - "startBlock": 38765618, - "address": "0x265A242Bcf4CFd9021A666B427e2d4dce2F5eF54" - }, - "RewardFacet": { - "startBlock": 41305071, - "address": "0x3866CCBb73B96c4eA2c60CD513691382c91fFfe4" - } -} \ No newline at end of file From 11388dbe0c03b7b2c802c883818c130a5143373a Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 13:34:52 +0000 Subject: [PATCH 6/8] Deploy ERC20Point to aurora and aurora-testnet --- deployed/1313161554.json | 107 ++++++++++++++++++++------------------- deployed/1313161555.json | 87 ++++++++++++++++--------------- 2 files changed, 102 insertions(+), 92 deletions(-) diff --git a/deployed/1313161554.json b/deployed/1313161554.json index 5dcc912..e7ec2af 100644 --- a/deployed/1313161554.json +++ b/deployed/1313161554.json @@ -1,79 +1,84 @@ { - "Factory": { - "startBlock": 90985936, - "address": "0xC4d53838f4D54f1A44116b3109BfA1bf064a8301" + "AppFactory": { + "address": "0x2eBF7f4572c218217ca01CE2883E3EfF93626a8E", + "startBlock": 131490511 }, - "SettingsFacet": { - "address": "0x04D8b9165f00933452D10dE556C04a5234ce3a58", - "startBlock": 131491025 + "ChargeFacet": { + "address": "0x8FA0b7ED4e1bD7CD2698F99F67f8E563440B4c73", + "startBlock": 131491319 }, "ERC20Base": { "address": "0x1e823247D26efd56f5172b8C19F6c44CA700F2c5", "startBlock": 131490541 }, - "doNotRemoveUsedToParseFile": [ - "Globals", - "Registry", - "Proxy", - "Factory", - "ERC721Base", - "ERC721LazyMint", - "ERC20Base", - "SettingsFacet", - "ERC721FactoryFacet", - "ERC20FactoryFacet", - "ERC721LazyDropFacet", - "RewardFacet", - "AppFactory", - "ERC721Badge", - "ChargeFacet" - ], "ERC20FactoryFacet": { "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43", "startBlock": 131491176 }, - "ChargeFacet": { - "address": "0x8FA0b7ED4e1bD7CD2698F99F67f8E563440B4c73", - "startBlock": 131491319 + "ERC20Point": { + "address": "0x40D444b2604AE0304245f26fc6A1Edd284275723", + "startBlock": 136959270 + }, + "ERC721Badge": { + "address": "0x9e9248e65A7FCEA1b12b08af923F231d7b1f66B6", + "startBlock": 131490717 + }, + "ERC721Base": { + "address": "0xC9E9dbB9362d3A54E0E7E0489F0419AD81ec6326", + "startBlock": 131490595 }, "ERC721FactoryFacet": { "address": "0x8eF67328a42e658AeaF35f8e127Ae02c762bbEf9", "startBlock": 131491105 }, - "RewardFacet": { - "startBlock": 131490769, - "address": "0x3a75C73042aDe9b219518ca3be59bB4652fd2db5" + "ERC721LazyDropFacet": { + "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F", + "startBlock": 131491247 }, - "Registry": { - "startBlock": 131490426, - "address": "0x451f72Cf4174F15AcFb3AA5feEA9Ec8BE607f9E4" + "ERC721LazyMint": { + "address": "0xF492f60aa5D7c49A43E41f9f8F3730d310974a97", + "startBlock": 131490662 }, - "ERC721Badge": { - "startBlock": 131490717, - "address": "0x9e9248e65A7FCEA1b12b08af923F231d7b1f66B6" + "Factory": { + "address": "0xC4d53838f4D54f1A44116b3109BfA1bf064a8301", + "startBlock": 90985936 }, - "ERC721LazyDropFacet": { - "startBlock": 131491247, - "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F" + "Globals": { + "address": "0xad734fad266c659d404636590A8A79fb2f698097", + "startBlock": 131490383 }, "Proxy": { "address": "0xea65bC1DEA1ED6b43efEFA04819F5b94bC574948", "startBlock": 131490466 }, - "ERC721Base": { - "address": "0xC9E9dbB9362d3A54E0E7E0489F0419AD81ec6326", - "startBlock": 131490595 + "Registry": { + "address": "0x451f72Cf4174F15AcFb3AA5feEA9Ec8BE607f9E4", + "startBlock": 131490426 }, - "ERC721LazyMint": { - "address": "0xF492f60aa5D7c49A43E41f9f8F3730d310974a97", - "startBlock": 131490662 + "RewardFacet": { + "address": "0x3a75C73042aDe9b219518ca3be59bB4652fd2db5", + "startBlock": 131490769 }, - "AppFactory": { - "startBlock": 131490511, - "address": "0x2eBF7f4572c218217ca01CE2883E3EfF93626a8E" + "SettingsFacet": { + "address": "0x04D8b9165f00933452D10dE556C04a5234ce3a58", + "startBlock": 131491025 }, - "Globals": { - "address": "0xad734fad266c659d404636590A8A79fb2f698097", - "startBlock": 131490383 - } + "doNotRemoveUsedToParseFile": [ + "Globals", + "Registry", + "Proxy", + "Factory", + "ERC721Base", + "ERC721LazyMint", + "ERC20Base", + "SettingsFacet", + "ERC721FactoryFacet", + "ERC20FactoryFacet", + "ERC721LazyDropFacet", + "RewardFacet", + "AppFactory", + "ERC721Badge", + "ChargeFacet", + "ERC20Point" + ] } \ No newline at end of file diff --git a/deployed/1313161555.json b/deployed/1313161555.json index cf8d3dc..715fdfe 100644 --- a/deployed/1313161555.json +++ b/deployed/1313161555.json @@ -1,63 +1,67 @@ { - "ERC721LazyDropFacet": { - "address": "0x9aa6e827F5eFcF9d4FB4299D940F718590695D29", - "startBlock": 134986414 - }, - "Proxy": { - "startBlock": 134985980, - "address": "0x73b80AC245dd5b9892A84fD1F58DaA993281972f" + "AppFactory": { + "address": "0xcfEe138281010FB8b7111492c36168f00995Ec0B", + "startBlock": 132365618 }, - "Globals": { - "startBlock": 134985920, - "address": "0x5F4F9dc8c8fd593Ce9E42Fc8C9e8F9B0B873A50f" + "ConstellationFactory": { + "address": "0xBCb1242c7354f2edaf16b6AAa961234C6431F597", + "startBlock": 134986085 }, "ERC20Base": { - "startBlock": 134986039, - "address": "0x47EFBe06F5145388D04c9287723E156C996964B2" + "address": "0x47EFBe06F5145388D04c9287723E156C996964B2", + "startBlock": 134986039 + }, + "ERC20FactoryFacet": { + "address": "0x3Cba847b1F9078eb441Bdf7707f0E0001e54ecC4", + "startBlock": 134986364 + }, + "ERC20Point": { + "address": "0xE03dd52dDD7e1f429e6339151Cb64764AFa355D4", + "startBlock": 184408059 }, "ERC721Base": { - "startBlock": 134986109, - "address": "0x8a9D26cE2A12d97115ed73F4D90F8aA050D9a7a1" + "address": "0x8a9D26cE2A12d97115ed73F4D90F8aA050D9a7a1", + "startBlock": 134986109 }, - "ConstellationFactory": { - "startBlock": 134986085, - "address": "0xBCb1242c7354f2edaf16b6AAa961234C6431F597" + "ERC721FactoryFacet": { + "address": "0xf0180bEa1F2F180025005fE40658bF6c021de7d5", + "startBlock": 134986315 }, - "RewardFacet": { - "startBlock": 134986204, - "address": "0x49c50D754F6118eB02DF6dDaD4a4d6D2a46AD837" + "ERC721LazyDropFacet": { + "address": "0x9aa6e827F5eFcF9d4FB4299D940F718590695D29", + "startBlock": 134986414 }, - "ERC20FactoryFacet": { - "address": "0x3Cba847b1F9078eb441Bdf7707f0E0001e54ecC4", - "startBlock": 134986364 + "ERC721LazyMint": { + "address": "0x0f9b837652717caEDA5bC4D5912C7BD8467b3E0A", + "startBlock": 134986157 }, "Factory": { "address": "0xa3354e916C7e565CB8994C9b8edF3714b6150C05", "startBlock": 130458801 }, - "ERC721LazyMint": { - "startBlock": 134986157, - "address": "0x0f9b837652717caEDA5bC4D5912C7BD8467b3E0A" + "Globals": { + "address": "0x5F4F9dc8c8fd593Ce9E42Fc8C9e8F9B0B873A50f", + "startBlock": 134985920 }, - "StarFactory": { - "startBlock": 134986010, - "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F" + "Proxy": { + "address": "0x73b80AC245dd5b9892A84fD1F58DaA993281972f", + "startBlock": 134985980 + }, + "Registry": { + "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43", + "startBlock": 134985952 + }, + "RewardFacet": { + "address": "0x49c50D754F6118eB02DF6dDaD4a4d6D2a46AD837", + "startBlock": 134986204 }, "SettingsFacet": { "address": "0x609401678A22F7e2c7AaFd817F6F5a0bbBf44e8F", "startBlock": 134986261 }, - "ERC721FactoryFacet": { - "startBlock": 134986315, - "address": "0xf0180bEa1F2F180025005fE40658bF6c021de7d5" - }, - "AppFactory": { - "startBlock": 132365618, - "address": "0xcfEe138281010FB8b7111492c36168f00995Ec0B" - }, - "Registry": { - "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43", - "startBlock": 134985952 + "StarFactory": { + "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F", + "startBlock": 134986010 }, "doNotRemoveUsedToParseFile": [ "Globals", @@ -74,6 +78,7 @@ "RewardFacet", "AppFactory", "ConstellationFactory", - "StarFactory" + "StarFactory", + "ERC20Point" ] } \ No newline at end of file From dedd3c009ab9357f0288fc07c46329cd07989df9 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 17:28:30 +0000 Subject: [PATCH 7/8] Deploy ERC20Point to base and base sepolia --- deployed/8453.json | 4 ++-- deployed/84532.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployed/8453.json b/deployed/8453.json index de15a58..33518ad 100644 --- a/deployed/8453.json +++ b/deployed/8453.json @@ -16,8 +16,8 @@ "startBlock": 22716032 }, "ERC20Point": { - "address": "0x7BCB018b643FBcc7e9f3D6eed4D5089C701ECabA", - "startBlock": 23270295 + "address": "0xeA7B78E6080F16c14532cfbE7362961f13a98dc4", + "startBlock": 24827072 }, "ERC721Badge": { "address": "0x25F3497655a3CD93296D339165D05af29D01678A", diff --git a/deployed/84532.json b/deployed/84532.json index 3ceccf8..c5d9745 100644 --- a/deployed/84532.json +++ b/deployed/84532.json @@ -16,8 +16,8 @@ "startBlock": 18394563 }, "ERC20Point": { - "address": "0x7BCB018b643FBcc7e9f3D6eed4D5089C701ECabA", - "startBlock": 18780808 + "address": "0x3C5da3D91DC4e0Aa6Af3AcB5f0e06fAC89f2420e", + "startBlock": 20337592 }, "ERC721Badge": { "address": "0x25F3497655a3CD93296D339165D05af29D01678A", From c7c84ec3837decb12b63e1be2db0aa8201629fff Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 14:18:52 +0000 Subject: [PATCH 8/8] Deploy to arbitrum --- deployed/42161.json | 79 ++++++++++++++++++++++++++++++++ deployed/42161.versions.json | 88 ++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 deployed/42161.json create mode 100644 deployed/42161.versions.json diff --git a/deployed/42161.json b/deployed/42161.json new file mode 100644 index 0000000..f6d5004 --- /dev/null +++ b/deployed/42161.json @@ -0,0 +1,79 @@ +{ + "AppFactory": { + "address": "0x1F36176c0874686d6d480a90Ca039e789c7f7Fa3", + "startBlock": 21587443 + }, + "ChargeFacet": { + "address": "0x33E5346970914c242bcD6258195eAEDF18dF56aa", + "startBlock": 21587451 + }, + "ERC20Base": { + "address": "0xFf5B3c42240eFc1b37b7A063AC09A36f1887abD0", + "startBlock": 21587443 + }, + "ERC20FactoryFacet": { + "address": "0x2ADD75397841AE9Ed0A6304cb629fd73c7e25aA8", + "startBlock": 21587448 + }, + "ERC20Point": { + "address": "0xA53828D660e7a93Fa564D1aBEaba3D5782A7a4eC", + "startBlock": 21587444 + }, + "ERC721Badge": { + "address": "0xE8C357D72Ba1bAA16707D5fc8B78DA3dD5Ed52ED", + "startBlock": 21587446 + }, + "ERC721Base": { + "address": "0x44C804B74723CE68cDe1031Ae116c84eE6A0B473", + "startBlock": 21587444 + }, + "ERC721FactoryFacet": { + "address": "0xe480510b12093341C5681B7d605743B7BcdEBCb7", + "startBlock": 21587448 + }, + "ERC721LazyDropFacet": { + "address": "0xb7EC8026Ec41Ac4b6C0772ac7b0835ee7Bb9fC04", + "startBlock": 21587449 + }, + "ERC721LazyMint": { + "address": "0x0560aE44CeAc171C5e3BE71d76956f65130627f7", + "startBlock": 21587444 + }, + "Globals": { + "address": "0x321467E17B711EB64C4402FdfEe0568df882AB8f", + "startBlock": 21587440 + }, + "Proxy": { + "address": "0xdE56426Fff74685eE22605195BC2985654657124", + "startBlock": 21587442 + }, + "Registry": { + "address": "0xcB258A326BdaF32a736510F06772852CA856D95e", + "startBlock": 21587442 + }, + "RewardFacet": { + "address": "0x29F28D41AcAee3dF441E5b504E52d76aDAb1c0f5", + "startBlock": 21587446 + }, + "SettingsFacet": { + "address": "0x13b9B798f24A15BF51c0A71CA9282B5bBDBABbce", + "startBlock": 21587447 + }, + "doNotRemoveUsedToParseFile": [ + "Globals", + "Registry", + "Proxy", + "AppFactory", + "ERC20Base", + "ERC20Point", + "ERC721Base", + "ERC721LazyMint", + "ERC721Badge", + "RewardFacet", + "SettingsFacet", + "ERC721FactoryFacet", + "ERC20FactoryFacet", + "ERC721LazyDropFacet", + "ChargeFacet" + ] +} \ No newline at end of file diff --git a/deployed/42161.versions.json b/deployed/42161.versions.json new file mode 100644 index 0000000..80500a9 --- /dev/null +++ b/deployed/42161.versions.json @@ -0,0 +1,88 @@ +{ + "Facets": { + "ChargeFacet": { + "address": "0x33E5346970914c242bcD6258195eAEDF18dF56aa", + "selectors": [ + "0x10c3db96", + "0x23d3a539", + "0x9eaa34ec", + "0x20ecd1ec" + ], + "version": "1.0.0" + }, + "ERC20FactoryFacet": { + "address": "0x2ADD75397841AE9Ed0A6304cb629fd73c7e25aA8", + "selectors": [ + "0x2d4105d1", + "0x3cb20d6c", + "0x08721a2c" + ], + "version": "1.0.0" + }, + "ERC721FactoryFacet": { + "address": "0xe480510b12093341C5681B7d605743B7BcdEBCb7", + "selectors": [ + "0xee4506f5", + "0x4fc06be4", + "0x851ba287", + "0x0667aad5" + ], + "version": "1.0.0" + }, + "ERC721LazyDropFacet": { + "address": "0xb7EC8026Ec41Ac4b6C0772ac7b0835ee7Bb9fC04", + "selectors": [ + "0x225a2b3e", + "0xd9854a88", + "0xf56cfb66", + "0x22ba9456", + "0x70ad0183" + ], + "version": "1.0.0" + }, + "Registry": { + "address": "0xcB258A326BdaF32a736510F06772852CA856D95e", + "selectors": [ + "0x2c408059", + "0x91423765", + "0x1f931c1c", + "0x7a0ed627", + "0xadfca15e", + "0x52ef6b2c", + "0xcdffacc6", + "0x01ffc9a7", + "0x8da5cb5b", + "0x8ab5150a", + "0xf2fde38b", + "0x79ba5097" + ], + "version": "-" + }, + "RewardsFacet": { + "address": "0x29F28D41AcAee3dF441E5b504E52d76aDAb1c0f5", + "selectors": [ + "0x609512c9", + "0xbdebfec5", + "0x97b4f6aa", + "0x3996701d", + "0xac9650d8", + "0xa6c130fc", + "0xb92bafd6" + ], + "version": "1.0.0" + }, + "SettingsFacet": { + "address": "0x13b9B798f24A15BF51c0A71CA9282B5bBDBABbce", + "selectors": [ + "0x561c4fc4", + "0xf2c9caa2", + "0xa9e64ec8", + "0xba4e4840", + "0xacf8569a", + "0x114ee370", + "0xf030f12e" + ], + "version": "1.0.0" + } + } +} \ No newline at end of file