use StreamRegistry ABI and type from npm package

streamr-dev · Oct 2, 2024 · 5ddee47 · 5ddee47
1 parent b6a9ea1
commit 5ddee47
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 2,649 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -58,7 +58,7 @@
   },
   "devDependencies": {
     "@inquirer/testing": "^2.1.34",
-    "@streamr/network-contracts-ethers6": "^7.1.4",
+    "@streamr/network-contracts": "^8.2.0",
     "@streamr/test-utils": "101.1.2",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",

diff --git a/packages/node/test/integration/plugins/operator/OperatorPlugin.test.ts b/packages/node/test/integration/plugins/operator/OperatorPlugin.test.ts
@@ -1,4 +1,4 @@
-import type { Operator } from '@streamr/network-contracts-ethers6'
+import type { Operator } from '@streamr/network-contracts'
 import {
     ProxyDirection,
     StreamPermission,

diff --git a/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts b/packages/node/test/integration/plugins/operator/checkOperatorValueBreach.test.ts
@@ -1,4 +1,4 @@
-import { Operator, StreamrConfig, streamrConfigABI } from '@streamr/network-contracts-ethers6'
+import { Operator, StreamrConfig, streamrConfigABI } from '@streamr/network-contracts'
 import {
     SetupOperatorContractOpts,
     _operatorContractUtils,

diff --git a/packages/node/test/smoke/inspect.test.ts b/packages/node/test/smoke/inspect.test.ts
@@ -1,5 +1,5 @@
 import { config as CHAIN_CONFIG } from '@streamr/config'
-import { StreamrConfig, streamrConfigABI } from '@streamr/network-contracts-ethers6'
+import { StreamrConfig, streamrConfigABI } from '@streamr/network-contracts'
 import { _operatorContractUtils } from '@streamr/sdk'
 import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import { Logger, StreamID, TheGraphClient, wait, waitForCondition } from '@streamr/utils'

diff --git a/packages/node/test/smoke/profit.test.ts b/packages/node/test/smoke/profit.test.ts
@@ -1,6 +1,6 @@
 import { config as CHAIN_CONFIG } from '@streamr/config'
-import type { Operator, Sponsorship } from '@streamr/network-contracts-ethers6'
-import { StreamrConfig, streamrConfigABI } from '@streamr/network-contracts-ethers6'
+import type { Operator, Sponsorship } from '@streamr/network-contracts'
+import { StreamrConfig, streamrConfigABI } from '@streamr/network-contracts'
 import { _operatorContractUtils } from '@streamr/sdk'
 import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import { waitForCondition } from '@streamr/utils'

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -91,6 +91,7 @@
     "@protobuf-ts/runtime-rpc": "^2.8.2",
     "@streamr/config": "^5.3.13",
     "@streamr/dht": "101.1.2",
+    "@streamr/network-contracts": "^8.2.0",
     "@streamr/proto-rpc": "101.1.2",
     "@streamr/trackerless-network": "101.1.2",
     "@streamr/utils": "101.1.2",

diff --git a/packages/sdk/src/contracts/StreamRegistry.ts b/packages/sdk/src/contracts/StreamRegistry.ts
@@ -21,8 +21,8 @@ import { RpcProviderSource } from '../RpcProviderSource'
 import { Stream, StreamMetadata } from '../Stream'
 import { StreamIDBuilder } from '../StreamIDBuilder'
 import { StreamrClientError } from '../StreamrClientError'
-import type { StreamRegistryV4 as StreamRegistryContract } from '../ethereumArtifacts/StreamRegistryV4'
-import StreamRegistryArtifact from '../ethereumArtifacts/StreamRegistryV4Abi.json'
+import type { StreamRegistry as StreamRegistryContract } from '@streamr/network-contracts'
+import { streamRegistryABI } from '@streamr/network-contracts'
 import { getEthersOverrides } from '../ethereumUtils'
 import { StreamrClientEventEmitter } from '../events'
 import {
@@ -123,12 +123,12 @@ export class StreamRegistry {
         this.logger = loggerFactory.createLogger(module)
         this.streamRegistryContractReadonly = this.contractFactory.createReadContract<StreamRegistryContract>(
             toEthereumAddress(this.config.contracts.streamRegistryChainAddress),
-            StreamRegistryArtifact,
+            streamRegistryABI,
             this.rpcProviderSource.getProvider(),
             'streamRegistry'
         )
         const chainEventPoller = new ChainEventPoller(this.rpcProviderSource.getSubProviders().map((p) => {
-            return contractFactory.createEventContract(toEthereumAddress(this.config.contracts.streamRegistryChainAddress), StreamRegistryArtifact, p)
+            return contractFactory.createEventContract(toEthereumAddress(this.config.contracts.streamRegistryChainAddress), streamRegistryABI, p)
         // eslint-disable-next-line no-underscore-dangle
         }), config.contracts.pollInterval)
         initContractEventGateway({
@@ -191,7 +191,7 @@ export class StreamRegistry {
             const chainSigner = await this.authentication.getTransactionSigner(this.rpcProviderSource)
             this.streamRegistryContract = this.contractFactory.createWriteContract<StreamRegistryContract>(
                 toEthereumAddress(this.config.contracts.streamRegistryChainAddress),
-                StreamRegistryArtifact,
+                streamRegistryABI,
                 chainSigner,
                 'streamRegistry'
             )