diff --git a/contracts/deployments/alpha/base_sepolia/architectFacet.json b/contracts/deployments/alpha/base/addresses/architectFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/architectFacet.json rename to contracts/deployments/alpha/base/addresses/architectFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/banningFacet.json b/contracts/deployments/alpha/base/addresses/banningFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/banningFacet.json rename to contracts/deployments/alpha/base/addresses/banningFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/baseRegistry.json b/contracts/deployments/alpha/base/addresses/baseRegistry.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/baseRegistry.json rename to contracts/deployments/alpha/base/addresses/baseRegistry.json diff --git a/contracts/deployments/alpha/base_sepolia/channels.json b/contracts/deployments/alpha/base/addresses/channels.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/channels.json rename to contracts/deployments/alpha/base/addresses/channels.json diff --git a/contracts/deployments/alpha/base_sepolia/diamondCutFacet.json b/contracts/deployments/alpha/base/addresses/diamondCutFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/diamondCutFacet.json rename to contracts/deployments/alpha/base/addresses/diamondCutFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/diamondLoupeFacet.json b/contracts/deployments/alpha/base/addresses/diamondLoupeFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/diamondLoupeFacet.json rename to contracts/deployments/alpha/base/addresses/diamondLoupeFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/eip712Facet.json b/contracts/deployments/alpha/base/addresses/eip712Facet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/eip712Facet.json rename to contracts/deployments/alpha/base/addresses/eip712Facet.json diff --git a/contracts/deployments/alpha/base_sepolia/entitlementChecker.json b/contracts/deployments/alpha/base/addresses/entitlementChecker.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/entitlementChecker.json rename to contracts/deployments/alpha/base/addresses/entitlementChecker.json diff --git a/contracts/deployments/alpha/base_sepolia/entitlementDataQueryable.json b/contracts/deployments/alpha/base/addresses/entitlementDataQueryable.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/entitlementDataQueryable.json rename to contracts/deployments/alpha/base/addresses/entitlementDataQueryable.json diff --git a/contracts/deployments/alpha/base_sepolia/entitlementGated.json b/contracts/deployments/alpha/base/addresses/entitlementGated.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/entitlementGated.json rename to contracts/deployments/alpha/base/addresses/entitlementGated.json diff --git a/contracts/deployments/alpha/base_sepolia/entitlementsManager.json b/contracts/deployments/alpha/base/addresses/entitlementsManager.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/entitlementsManager.json rename to contracts/deployments/alpha/base/addresses/entitlementsManager.json diff --git a/contracts/deployments/alpha/base_sepolia/erc721ANonTransferable.json b/contracts/deployments/alpha/base/addresses/erc721ANonTransferable.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/erc721ANonTransferable.json rename to contracts/deployments/alpha/base/addresses/erc721ANonTransferable.json diff --git a/contracts/deployments/alpha/base_sepolia/erc721AQueryableFacet.json b/contracts/deployments/alpha/base/addresses/erc721AQueryableFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/erc721AQueryableFacet.json rename to contracts/deployments/alpha/base/addresses/erc721AQueryableFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/fixedPricing.json b/contracts/deployments/alpha/base/addresses/fixedPricing.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/fixedPricing.json rename to contracts/deployments/alpha/base/addresses/fixedPricing.json diff --git a/contracts/deployments/alpha/base_sepolia/guardianFacet.json b/contracts/deployments/alpha/base/addresses/guardianFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/guardianFacet.json rename to contracts/deployments/alpha/base/addresses/guardianFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/implementationRegistry.json b/contracts/deployments/alpha/base/addresses/implementationRegistry.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/implementationRegistry.json rename to contracts/deployments/alpha/base/addresses/implementationRegistry.json diff --git a/contracts/deployments/alpha/base_sepolia/introspectionFacet.json b/contracts/deployments/alpha/base/addresses/introspectionFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/introspectionFacet.json rename to contracts/deployments/alpha/base/addresses/introspectionFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/mainnetDelegation.json b/contracts/deployments/alpha/base/addresses/mainnetDelegation.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/mainnetDelegation.json rename to contracts/deployments/alpha/base/addresses/mainnetDelegation.json diff --git a/contracts/deployments/alpha/base_sepolia/membershipFacet.json b/contracts/deployments/alpha/base/addresses/membershipFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/membershipFacet.json rename to contracts/deployments/alpha/base/addresses/membershipFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/membershipMetadataFacet.json b/contracts/deployments/alpha/base/addresses/membershipMetadataFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/membershipMetadataFacet.json rename to contracts/deployments/alpha/base/addresses/membershipMetadataFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/metadataFacet.json b/contracts/deployments/alpha/base/addresses/metadataFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/metadataFacet.json rename to contracts/deployments/alpha/base/addresses/metadataFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/mockMessenger.json b/contracts/deployments/alpha/base/addresses/mockMessenger.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/mockMessenger.json rename to contracts/deployments/alpha/base/addresses/mockMessenger.json diff --git a/contracts/deployments/alpha/base_sepolia/multiInit.json b/contracts/deployments/alpha/base/addresses/multiInit.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/multiInit.json rename to contracts/deployments/alpha/base/addresses/multiInit.json diff --git a/contracts/deployments/alpha/base_sepolia/nodeOperatorFacet.json b/contracts/deployments/alpha/base/addresses/nodeOperatorFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/nodeOperatorFacet.json rename to contracts/deployments/alpha/base/addresses/nodeOperatorFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/ownableFacet.json b/contracts/deployments/alpha/base/addresses/ownableFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/ownableFacet.json rename to contracts/deployments/alpha/base/addresses/ownableFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/ownablePendingFacet.json b/contracts/deployments/alpha/base/addresses/ownablePendingFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/ownablePendingFacet.json rename to contracts/deployments/alpha/base/addresses/ownablePendingFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/pausable.json b/contracts/deployments/alpha/base/addresses/pausable.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/pausable.json rename to contracts/deployments/alpha/base/addresses/pausable.json diff --git a/contracts/deployments/alpha/base_sepolia/platformRequirements.json b/contracts/deployments/alpha/base/addresses/platformRequirements.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/platformRequirements.json rename to contracts/deployments/alpha/base/addresses/platformRequirements.json diff --git a/contracts/deployments/alpha/base_sepolia/prepayFacet.json b/contracts/deployments/alpha/base/addresses/prepayFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/prepayFacet.json rename to contracts/deployments/alpha/base/addresses/prepayFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/pricingModulesFacet.json b/contracts/deployments/alpha/base/addresses/pricingModulesFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/pricingModulesFacet.json rename to contracts/deployments/alpha/base/addresses/pricingModulesFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/proxyManagerFacet.json b/contracts/deployments/alpha/base/addresses/proxyManagerFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/proxyManagerFacet.json rename to contracts/deployments/alpha/base/addresses/proxyManagerFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/rewardsDistribution.json b/contracts/deployments/alpha/base/addresses/rewardsDistribution.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/rewardsDistribution.json rename to contracts/deployments/alpha/base/addresses/rewardsDistribution.json diff --git a/contracts/deployments/alpha/base_sepolia/roles.json b/contracts/deployments/alpha/base/addresses/roles.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/roles.json rename to contracts/deployments/alpha/base/addresses/roles.json diff --git a/contracts/deployments/alpha/base_sepolia/ruleEntitlement.json b/contracts/deployments/alpha/base/addresses/ruleEntitlement.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/ruleEntitlement.json rename to contracts/deployments/alpha/base/addresses/ruleEntitlement.json diff --git a/contracts/deployments/alpha/base_sepolia/space.json b/contracts/deployments/alpha/base/addresses/space.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/space.json rename to contracts/deployments/alpha/base/addresses/space.json diff --git a/contracts/deployments/alpha/base_sepolia/spaceDelegationFacet.json b/contracts/deployments/alpha/base/addresses/spaceDelegationFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/spaceDelegationFacet.json rename to contracts/deployments/alpha/base/addresses/spaceDelegationFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/spaceFactory.json b/contracts/deployments/alpha/base/addresses/spaceFactory.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/spaceFactory.json rename to contracts/deployments/alpha/base/addresses/spaceFactory.json diff --git a/contracts/deployments/alpha/base_sepolia/spaceOwner.json b/contracts/deployments/alpha/base/addresses/spaceOwner.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/spaceOwner.json rename to contracts/deployments/alpha/base/addresses/spaceOwner.json diff --git a/contracts/deployments/alpha/base_sepolia/spaceOwnerFacet.json b/contracts/deployments/alpha/base/addresses/spaceOwnerFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/spaceOwnerFacet.json rename to contracts/deployments/alpha/base/addresses/spaceOwnerFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/tieredLogPricing.json b/contracts/deployments/alpha/base/addresses/tieredLogPricing.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/tieredLogPricing.json rename to contracts/deployments/alpha/base/addresses/tieredLogPricing.json diff --git a/contracts/deployments/alpha/base_sepolia/tokenOwnableFacet.json b/contracts/deployments/alpha/base/addresses/tokenOwnableFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/tokenOwnableFacet.json rename to contracts/deployments/alpha/base/addresses/tokenOwnableFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/tokenPausableFacet.json b/contracts/deployments/alpha/base/addresses/tokenPausableFacet.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/tokenPausableFacet.json rename to contracts/deployments/alpha/base/addresses/tokenPausableFacet.json diff --git a/contracts/deployments/alpha/base_sepolia/userEntitlement.json b/contracts/deployments/alpha/base/addresses/userEntitlement.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/userEntitlement.json rename to contracts/deployments/alpha/base/addresses/userEntitlement.json diff --git a/contracts/deployments/alpha/base_sepolia/walletLink.json b/contracts/deployments/alpha/base/addresses/walletLink.json similarity index 100% rename from contracts/deployments/alpha/base_sepolia/walletLink.json rename to contracts/deployments/alpha/base/addresses/walletLink.json diff --git a/contracts/deployments/alpha/base/chainId.json b/contracts/deployments/alpha/base/chainId.json new file mode 100644 index 000000000..6fabeccba --- /dev/null +++ b/contracts/deployments/alpha/base/chainId.json @@ -0,0 +1 @@ +{ "id": 84532 } \ No newline at end of file diff --git a/contracts/deployments/alpha/river_devnet/diamondCutFacet.json b/contracts/deployments/alpha/river/addresses/diamondCutFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/diamondCutFacet.json rename to contracts/deployments/alpha/river/addresses/diamondCutFacet.json diff --git a/contracts/deployments/alpha/river_devnet/diamondLoupeFacet.json b/contracts/deployments/alpha/river/addresses/diamondLoupeFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/diamondLoupeFacet.json rename to contracts/deployments/alpha/river/addresses/diamondLoupeFacet.json diff --git a/contracts/deployments/alpha/river_devnet/introspectionFacet.json b/contracts/deployments/alpha/river/addresses/introspectionFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/introspectionFacet.json rename to contracts/deployments/alpha/river/addresses/introspectionFacet.json diff --git a/contracts/deployments/alpha/river_devnet/multiInit.json b/contracts/deployments/alpha/river/addresses/multiInit.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/multiInit.json rename to contracts/deployments/alpha/river/addresses/multiInit.json diff --git a/contracts/deployments/alpha/river_devnet/nodeRegistryFacet.json b/contracts/deployments/alpha/river/addresses/nodeRegistryFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/nodeRegistryFacet.json rename to contracts/deployments/alpha/river/addresses/nodeRegistryFacet.json diff --git a/contracts/deployments/alpha/river_devnet/operatorRegistryFacet.json b/contracts/deployments/alpha/river/addresses/operatorRegistryFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/operatorRegistryFacet.json rename to contracts/deployments/alpha/river/addresses/operatorRegistryFacet.json diff --git a/contracts/deployments/alpha/river_devnet/ownableFacet.json b/contracts/deployments/alpha/river/addresses/ownableFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/ownableFacet.json rename to contracts/deployments/alpha/river/addresses/ownableFacet.json diff --git a/contracts/deployments/alpha/river_devnet/riverConfigFacet.json b/contracts/deployments/alpha/river/addresses/riverConfigFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/riverConfigFacet.json rename to contracts/deployments/alpha/river/addresses/riverConfigFacet.json diff --git a/contracts/deployments/alpha/river_devnet/riverRegistry.json b/contracts/deployments/alpha/river/addresses/riverRegistry.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/riverRegistry.json rename to contracts/deployments/alpha/river/addresses/riverRegistry.json diff --git a/contracts/deployments/alpha/river_devnet/streamRegistryFacet.json b/contracts/deployments/alpha/river/addresses/streamRegistryFacet.json similarity index 100% rename from contracts/deployments/alpha/river_devnet/streamRegistryFacet.json rename to contracts/deployments/alpha/river/addresses/streamRegistryFacet.json diff --git a/contracts/deployments/alpha/river/chainId.json b/contracts/deployments/alpha/river/chainId.json new file mode 100644 index 000000000..3f6428995 --- /dev/null +++ b/contracts/deployments/alpha/river/chainId.json @@ -0,0 +1 @@ +{ "id": 6524490 } \ No newline at end of file diff --git a/contracts/deployments/base/multiInit.json b/contracts/deployments/base/multiInit.json deleted file mode 100644 index 2d4813ebb..000000000 --- a/contracts/deployments/base/multiInit.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xFCFED78Fc7FCD1333b8410f961Af93AeBA31C7D7"} \ No newline at end of file diff --git a/contracts/deployments/base_sepolia/entitlementDataQueryable.json b/contracts/deployments/base_sepolia/entitlementDataQueryable.json deleted file mode 100644 index e4dd3bf32..000000000 --- a/contracts/deployments/base_sepolia/entitlementDataQueryable.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x7cC703Bfc74661D287d7d5c9C3B85d412C02E380"} \ No newline at end of file diff --git a/contracts/deployments/base_sepolia/mainnetDelegation.json b/contracts/deployments/base_sepolia/mainnetDelegation.json deleted file mode 100644 index 24d2864cb..000000000 --- a/contracts/deployments/base_sepolia/mainnetDelegation.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xD18f7552b152976eB5472c12a83533C79E9eDcc9"} \ No newline at end of file diff --git a/contracts/deployments/base_sepolia/mockERC721A.json b/contracts/deployments/base_sepolia/mockERC721A.json deleted file mode 100644 index e4c1b864f..000000000 --- a/contracts/deployments/base_sepolia/mockERC721A.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xb85C71475a0E59EaFA86540C8E45246E33c983be"} \ No newline at end of file diff --git a/contracts/deployments/base_sepolia/roles.json b/contracts/deployments/base_sepolia/roles.json deleted file mode 100644 index 61ce47f6c..000000000 --- a/contracts/deployments/base_sepolia/roles.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xDC373a4913c443A9fd6adE0F09A448050C46443f"} \ No newline at end of file diff --git a/contracts/deployments/gamma/base/addresses/baseRegistry.json b/contracts/deployments/gamma/base/addresses/baseRegistry.json new file mode 100644 index 000000000..76e6c3331 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/baseRegistry.json @@ -0,0 +1 @@ +{"address":"0x08cC41b782F27d62995056a4EF2fCBAe0d3c266F"} diff --git a/contracts/deployments/gamma/base/addresses/entitlementChecker.json b/contracts/deployments/gamma/base/addresses/entitlementChecker.json new file mode 100644 index 000000000..76e6c3331 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/entitlementChecker.json @@ -0,0 +1 @@ +{"address":"0x08cC41b782F27d62995056a4EF2fCBAe0d3c266F"} diff --git a/contracts/deployments/gamma/base/addresses/fixedPricing.json b/contracts/deployments/gamma/base/addresses/fixedPricing.json new file mode 100644 index 000000000..18d4fd597 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/fixedPricing.json @@ -0,0 +1 @@ +{"address":"0x1c5a61bf87c7040cD4e88c20374b21877A7a0417"} \ No newline at end of file diff --git a/contracts/deployments/gamma/base/addresses/space.json b/contracts/deployments/gamma/base/addresses/space.json new file mode 100644 index 000000000..aac017cea --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/space.json @@ -0,0 +1 @@ +{"address":"0x99a177F81902fddc4785c6fc108C8F21BDB2aFe9"} diff --git a/contracts/deployments/gamma/base/addresses/spaceFactory.json b/contracts/deployments/gamma/base/addresses/spaceFactory.json new file mode 100644 index 000000000..124500256 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/spaceFactory.json @@ -0,0 +1 @@ +{"address":"0x968696BC59431Ef085441641f550C8e2Eaca8BEd"} diff --git a/contracts/deployments/gamma/base/addresses/spaceOwner.json b/contracts/deployments/gamma/base/addresses/spaceOwner.json new file mode 100644 index 000000000..03e384418 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/spaceOwner.json @@ -0,0 +1 @@ +{"address":"0x9dEdb330A126C6dF2893a33018bb81aFE8573805"} \ No newline at end of file diff --git a/contracts/deployments/gamma/base/addresses/tieredLogPricing.json b/contracts/deployments/gamma/base/addresses/tieredLogPricing.json new file mode 100644 index 000000000..0ed847bfd --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/tieredLogPricing.json @@ -0,0 +1 @@ +{"address":"0xd6557a643427d36DBae33B69d30f54A17De606Ab"} \ No newline at end of file diff --git a/contracts/deployments/gamma/base/addresses/walletLink.json b/contracts/deployments/gamma/base/addresses/walletLink.json new file mode 100644 index 000000000..124500256 --- /dev/null +++ b/contracts/deployments/gamma/base/addresses/walletLink.json @@ -0,0 +1 @@ +{"address":"0x968696BC59431Ef085441641f550C8e2Eaca8BEd"} diff --git a/contracts/deployments/gamma/base/chainId.json b/contracts/deployments/gamma/base/chainId.json new file mode 100644 index 000000000..6fabeccba --- /dev/null +++ b/contracts/deployments/gamma/base/chainId.json @@ -0,0 +1 @@ +{ "id": 84532 } \ No newline at end of file diff --git a/packages/generated/addresses/river_devnet/riverRegistry.json b/contracts/deployments/gamma/river/addresses/riverRegistry.json similarity index 100% rename from packages/generated/addresses/river_devnet/riverRegistry.json rename to contracts/deployments/gamma/river/addresses/riverRegistry.json diff --git a/contracts/deployments/gamma/river/chainId.json b/contracts/deployments/gamma/river/chainId.json new file mode 100644 index 000000000..3f6428995 --- /dev/null +++ b/contracts/deployments/gamma/river/chainId.json @@ -0,0 +1 @@ +{ "id": 6524490 } \ No newline at end of file diff --git a/contracts/deployments/mainnet/authorizedClaimers.json b/contracts/deployments/mainnet/authorizedClaimers.json deleted file mode 100644 index 16ab21eca..000000000 --- a/contracts/deployments/mainnet/authorizedClaimers.json +++ /dev/null @@ -1 +0,0 @@ -{"address": "0x0bEe55b52d01C4D5d4D0cfcE1d6e0baE6722db05"} diff --git a/contracts/deployments/mainnet/riverMainnet.json b/contracts/deployments/mainnet/riverMainnet.json deleted file mode 100644 index d9160ec5f..000000000 --- a/contracts/deployments/mainnet/riverMainnet.json +++ /dev/null @@ -1 +0,0 @@ -{"address": "0x53319181e003E7f86fB79f794649a2aB680Db244"} diff --git a/contracts/deployments/omega/base/addresses/architectFacet.json b/contracts/deployments/omega/base/addresses/architectFacet.json new file mode 100644 index 000000000..0e1f3bd8e --- /dev/null +++ b/contracts/deployments/omega/base/addresses/architectFacet.json @@ -0,0 +1 @@ +{"address":"0xE2605f21dee490AF0406522BeFc569028cCc6980"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/banningFacet.json b/contracts/deployments/omega/base/addresses/banningFacet.json new file mode 100644 index 000000000..341cc4d56 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/banningFacet.json @@ -0,0 +1 @@ +{"address":"0x0A282b6AFABC670df86B0e9C3C9EB84f0D577921"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/baseRegistry.json b/contracts/deployments/omega/base/addresses/baseRegistry.json new file mode 100644 index 000000000..85b00e04e --- /dev/null +++ b/contracts/deployments/omega/base/addresses/baseRegistry.json @@ -0,0 +1 @@ +{"address":"0x7c0422b31401C936172C897802CF0373B35B7698"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/channels.json b/contracts/deployments/omega/base/addresses/channels.json new file mode 100644 index 000000000..7995ab576 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/channels.json @@ -0,0 +1 @@ +{"address":"0xc57d6EceF3269e50Bf3958aD707C39c8Dd28d600"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/diamondCutFacet.json b/contracts/deployments/omega/base/addresses/diamondCutFacet.json new file mode 100644 index 000000000..c359cab71 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/diamondCutFacet.json @@ -0,0 +1 @@ +{"address":"0xEfb36fc3686562cf63CA76b42e65D848633E9647"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/diamondLoupeFacet.json b/contracts/deployments/omega/base/addresses/diamondLoupeFacet.json new file mode 100644 index 000000000..d98f079bf --- /dev/null +++ b/contracts/deployments/omega/base/addresses/diamondLoupeFacet.json @@ -0,0 +1 @@ +{"address":"0x872D11389Fdb73803C2805F570f5a697BB1b0664"} \ No newline at end of file diff --git a/contracts/deployments/mainnet/proxyBatchDelegation.json b/contracts/deployments/omega/base/addresses/entitlementChecker.json similarity index 100% rename from contracts/deployments/mainnet/proxyBatchDelegation.json rename to contracts/deployments/omega/base/addresses/entitlementChecker.json diff --git a/contracts/deployments/omega/base/addresses/entitlementDataQueryable.json b/contracts/deployments/omega/base/addresses/entitlementDataQueryable.json new file mode 100644 index 000000000..11a37a500 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/entitlementDataQueryable.json @@ -0,0 +1 @@ +{"address":"0x4f47ACAF0B1db19B4844E72b991D49Ebd6e3C18a"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/entitlementsManager.json b/contracts/deployments/omega/base/addresses/entitlementsManager.json new file mode 100644 index 000000000..521c629e3 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/entitlementsManager.json @@ -0,0 +1 @@ +{"address":"0xBC0dEF4b26d4B6394ff3eD3705Ab149F395A2951"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/erc721AQueryableFacet.json b/contracts/deployments/omega/base/addresses/erc721AQueryableFacet.json new file mode 100644 index 000000000..ae8e8f49a --- /dev/null +++ b/contracts/deployments/omega/base/addresses/erc721AQueryableFacet.json @@ -0,0 +1 @@ +{"address":"0x300B54738f3ea323392684d193BA729D6bEb2497"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/fixedPricing.json b/contracts/deployments/omega/base/addresses/fixedPricing.json new file mode 100644 index 000000000..21d1df9ff --- /dev/null +++ b/contracts/deployments/omega/base/addresses/fixedPricing.json @@ -0,0 +1 @@ +{"address":"0x390F6f5213FA097c6D68B2fCC8a40C08E28f46D5"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/implementationRegistry.json b/contracts/deployments/omega/base/addresses/implementationRegistry.json new file mode 100644 index 000000000..ce279cc88 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/implementationRegistry.json @@ -0,0 +1 @@ +{"address":"0xf415446DAB215d3497e842a8E44083E4534F9D61"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/introspectionFacet.json b/contracts/deployments/omega/base/addresses/introspectionFacet.json new file mode 100644 index 000000000..67278dcf8 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/introspectionFacet.json @@ -0,0 +1 @@ +{"address":"0xF42350E2c880fb325E9a42aa8695EBc354DEC5E8"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/mainnetDelegation.json b/contracts/deployments/omega/base/addresses/mainnetDelegation.json new file mode 100644 index 000000000..b721e71c7 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/mainnetDelegation.json @@ -0,0 +1 @@ +{"address":"0xd58f9569a625f06a585c7dbbB9402Ee74e2F5EA4"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/membershipFacet.json b/contracts/deployments/omega/base/addresses/membershipFacet.json new file mode 100644 index 000000000..d0ce3aec6 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/membershipFacet.json @@ -0,0 +1 @@ +{"address":"0x7B809Fe671efef51BaAaDf6F0A8C9FD84ce5b608"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/membershipMetadataFacet.json b/contracts/deployments/omega/base/addresses/membershipMetadataFacet.json new file mode 100644 index 000000000..e9cab7c16 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/membershipMetadataFacet.json @@ -0,0 +1 @@ +{"address":"0x3466893bDedb3c158F91D2efEe6cD927Cd765e03"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/membershipReferralFacet.json b/contracts/deployments/omega/base/addresses/membershipReferralFacet.json new file mode 100644 index 000000000..e0072c477 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/membershipReferralFacet.json @@ -0,0 +1 @@ +{"address":"0x96cAF2AC48C4496fEE8a1D043c9FBF44439550c6"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/metadataFacet.json b/contracts/deployments/omega/base/addresses/metadataFacet.json new file mode 100644 index 000000000..94ecf9c9a --- /dev/null +++ b/contracts/deployments/omega/base/addresses/metadataFacet.json @@ -0,0 +1 @@ +{"address":"0xaB1e90747a535eEff6aB782cCD4f1839eBEBC690"} \ No newline at end of file diff --git a/contracts/deployments/base_sepolia/multiInit.json b/contracts/deployments/omega/base/addresses/multiInit.json similarity index 100% rename from contracts/deployments/base_sepolia/multiInit.json rename to contracts/deployments/omega/base/addresses/multiInit.json diff --git a/contracts/deployments/omega/base/addresses/nodeOperatorFacet.json b/contracts/deployments/omega/base/addresses/nodeOperatorFacet.json new file mode 100644 index 000000000..2a56382f1 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/nodeOperatorFacet.json @@ -0,0 +1 @@ +{"address":"0x1298c03Fde548dc433a452573E36A713b38A0404"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/ownableFacet.json b/contracts/deployments/omega/base/addresses/ownableFacet.json new file mode 100644 index 000000000..bcdbfe930 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/ownableFacet.json @@ -0,0 +1 @@ +{"address":"0xD48E1895cB18AE03Ee7D4817f73329760B954F25"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/ownablePendingFacet.json b/contracts/deployments/omega/base/addresses/ownablePendingFacet.json new file mode 100644 index 000000000..dd5ad7f92 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/ownablePendingFacet.json @@ -0,0 +1 @@ +{"address":"0x0b03564AA31abffDafb27e9378001D68aAB5Be37"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/pausable.json b/contracts/deployments/omega/base/addresses/pausable.json new file mode 100644 index 000000000..95761d5d3 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/pausable.json @@ -0,0 +1 @@ +{"address":"0xC8D65cd53af8a8fD776c43C12a8d322de6d03284"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/platformRequirements.json b/contracts/deployments/omega/base/addresses/platformRequirements.json new file mode 100644 index 000000000..9c5f6647e --- /dev/null +++ b/contracts/deployments/omega/base/addresses/platformRequirements.json @@ -0,0 +1 @@ +{"address":"0x9F8a025aACA6b961127f1780ca9A7fe48d0e95A0"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/prepayFacet.json b/contracts/deployments/omega/base/addresses/prepayFacet.json new file mode 100644 index 000000000..669589ed9 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/prepayFacet.json @@ -0,0 +1 @@ +{"address":"0xd29E6b2bD041E3648Cfda6aE4b48a36A379595F6"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/pricingModulesFacet.json b/contracts/deployments/omega/base/addresses/pricingModulesFacet.json new file mode 100644 index 000000000..e40f5d169 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/pricingModulesFacet.json @@ -0,0 +1 @@ +{"address":"0xeB55baFF292aB732893D485dA75348958EC6739c"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/proxyManagerFacet.json b/contracts/deployments/omega/base/addresses/proxyManagerFacet.json new file mode 100644 index 000000000..2c1a6f761 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/proxyManagerFacet.json @@ -0,0 +1 @@ +{"address":"0x2dD314d329680dD09C2B3067EdC409E4d5cA46Bd"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/rewardsDistribution.json b/contracts/deployments/omega/base/addresses/rewardsDistribution.json new file mode 100644 index 000000000..5d69840f6 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/rewardsDistribution.json @@ -0,0 +1 @@ +{"address":"0x71F591eF283e7C8c63A3a20DBf669E762F851F38"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/river.json b/contracts/deployments/omega/base/addresses/river.json new file mode 100644 index 000000000..b5f34423f --- /dev/null +++ b/contracts/deployments/omega/base/addresses/river.json @@ -0,0 +1 @@ +{"address":"0x9172852305F32819469bf38A3772f29361d7b768"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/roles.json b/contracts/deployments/omega/base/addresses/roles.json new file mode 100644 index 000000000..50651be19 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/roles.json @@ -0,0 +1 @@ +{"address":"0x1B7911eBF5E9636D65FbCf00d7B112B316832d68"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/ruleEntitlement.json b/contracts/deployments/omega/base/addresses/ruleEntitlement.json new file mode 100644 index 000000000..34c99ba0e --- /dev/null +++ b/contracts/deployments/omega/base/addresses/ruleEntitlement.json @@ -0,0 +1 @@ +{"address":"0x5BCb8183C722dC78A5159A357523903ec69B2cC2"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/space.json b/contracts/deployments/omega/base/addresses/space.json new file mode 100644 index 000000000..14d8e9731 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/space.json @@ -0,0 +1 @@ +{"address":"0x34f35E1ECA9C00791bF8121A01c20977d8bEB11C"} diff --git a/contracts/deployments/omega/base/addresses/spaceDelegationFacet.json b/contracts/deployments/omega/base/addresses/spaceDelegationFacet.json new file mode 100644 index 000000000..caa0b9cf9 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/spaceDelegationFacet.json @@ -0,0 +1 @@ +{"address":"0x81330d7a0bEdA5BF255a10c08E2F9B21A54BAd04"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/spaceFactory.json b/contracts/deployments/omega/base/addresses/spaceFactory.json new file mode 100644 index 000000000..dbb519611 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/spaceFactory.json @@ -0,0 +1 @@ +{"address":"0x9978c826d93883701522d2CA645d5436e5654252"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/spaceOwner.json b/contracts/deployments/omega/base/addresses/spaceOwner.json new file mode 100644 index 000000000..6abe30162 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/spaceOwner.json @@ -0,0 +1 @@ +{"address":"0x2824D1235d1CbcA6d61C00C3ceeCB9155cd33a42"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/tieredLogPricing.json b/contracts/deployments/omega/base/addresses/tieredLogPricing.json new file mode 100644 index 000000000..c332799b5 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/tieredLogPricing.json @@ -0,0 +1 @@ +{"address":"0x8bfd9E73aa0E9b307Ec05227fC1660693840d52a"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/tokenOwnableFacet.json b/contracts/deployments/omega/base/addresses/tokenOwnableFacet.json new file mode 100644 index 000000000..fbddf02fc --- /dev/null +++ b/contracts/deployments/omega/base/addresses/tokenOwnableFacet.json @@ -0,0 +1 @@ +{"address":"0xd06e509812d9fF60D5Ef0392f8AdA2b9e8C7caDc"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/tokenPausableFacet.json b/contracts/deployments/omega/base/addresses/tokenPausableFacet.json new file mode 100644 index 000000000..249a04f9e --- /dev/null +++ b/contracts/deployments/omega/base/addresses/tokenPausableFacet.json @@ -0,0 +1 @@ +{"address":"0xF36f90A14Be660Ce62F621a8343F6476c4Df765E"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/userEntitlement.json b/contracts/deployments/omega/base/addresses/userEntitlement.json new file mode 100644 index 000000000..7613ead00 --- /dev/null +++ b/contracts/deployments/omega/base/addresses/userEntitlement.json @@ -0,0 +1 @@ +{"address":"0xC8956B3855d16D2F3Ac60303A63546e071A814Fd"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/addresses/walletLink.json b/contracts/deployments/omega/base/addresses/walletLink.json new file mode 100644 index 000000000..ce21be3df --- /dev/null +++ b/contracts/deployments/omega/base/addresses/walletLink.json @@ -0,0 +1 @@ +{"address":"0x7F32810b12499c76D8331dD39130e3D0DE96989d"} \ No newline at end of file diff --git a/contracts/deployments/omega/base/chainId.json b/contracts/deployments/omega/base/chainId.json new file mode 100644 index 000000000..26b4ed749 --- /dev/null +++ b/contracts/deployments/omega/base/chainId.json @@ -0,0 +1 @@ +{ "id": 8453 } diff --git a/contracts/deployments/omega/river/addresses/diamondCutFacet.json b/contracts/deployments/omega/river/addresses/diamondCutFacet.json new file mode 100644 index 000000000..ff08f3b13 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/diamondCutFacet.json @@ -0,0 +1 @@ +{"address":"0x6b514303820D81FbF58d8c39584619dBe0779c98"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/diamondLoupeFacet.json b/contracts/deployments/omega/river/addresses/diamondLoupeFacet.json new file mode 100644 index 000000000..c359cab71 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/diamondLoupeFacet.json @@ -0,0 +1 @@ +{"address":"0xEfb36fc3686562cf63CA76b42e65D848633E9647"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/introspectionFacet.json b/contracts/deployments/omega/river/addresses/introspectionFacet.json new file mode 100644 index 000000000..d98f079bf --- /dev/null +++ b/contracts/deployments/omega/river/addresses/introspectionFacet.json @@ -0,0 +1 @@ +{"address":"0x872D11389Fdb73803C2805F570f5a697BB1b0664"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/multiInit.json b/contracts/deployments/omega/river/addresses/multiInit.json new file mode 100644 index 000000000..b5f34423f --- /dev/null +++ b/contracts/deployments/omega/river/addresses/multiInit.json @@ -0,0 +1 @@ +{"address":"0x9172852305F32819469bf38A3772f29361d7b768"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/nodeRegistryFacet.json b/contracts/deployments/omega/river/addresses/nodeRegistryFacet.json new file mode 100644 index 000000000..bcdbfe930 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/nodeRegistryFacet.json @@ -0,0 +1 @@ +{"address":"0xD48E1895cB18AE03Ee7D4817f73329760B954F25"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/operatorRegistryFacet.json b/contracts/deployments/omega/river/addresses/operatorRegistryFacet.json new file mode 100644 index 000000000..5135a0c87 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/operatorRegistryFacet.json @@ -0,0 +1 @@ +{"address":"0x820D45E043ebc6fFb82e3c076D3A1EC044d71548"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/ownableFacet.json b/contracts/deployments/omega/river/addresses/ownableFacet.json new file mode 100644 index 000000000..67278dcf8 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/ownableFacet.json @@ -0,0 +1 @@ +{"address":"0xF42350E2c880fb325E9a42aa8695EBc354DEC5E8"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/riverConfigFacet.json b/contracts/deployments/omega/river/addresses/riverConfigFacet.json new file mode 100644 index 000000000..b721e71c7 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/riverConfigFacet.json @@ -0,0 +1 @@ +{"address":"0xd58f9569a625f06a585c7dbbB9402Ee74e2F5EA4"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/riverRegistry.json b/contracts/deployments/omega/river/addresses/riverRegistry.json new file mode 100644 index 000000000..2a56382f1 --- /dev/null +++ b/contracts/deployments/omega/river/addresses/riverRegistry.json @@ -0,0 +1 @@ +{"address":"0x1298c03Fde548dc433a452573E36A713b38A0404"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/addresses/streamRegistryFacet.json b/contracts/deployments/omega/river/addresses/streamRegistryFacet.json new file mode 100644 index 000000000..94ecf9c9a --- /dev/null +++ b/contracts/deployments/omega/river/addresses/streamRegistryFacet.json @@ -0,0 +1 @@ +{"address":"0xaB1e90747a535eEff6aB782cCD4f1839eBEBC690"} \ No newline at end of file diff --git a/contracts/deployments/omega/river/chainId.json b/contracts/deployments/omega/river/chainId.json new file mode 100644 index 000000000..cf51410ed --- /dev/null +++ b/contracts/deployments/omega/river/chainId.json @@ -0,0 +1 @@ +{ "id": 550 } diff --git a/contracts/deployments/river_devnet/mockERC721A.json b/contracts/deployments/river_devnet/mockERC721A.json deleted file mode 100644 index 9cba09dd8..000000000 --- a/contracts/deployments/river_devnet/mockERC721A.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x489856C4959Bf1E9abcc2E906f253ae154C0999C"} \ No newline at end of file diff --git a/contracts/deployments/river_devnet/multiInit.json b/contracts/deployments/river_devnet/multiInit.json deleted file mode 100644 index a9fa801c2..000000000 --- a/contracts/deployments/river_devnet/multiInit.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x9098261A5a64A3323997d8d864c27f71dfA5e232"} \ No newline at end of file diff --git a/contracts/makefile b/contracts/makefile index ce1af7345..1cfa4f083 100644 --- a/contracts/makefile +++ b/contracts/makefile @@ -264,7 +264,7 @@ deploy-alpha-base-sepolia :; @$(MAKE) resume-any context=alpha rpc=base_sepolia private_key=${TESTNET_PRIVATE_KEY} verifier=${BASESCAN_SEPOLIA_URL} etherscan=${BASESCAN_API_KEY} interact-alpha-base-sepolia :; - @$(MAKE) interact-any context=alpha rpc=base_sepolia private_key=${TESTNET_PRIVATE_KEY} + $(MAKE) interact-any context=alpha rpc=base_sepolia private_key=${TESTNET_PRIVATE_KEY} deploy-alpha-river-testnet :; @$(MAKE) deploy-any context=alpha rpc=river_devnet private_key=${TESTNET_PRIVATE_KEY} diff --git a/contracts/scripts/common/DeployBase.s.sol b/contracts/scripts/common/DeployBase.s.sol index 8844a26ce..d4b0b9623 100644 --- a/contracts/scripts/common/DeployBase.s.sol +++ b/contracts/scripts/common/DeployBase.s.sol @@ -54,10 +54,11 @@ contract DeployBase is DeployHelpers, Script { /// @notice returns the chain alias for the current chain function chainIdAlias() internal returns (string memory) { - return - block.chainid == 31337 - ? "base_anvil" // if block.chain === 85432 'base' - : getChain(block.chainid).chainAlias; + string memory chainAlias = block.chainid == 31337 + ? "base_anvil" + : getChain(block.chainid).chainAlias; + + return getInitialStringFromUnderscore(chainAlias); } function networkDirPath() internal returns (string memory path) { @@ -79,14 +80,21 @@ contract DeployBase is DeployHelpers, Script { path = string.concat(vm.projectRoot(), "/", context); } - function cachePath( + function addressesPath( string memory contractName ) internal returns (string memory path) { - path = string.concat(networkDirPath(), "/", contractName, ".json"); + path = string.concat( + networkDirPath(), + "/", + "addresses", + "/", + contractName, + ".json" + ); } function getDeployment(string memory versionName) internal returns (address) { - string memory path = cachePath(versionName); + string memory path = addressesPath(versionName); if (!exists(path)) { debug( @@ -114,15 +122,20 @@ contract DeployBase is DeployHelpers, Script { } // create addresses directory - createDir(networkDirPath()); + createDir(string.concat(networkDirPath(), "/", "addresses")); + createChainIdFile(networkDirPath()); // get deployment path - string memory path = cachePath(versionName); + string memory path = addressesPath(versionName); // save deployment - string memory jsonStr = vm.serializeAddress("{}", "address", contractAddr); + string memory contractJson = vm.serializeAddress( + "addresses", + "address", + contractAddr + ); debug("saving deployment to: ", path); - vm.writeFile(path, jsonStr); + vm.writeJson(contractJson, path); } function isAnvil() internal view returns (bool) { @@ -136,4 +149,44 @@ contract DeployBase is DeployHelpers, Script { function isTesting() internal view returns (bool) { return vm.envOr("IN_TESTING", false); } + + // Utils + function createChainIdFile(string memory networkDir) internal { + string memory chainIdFilePath = string.concat( + networkDir, + "/", + "chainId.json" + ); + + if (!exists(chainIdFilePath)) { + debug("creating chain id file: ", chainIdFilePath); + string memory jsonStr = vm.serializeUint("chainIds", "id", block.chainid); + vm.writeJson(jsonStr, chainIdFilePath); + } + } + + function getInitialStringFromUnderscore( + string memory fullString + ) internal pure returns (string memory) { + bytes memory fullStringBytes = bytes(fullString); + uint256 underscoreIndex = 0; + + for (uint256 i = 0; i < fullStringBytes.length; i++) { + if (fullStringBytes[i] == "_") { + underscoreIndex = i; + break; + } + } + + if (underscoreIndex == 0) { + return fullString; + } + + bytes memory result = new bytes(underscoreIndex); + for (uint256 i = 0; i < underscoreIndex; i++) { + result[i] = fullStringBytes[i]; + } + + return string(result); + } } diff --git a/contracts/scripts/interactions/InteractAlpha.s.sol b/contracts/scripts/interactions/InteractAlpha.s.sol index ceca89b99..c9d46e9f6 100644 --- a/contracts/scripts/interactions/InteractAlpha.s.sol +++ b/contracts/scripts/interactions/InteractAlpha.s.sol @@ -28,17 +28,18 @@ contract InteractAlpha is Interaction, DiamondHelper, IDiamondLoupeBase { DeploySpaceOwner deploySpaceOwner = new DeploySpaceOwner(); function __interact(address deployer) internal override { + vm.setEnv("OVERRIDE_DEPLOYMENTS", "1"); address space = getDeployment("space"); - address spaceOwner = getDeployment("spaceOwner"); - address spaceFactory = getDeployment("spaceFactory"); - address baseRegistry = getDeployment("baseRegistry"); + // address spaceOwner = getDeployment("spaceOwner"); + // address spaceFactory = getDeployment("spaceFactory"); + // address baseRegistry = getDeployment("baseRegistry"); FacetCut[] memory newCuts; removeRemoteFacets(deployer, space); - removeRemoteFacets(deployer, spaceOwner); - removeRemoteFacets(deployer, spaceFactory); - removeRemoteFacets(deployer, baseRegistry); + // removeRemoteFacets(deployer, spaceOwner); + // removeRemoteFacets(deployer, spaceFactory); + // removeRemoteFacets(deployer, baseRegistry); // // Deploy Space deploySpace.diamondInitParams(deployer); @@ -46,23 +47,23 @@ contract InteractAlpha is Interaction, DiamondHelper, IDiamondLoupeBase { vm.broadcast(deployer); IDiamondCut(space).diamondCut(newCuts, address(0), ""); - // Deploy Space Owner - deploySpaceOwner.diamondInitParams(deployer); - newCuts = deploySpaceOwner.getCuts(); - vm.broadcast(deployer); - IDiamondCut(spaceOwner).diamondCut(newCuts, address(0), ""); - - // Deploy Space Factory - deploySpaceFactory.diamondInitParams(deployer); - newCuts = deploySpaceFactory.getCuts(); - vm.broadcast(deployer); - IDiamondCut(spaceFactory).diamondCut(newCuts, address(0), ""); - - // Deploy Base Registry - deployBaseRegistry.diamondInitParams(deployer); - newCuts = deployBaseRegistry.getCuts(); - vm.broadcast(deployer); - IDiamondCut(baseRegistry).diamondCut(newCuts, address(0), ""); + // // Deploy Space Owner + // deploySpaceOwner.diamondInitParams(deployer); + // newCuts = deploySpaceOwner.getCuts(); + // vm.broadcast(deployer); + // IDiamondCut(spaceOwner).diamondCut(newCuts, address(0), ""); + + // // Deploy Space Factory + // deploySpaceFactory.diamondInitParams(deployer); + // newCuts = deploySpaceFactory.getCuts(); + // vm.broadcast(deployer); + // IDiamondCut(spaceFactory).diamondCut(newCuts, address(0), ""); + + // // Deploy Base Registry + // deployBaseRegistry.diamondInitParams(deployer); + // newCuts = deployBaseRegistry.getCuts(); + // vm.broadcast(deployer); + // IDiamondCut(baseRegistry).diamondCut(newCuts, address(0), ""); } function removeRemoteFacets(address deployer, address diamond) internal { diff --git a/packages/generated/addresses/base_sepolia/airdrop.json b/packages/generated/addresses/base_sepolia/airdrop.json deleted file mode 100644 index 18a54d0d5..000000000 --- a/packages/generated/addresses/base_sepolia/airdrop.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x37F83D12825EBa5F648b5D74a0AE2b7EbbF2F146"} \ No newline at end of file diff --git a/packages/generated/addresses/ethereum_mainnet/authorizedClaimers.json b/packages/generated/addresses/ethereum_mainnet/authorizedClaimers.json deleted file mode 100644 index 16ab21eca..000000000 --- a/packages/generated/addresses/ethereum_mainnet/authorizedClaimers.json +++ /dev/null @@ -1 +0,0 @@ -{"address": "0x0bEe55b52d01C4D5d4D0cfcE1d6e0baE6722db05"} diff --git a/packages/generated/addresses/ethereum_mainnet/river.json b/packages/generated/addresses/ethereum_mainnet/river.json deleted file mode 100644 index d9160ec5f..000000000 --- a/packages/generated/addresses/ethereum_mainnet/river.json +++ /dev/null @@ -1 +0,0 @@ -{"address": "0x53319181e003E7f86fB79f794649a2aB680Db244"} diff --git a/packages/generated/addresses/ethereum_sepolia/authorizedClaimers.json b/packages/generated/addresses/ethereum_sepolia/authorizedClaimers.json deleted file mode 100644 index cfa7be3b6..000000000 --- a/packages/generated/addresses/ethereum_sepolia/authorizedClaimers.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xeeDCAB3c3B032D5627dcF5e1475E0e24a88b4A21"} \ No newline at end of file diff --git a/packages/generated/addresses/ethereum_sepolia/riverMainnet.json b/packages/generated/addresses/ethereum_sepolia/riverMainnet.json deleted file mode 100644 index 7c4d9a174..000000000 --- a/packages/generated/addresses/ethereum_sepolia/riverMainnet.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x40eF1bb984503bb5Adef041A88a4F9180e8586f9"} \ No newline at end of file diff --git a/packages/generated/addresses/river_devnet/multiInit.json b/packages/generated/addresses/river_devnet/multiInit.json deleted file mode 100644 index 4d759ac5f..000000000 --- a/packages/generated/addresses/river_devnet/multiInit.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x09346ae3E6DdCc00f251a109C56B94CF593c401f"} \ No newline at end of file diff --git a/packages/generated/addresses/river_devnet/riverConfigFacet.json b/packages/generated/addresses/river_devnet/riverConfigFacet.json deleted file mode 100644 index f3f59a791..000000000 --- a/packages/generated/addresses/river_devnet/riverConfigFacet.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xC9055AcC2b37B5622DF9aC82fAE8c95818fB2594"} \ No newline at end of file diff --git a/packages/generated/addresses/river_devnet/streamRegistryFacet.json b/packages/generated/addresses/river_devnet/streamRegistryFacet.json deleted file mode 100644 index f9634f65d..000000000 --- a/packages/generated/addresses/river_devnet/streamRegistryFacet.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0xec7139B73Fb97cc1188B2a89B8107EEA954A99BD"} \ No newline at end of file diff --git a/packages/generated/addresses/sepolia/river.json b/packages/generated/addresses/sepolia/river.json deleted file mode 100644 index 7c4d9a174..000000000 --- a/packages/generated/addresses/sepolia/river.json +++ /dev/null @@ -1 +0,0 @@ -{"address":"0x40eF1bb984503bb5Adef041A88a4F9180e8586f9"} \ No newline at end of file diff --git a/scripts/deploy-contracts.sh b/scripts/deploy-contracts.sh index d37baf9dc..3f78ac4fe 100755 --- a/scripts/deploy-contracts.sh +++ b/scripts/deploy-contracts.sh @@ -8,7 +8,7 @@ export BASE_CHAIN_ID="${BASE_CHAIN_ID:-31337}" export RIVER_CHAIN_ID="${RIVER_CHAIN_ID:-31338}" SKIP_CHAIN_WAIT="${SKIP_CHAIN_WAIT:-false}" -BASE_EXECUTION_CLIENT="${BASE_EXECUTION_CLIENT:-''}" +BASE_EXECUTION_CLIENT="${BASE_EXECUTION_CLIENT:-}" BASE_ANVIL_SOURCE_DIR=${BASE_ANVIL_SOURCE_DIR:-"base_anvil"} RIVER_ANVIL_SOURCE_DIR=${RIVER_ANVIL_SOURCE_DIR:-"river_anvil"} RIVER_BLOCK_TIME="${RIVER_BLOCK_TIME:-1}" @@ -76,25 +76,14 @@ cast rpc evm_setIntervalMining $RIVER_BLOCK_TIME --rpc-url $RIVER_ANVIL_RPC_URL popd -mkdir -p packages/generated/deployments/${RIVER_ENV}/base/addresses -mkdir -p packages/generated/deployments/${RIVER_ENV}/river/addresses - -function copy_addresses() { - local SOURCE_DIR=$1 - local DEST_DIR=$2 - local CHAIN_ID=$3 - cp contracts/deployments/${RIVER_ENV}/${SOURCE_DIR}/* packages/generated/deployments/${RIVER_ENV}/${DEST_DIR}/addresses - echo "{\"id\": ${CHAIN_ID}}" > packages/generated/deployments/${RIVER_ENV}/${DEST_DIR}/chainId.json - - if [ "$DEST_DIR" = "base" ] && [ -n "$BASE_EXECUTION_CLIENT" ]; then - echo "{\"executionClient\": \"${BASE_EXECUTION_CLIENT}\"}" > packages/generated/deployments/${RIVER_ENV}/${DEST_DIR}/executionClient.json - fi -} - -# copy base contracts -copy_addresses $BASE_ANVIL_SOURCE_DIR "base" "${BASE_CHAIN_ID}" -# copy river contracts -copy_addresses $RIVER_ANVIL_SOURCE_DIR "river" "${RIVER_CHAIN_ID}" + +# mkdir -p packages/generated/deployments/${RIVER_ENV}/{base,river} +cp -r contracts/deployments/${RIVER_ENV} packages/generated/deployments/${RIVER_ENV} + + +if [ -n "$BASE_EXECUTION_CLIENT" ]; then + echo "{\"executionClient\": \"${BASE_EXECUTION_CLIENT}\"}" > packages/generated/deployments/${RIVER_ENV}/base/executionClient.json +fi # Update the config pushd ./packages/generated