chore: [ETH-886] Remove Data Union functionality (#1014)

Removed most of the Data Union related functionality. There is still
`isDataUnion` flag in `Project` entity, we can remove that later if
needed.

## Changes

We no longer deploy dataunion contracts to streamr-docker-dev. Therefore
related smoke test has been removed, and we don't need to start
`graph-deploy-dataunion-subgraph-fastchain` service.

The contract addresses for `dev2` changed as a side effect, updated the
new values to `config.json` and `subgraph.yaml`.

Author: teogeb

.github/workflows/ci.yaml

@@ -71,8 +71,7 @@ jobs:
       - name: Start docker stack
         uses: streamr-dev/[email protected]
         with:
-          services-to-start: 'deploy-network-subgraphs-fastchain graph-deploy-dataunion-subgraph-fastchain'
-          # services-to-start: 'ens-sync-script-fastchain deploy-network-subgraphs-fastchain graph-deploy-dataunion-subgraph-fastchain'
+          services-to-start: 'deploy-network-subgraphs-fastchain'
       - name: Integration Test (with locally built images)
         env:
           TEST_TIMEOUT: '600000'

packages/config/config.json

@@ -100,30 +100,28 @@
     "adminPrivateKey": "0x5e98cce00cff5dea6b454889f359a4ec06b9fa6b88e9d69b86de8e1c81887da0",
     "contracts": {
       "DATA": "0xbAA81A0179015bE47Ad439566374F2Bae098686F",
-      "ENS": "0x642D2B84A32A9A92FEc78CeAA9488388b3704898",
-      "FIFSRegistrar": "0x338090C5492C5c5E41a4458f5FC4b205cbc54A24",
-      "PublicResolver": "0x18E0937099660B82464475Ea2B7e6Af4f2BFE5F0",
-      "TrackerRegistry": "0x6cCdd5d866ea766f6DF5965aA98DeCCD629ff222",
-      "StorageNodeRegistry": "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0",
-      "StreamRegistry": "0xd04af489677001444280366Dd0885B03dAaDe71D",
-      "ENSCacheV2": "0xB73189CeBCc870bE6f9aa16764bbB3665e4B49B6",
-      "StreamStorageRegistry": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
-      "StreamrConfig": "0xc24BA8c05E5206F1bE57bfA0aD14E9882126eD38",
-      "SponsorshipOperatorContractOnlyJoinPolicy": "0x57B81a9442805f88c4617B506206531e72d96290",
-      "SponsorshipMaxOperatorsJoinPolicy": "0x699B4bE95614f017Bb622e427d3232837Cc814E6",
-      "SponsorshipStakeWeightedAllocationPolicy": "0xBc0c81a318D57ae54dA28DE69184A9c3aE9a1e1c",
-      "SponsorshipDefaultLeavePolicy": "0x611900fD07BB133016Ed85553aF9586771da5ff9",
-      "SponsorshipVoteKickPolicy": "0x256D4CB67452b6b8280B2b67F040fD22f1C378f4",
-      "SponsorshipFactory": "0xbfa4EcF9d107De5720446e6dd8162ef6bf4b3873",
-      "OperatorDefaultDelegationPolicy": "0xeE1bC9a7BFF1fFD913f4c97B6177D47E804E1920",
-      "OperatorDefaultExchangeRatePolicy": "0xD13D34d37e2c94cb35EA8D5DE7498Cb7830d26e0",
-      "OperatorDefaultUndelegationPolicy": "0x1Cc93b7f91727e7c9bC86025C622A664e93DFb29",
-      "OperatorFactory": "0x3AE0ad89b0e094fD09428589849C161f0F7f4E6A",
-      "ProjectRegistryV1": "0x3523F6Ff285D2A3F79A53d1E0953BD41bb7f6022",
-      "MarketplaceV4": "0x8015bb1954FaF2A6109F5c41b2086B250A6769A0",
-      "ProjectStakingV1": "0x3Dd18E5E8C4f6291Db26795CC154918f7Ac1D875",
-      "DataUnionFactory": "0xdc5F6368cd31330adC259386e78604a5E29E9415",
-      "DataUnionTemplate": "0xEAA002f7Dc60178B6103f8617Be45a9D3df659B6"
+      "ENS": "0xEAA002f7Dc60178B6103f8617Be45a9D3df659B6",
+      "FIFSRegistrar": "0xF1371c0f40528406dc4f4cAf89924eA9Da49E866",
+      "PublicResolver": "0xdc5F6368cd31330adC259386e78604a5E29E9415",
+      "TrackerRegistry": "0xE4eA76e830a659282368cA2e7E4d18C4AE52D8B3",
+      "StorageNodeRegistry": "0x338090C5492C5c5E41a4458f5FC4b205cbc54A24",
+      "StreamRegistry": "0x18E0937099660B82464475Ea2B7e6Af4f2BFE5F0",
+      "ENSCacheV2": "0x7739b57beC285539A62434DF9808f66ebB405ba3",
+      "StreamStorageRegistry": "0xB73189CeBCc870bE6f9aa16764bbB3665e4B49B6",
+      "StreamrConfig": "0x00E680d549FE53a627a3db86a6F88fA2471CFfAa",
+      "SponsorshipOperatorContractOnlyJoinPolicy": "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37",
+      "SponsorshipMaxOperatorsJoinPolicy": "0x36368Be8Cde49558Ab6ceEf2632984b282Db8775",
+      "SponsorshipStakeWeightedAllocationPolicy": "0xc24BA8c05E5206F1bE57bfA0aD14E9882126eD38",
+      "SponsorshipDefaultLeavePolicy": "0xBFCF120a8fD17670536f1B27D9737B775b2FD4CF",
+      "SponsorshipVoteKickPolicy": "0x92E8435EB56fD01BF4C79B66d47AC1A94338BB03",
+      "SponsorshipFactory": "0x699B4bE95614f017Bb622e427d3232837Cc814E6",
+      "OperatorDefaultDelegationPolicy": "0x5159FBF2e0Ff63e35b17293416fdf7a0909a0cDA",
+      "OperatorDefaultExchangeRatePolicy": "0xfC31c70FafCbFe399195C789602ae2455B247fD2",
+      "OperatorDefaultUndelegationPolicy": "0xBacF06448F4f14361AD80d425686021b041F3B2C",
+      "OperatorFactory": "0xD13D34d37e2c94cb35EA8D5DE7498Cb7830d26e0",
+      "ProjectRegistryV1": "0xA9166376706611110f814D1333b8E80FEc5d8f10",
+      "MarketplaceV4": "0xb8678223183d560280a7BEF68daAbB0E3daBd97D",
+      "ProjectStakingV1": "0x73a9310C43621B853C508902bb8c1DA8f1240EaE"
     },
     "theGraphUrl": "http://10.200.10.1:8800/subgraphs/name/streamr-dev/network-subgraphs",
     "entryPoints": [

packages/dev-chain-fast/src/deploy.ts

@@ -4,9 +4,6 @@ import { HubEnvDeployer } from "@streamr/hub-contracts"
 
 import { JsonRpcProvider } from "@ethersproject/providers"
 import { Wallet } from "@ethersproject/wallet"
-import { parseEther } from "@ethersproject/units"
-
-import { deployDataUnionContracts, deployDataUnion } from "./deployDataUnionContracts"
 
 import { projects } from "./projects"
 
@@ -48,8 +45,6 @@ async function deploy() {
 
     await streamrEnvDeployer.deployToken()
 
-    const { dataUnionFactory, dataUnionTemplate } = await deployDataUnionContracts(streamrEnvDeployer.addresses.DATA, deployerWallet)
-
     await streamrEnvDeployer.deployEnvironment({ deployToken: false })
     await streamrEnvDeployer.createFundStakeSponsorshipAndOperator()
     await streamrEnvDeployer.registerEnsName("streamrtest", new Wallet(key))
@@ -58,13 +53,6 @@ async function deploy() {
     const hubDeployer = new HubEnvDeployer(key, url, streamrEnvDeployer.addresses.StreamRegistry, 1337)
     await hubDeployer.deployCoreContracts(streamrEnvDeployer.addresses.DATA)
 
-    // deploy a data union to populate the subgraph
-    const dataUnion = await deployDataUnion(deployerWallet, dataUnionFactory)
-    await (await dataUnion.addMembersWithWeights(
-        [ "0x01BE23585060835E02B77ef475b0Cc51aA1e0709", "0xd2D23b73A67208a90CBfEE1381415329954f54E2" ],
-        [ parseEther("1"), parseEther("2") ],
-    ))
-
     console.log("\n\n")
     console.log(`Admin wallet: address: ${deployerWallet.address} (private key: ${deployerWallet.privateKey})`)
 
@@ -94,9 +82,7 @@ async function deploy() {
 
     const contractAddresses = {
         ...streamrEnvDeployer.addresses,
-        ...hubDeployer.addresses,
-        DataUnionFactory: dataUnionFactory.address,
-        DataUnionTemplate: dataUnionTemplate.address,
+        ...hubDeployer.addresses
     }
     const addressesJson = JSON.stringify(contractAddresses, null, 4)
 

packages/dev-chain-fast/src/deployDataUnionContracts.ts

@@ -7,7 +7,6 @@ import { BigNumber } from "ethers"
 describe("docker image integration test", () => {
 
     let graphClient: TheGraphClient
-    let duGraphClient: TheGraphClient
 
     before(async function () {
         this.timeout(200000)
@@ -16,11 +15,6 @@ describe("docker image integration test", () => {
             fetch,
             logger: new Logger(module)
         })
-        duGraphClient = new TheGraphClient({
-            serverUrl: config.dev2.theGraphUrl.replace("network-subgraphs", "dataunion"),
-            fetch,
-            logger: new Logger(module)
-        })
 
         // wait for thegraph to be ready (time out after 1 minute)
         let retries = 0
@@ -246,27 +240,4 @@ describe("docker image integration test", () => {
         `})
         expect(resultDynamicIds.projects.length).to.equal(5)
     })
-
-    // TODO: move this to DU repository?
-    it("can get all the indexed example data from Data Union subgraph", async () => {
-        const resultDynamicIds = await duGraphClient.queryEntity<{
-            dataUnionStatsBuckets: [],
-            dataUnions: [],
-            members: [],
-        }>({ query: `{
-                dataUnionStatsBuckets {
-                    id
-                }
-                dataUnions {
-                    id
-                }
-                members {
-                    id
-                }
-            }`}
-        )
-        expect(resultDynamicIds.dataUnionStatsBuckets.length).to.equal(2)
-        expect(resultDynamicIds.dataUnions.length).to.equal(1)
-        expect(resultDynamicIds.members.length).to.equal(2)
-    })
 })

packages/network-contracts/test/integration/contractsSubgraphSmoketest.test.ts

@@ -13,7 +13,7 @@ dataSources:
     name: StreamRegistry
     network: dev2
     source:
-      address: "0xd04af489677001444280366Dd0885B03dAaDe71D"
+      address: "0x18E0937099660B82464475Ea2B7e6Af4f2BFE5F0"
       abi: StreamRegistry
       # startBlock: 10000000 #TODO
     mapping:
@@ -42,7 +42,7 @@ dataSources:
     name: NodeRegistry
     network: dev2
     source:
-      address: "0xCBAcfA0592B3D809aEc805d527f8ceAe9307D9C0"
+      address: "0x338090C5492C5c5E41a4458f5FC4b205cbc54A24"
       abi: NodeRegistry
       # startBlock: 10000000 #TODO
     mapping:
@@ -64,7 +64,7 @@ dataSources:
     name: StreamStorageRegistry
     network: dev2
     source:
-      address: "0xB9372284e0D61607aF3B7EF5f022e7D599Ed2a37"
+      address: "0xB73189CeBCc870bE6f9aa16764bbB3665e4B49B6"
       abi: StreamStorageRegistry
       # startBlock: 10000000 #TODO
     mapping:
@@ -86,7 +86,7 @@ dataSources:
     name: ProjectRegistryV1
     network: dev2
     source:
-      address: "0x3523F6Ff285D2A3F79A53d1E0953BD41bb7f6022"
+      address: "0xA9166376706611110f814D1333b8E80FEc5d8f10"
       abi: ProjectRegistryV1
       startBlock: 0
     mapping:
@@ -121,7 +121,7 @@ dataSources:
     name: MarketplaceV4
     network: dev2
     source:
-      address: "0x8015bb1954FaF2A6109F5c41b2086B250A6769A0"
+      address: "0xb8678223183d560280a7BEF68daAbB0E3daBd97D"
       abi: MarketplaceV4
       startBlock: 0
     mapping:
@@ -142,7 +142,7 @@ dataSources:
     name: ProjectStakingV1
     network: dev2
     source:
-      address: "0x3Dd18E5E8C4f6291Db26795CC154918f7Ac1D875"
+      address: "0x73a9310C43621B853C508902bb8c1DA8f1240EaE"
       abi: ProjectStakingV1
       startBlock: 0
     mapping:
@@ -168,7 +168,7 @@ dataSources:
     name: StreamrConfig
     network: dev2
     source:
-      address: '0xc24BA8c05E5206F1bE57bfA0aD14E9882126eD38'
+      address: '0x00E680d549FE53a627a3db86a6F88fA2471CFfAa'
       abi: StreamrConfig
       startBlock: 0
     mapping:
@@ -188,8 +188,7 @@ dataSources:
     name: SponsorshipFactory
     network: dev2
     source:
-      # make sure this is same as config.contracts.SponsorshipFactory in https://github.com/streamr-dev/network-contracts/blob/develop/packages/config/src/networks.json
-      address: '0xbfa4EcF9d107De5720446e6dd8162ef6bf4b3873'
+      address: '0x699B4bE95614f017Bb622e427d3232837Cc814E6'
       abi: SponsorshipFactory
       startBlock: 0
     mapping:
@@ -213,8 +212,7 @@ dataSources:
     name: OperatorFactory
     network: dev2
     source:
-      # make sure this is same as config.contracts.OperatorFactory in https://github.com/streamr-dev/network-contracts/blob/develop/packages/config/src/networks.json
-      address: '0x3AE0ad89b0e094fD09428589849C161f0F7f4E6A'
+      address: '0xD13D34d37e2c94cb35EA8D5DE7498Cb7830d26e0'
       abi: OperatorFactory
       startBlock: 0
     mapping: