From c679b72ca27c852c17ec650419b96ec8ea6c447a Mon Sep 17 00:00:00 2001 From: Eugene Getov Date: Thu, 11 Apr 2024 15:08:33 +0100 Subject: [PATCH] - Added arbitrum-testnet RPC url to foundry.toml - Updated the Makefile to accept a parameter for setting gas price. Deploying with `make deploy rpc="arbitrum-testnet" gasPrice="--with-gas-price 45000000000 --skip-simulation"` - Updated Malefile, removed deploy-ConstellationFactory and updated StarFactory to AppFactory - Re-deployed contracts to Arbitrum Sepolia with new addresses and start blocks in `deployed/421614.json` --- Makefile | 44 +++++++++-------------- deployed/421614.json | 85 +++++++++++++++++++++++--------------------- foundry.toml | 1 + 3 files changed, 62 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index 9c12b34..406e846 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ verbose ?= -vvvv args ?= "" legacy ?= --legacy slow ?= --slow +gasPrice ?= "" # Clean the repo clean :; forge clean @@ -22,9 +23,8 @@ deploy:; make \ deploy-Globals \ deploy-Registry \ deploy-Proxy \ - deploy-StarFactory \ + deploy-AppFactory \ deploy-ERC20Base \ - deploy-ConstellationFactory \ deploy-ERC721Base \ deploy-ERC721LazyMint \ deploy-RewardsFacet \ @@ -34,23 +34,22 @@ deploy:; make \ deploy-ERC721LazyDropFacet \ # core -deploy-Globals:; forge script scripts/core/Globals.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-Registry:; forge script scripts/core/Registry.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-Proxy:; forge script scripts/core/Proxy.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-StarFactory:; forge script scripts/core/StarFactory.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ConstellationFactory:; forge script scripts/core/ConstellationFactory.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) +deploy-Globals:; forge script scripts/core/Globals.s.sol:Deploy --rpc-url $(rpc) --broadcast $(gasPrice) $(verbose) $(legacy) $(slow) +deploy-Registry:; forge script scripts/core/Registry.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-Proxy:; forge script scripts/core/Proxy.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-AppFactory:; forge script scripts/core/AppFactory.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) # token implementations -deploy-ERC721Base:; forge script scripts/tokens/ERC721Base.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ERC721LazyMint:; forge script scripts/tokens/ERC721LazyMint.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ERC20Base:; forge script scripts/tokens/ERC20Base.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) +deploy-ERC721Base:; forge script scripts/tokens/ERC721Base.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-ERC721LazyMint:; forge script scripts/tokens/ERC721LazyMint.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-ERC20Base:; forge script scripts/tokens/ERC20Base.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) # facets -deploy-RewardsFacet:; forge script scripts/facet/RewardsFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-SettingsFacet:; forge script scripts/facet/SettingsFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ERC721FactoryFacet:; forge script scripts/facet/ERC721FactoryFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ERC20FactoryFacet:; forge script scripts/facet/ERC20FactoryFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) -deploy-ERC721LazyDropFacet:; forge script scripts/facet/ERC721LazyDropFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) +deploy-RewardsFacet:; forge script scripts/facet/RewardsFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-SettingsFacet:; forge script scripts/facet/SettingsFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-ERC721FactoryFacet:; forge script scripts/facet/ERC721FactoryFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-ERC20FactoryFacet:; forge script scripts/facet/ERC20FactoryFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) +deploy-ERC721LazyDropFacet:; forge script scripts/facet/ERC721LazyDropFacet.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow) # patch patch-SettingsFacet:; forge script scripts/facet/SettingsFacet.s.sol:Patch --rpc-url $(rpc) --broadcast $(verbose) $(legacy) $(slow) @@ -60,25 +59,14 @@ patch-SettingsFacet:; forge script scripts/facet/SettingsFacet.s.sol:Patch --rpc # example: `make CreateApp args="app name" rpc=anvil` # Note: Uses a cast command to format the app name args to bytes32 CreateApp:; forge script \ - scripts/core/StarFactory.s.sol:CreateApp \ - --sig "run(string)" \ - --rpc-url $(rpc) \ - --broadcast \ - $(legacy) \ - $(slow) \ - $(verbose) \ - `cast --format-bytes32-string $(args)` - -# example: `make CreateConstellation args="constellation name" rpc=anvil` -# Note: Uses a cast command to format the app name args to bytes32 -CreateConstellation:; forge script \ - scripts/core/ConstellationFactory.s.sol:CreateConstellation \ + scripts/core/AppFactory.s.sol:CreateApp \ --sig "run(string)" \ --rpc-url $(rpc) \ --broadcast \ $(legacy) \ $(slow) \ $(verbose) \ + $(gasPrice) \ `cast --format-bytes32-string $(args)` # example: `make SetPlatformFee args="0.01 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266" rpc=anvil` diff --git a/deployed/421614.json b/deployed/421614.json index 815447d..4125d59 100644 --- a/deployed/421614.json +++ b/deployed/421614.json @@ -1,35 +1,23 @@ { - "Globals": { - "startBlock": 32294959, - "address": "0x7ebfC55c22A53C436661d6aa1e39e933Fe9338D4" - }, - "ERC20FactoryFacet": { - "startBlock": 32295428, - "address": "0xB067C56aA43DbfbFf7456F59C8858C956ba455C3" - }, - "ConstellationFactory": { - "startBlock": 32295146, - "address": "0x55089Fc26002e5ECcCa8f01fADe2450177f987e4" + "StarFactory": { + "startBlock": 32298341, + "address": "0xfa286f52075bCc6EE9716a765f8928762B3CD2d6" }, - "ERC721LazyDropFacet": { - "address": "0xeeBb1606BA9733cAf4c4267169d710Ee7a810440", - "startBlock": 32295467 + "Registry": { + "address": "0x83cEB1D6a762613390995f41DB7474024c657CcC", + "startBlock": 32612243 }, - "StarFactory": { - "startBlock": 32295080, - "address": "0xD8E6Fa15F5150543E862cC88320cf080Ff5b76e0" + "Proxy": { + "address": "0xC6a7B6c63A807c3Ff6F9255fF4A938eDCfC6B7e5", + "startBlock": 32612288 }, "ERC721FactoryFacet": { - "address": "0x3D8bb5f16fD0573ADAf0770d327eD24c694f1205", - "startBlock": 32295389 + "startBlock": 32612816, + "address": "0xDbD03991dAf325F4b4D649B402D77ea85bBcda4d" }, - "RewardFacet": { - "address": "0x94E1f98dF0F4d0d35E80746d5Eb6433B6e5D6CDf", - "startBlock": 32295304 - }, - "ERC721Base": { - "address": "0xb8df13b71342035B5d75C3982Eec58a69139fe25", - "startBlock": 32295176 + "ERC20FactoryFacet": { + "startBlock": 32612849, + "address": "0x47c223Df332D5b2EFe5E7Ec7ad663661AA1cd755" }, "doNotRemoveUsedToParseFile": [ "Globals", @@ -44,26 +32,43 @@ "SettingsFacet", "ERC721FactoryFacet", "ERC20FactoryFacet", - "ERC721LazyDropFacet" + "ERC721LazyDropFacet", + "AppFactory" ], - "Proxy": { - "address": "0x4190b84fE6fb38fF918CDDdaD1890B21122A347F", - "startBlock": 32295046 + "Globals": { + "address": "0x797b2b15d7397a4360391910a01C3d2c8e9e2e22", + "startBlock": 32612190 }, - "Registry": { - "address": "0xCd46651A7216969A74C716784E52723f1D089342", - "startBlock": 32294989 + "ConstellationFactory": { + "startBlock": 32298423, + "address": "0x1890ED30698C70932fD784fA80aC9b161854b3Ed" + }, + "SettingsFacet": { + "address": "0xcFaE9c1c2a3F99EaA81fe95508326C756420C527", + "startBlock": 32612731 }, "ERC20Base": { - "address": "0xf39D7192306704Ca476E653D74d45Fdb4de449A9", - "startBlock": 32295110 + "startBlock": 32612390, + "address": "0xe5116A6320e30AF21c72ca724E251932Fb21797e" }, - "SettingsFacet": { - "startBlock": 32295345, - "address": "0xfC852Db97599a8F67ecBd15C8560d2AE75A9fCf2" + "AppFactory": { + "address": "0x88F3472f951Ac5776767B861C5fd82024672Ca51", + "startBlock": 32612342 }, "ERC721LazyMint": { - "address": "0x799CC5C017FD76e198c9aD42165076524Fd88f92", - "startBlock": 32295242 + "startBlock": 32612554, + "address": "0xAcE2E6DD1A8a5106d0352fc919072A4214c712bF" + }, + "ERC721Base": { + "address": "0x4ffe323E0b15C7704422d39cE6Fa313B37ccD2aF", + "startBlock": 32612471 + }, + "ERC721LazyDropFacet": { + "startBlock": 32612934, + "address": "0x18a0eD2a96428b4EF4d3B7f8B3079dE798777d65" + }, + "RewardFacet": { + "address": "0x22c873cC4DF03a30632Ef0e775ed1293cE747aB2", + "startBlock": 32612644 } } \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index 8fa3ed7..8d44d4b 100644 --- a/foundry.toml +++ b/foundry.toml @@ -18,4 +18,5 @@ mumbai = "https://matic-mumbai.chainstacklabs.com" polygon = "${POLYGON_RPC_URL}" aurora = "https://mainnet.aurora.dev" aurora-testnet = "https://testnet.aurora.dev" +arbitrum-testnet = "https://sepolia-rollup.arbitrum.io/rpc"