Merge branch 'jt/net-80-upgrade-diff-report-render' into jt/net-61-ci…

…-implementation

contracts/src/utils/libraries/CustomRevert.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @title Library for reverting with custom errors efficiently
+/// @notice Contains functions for reverting with custom errors with different argument types efficiently
+/// @dev To use this library, declare `using CustomRevert for bytes4;` and replace `revert CustomError()` with
+/// `CustomError.selector.revertWith()`
+/// @dev The functions may tamper with the free memory pointer but it is fine since the call context is exited immediately
+library CustomRevert {
+  /// @dev Reverts with the selector of a custom error in the scratch space
+  function revertWith(bytes4 selector) internal pure {
+    assembly ("memory-safe") {
+      mstore(0, selector)
+      revert(0, 0x04)
+    }
+  }
+
+  /// @dev Reverts with a custom error with a uint256 argument in the scratch space
+  function revertWith(bytes4 selector, uint256 value) internal pure {
+    assembly ("memory-safe") {
+      mstore(0, selector)
+      mstore(0x04, value)
+      revert(0, 0x24)
+    }
+  }
+
+  /// @dev Reverts with a custom error with an address argument in the scratch space
+  function revertWith(bytes4 selector, address addr) internal pure {
+    assembly ("memory-safe") {
+      mstore(0, selector)
+      mstore(0x04, and(addr, 0xffffffffffffffffffffffffffffffffffffffff))
+      revert(0, 0x24)
+    }
+  }
+}

lerna.json

@@ -1,6 +1,6 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packages": ["packages/*", "protocol"],
     "npmClient": "yarn"
 }

packages/dlog/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/dlog",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/encryption",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/eslint-config",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "license": "MIT",
     "main": "typescript.js"
 }

packages/generated/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/generated",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "scripts": {
         "preinstall": "node ./scripts/make-config.js",

packages/prettier-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/prettier-config",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "license": "MIT",
     "main": "config.js",
     "peerDependencies": {

packages/proto/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/proto",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

packages/react-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/react-sdk",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "description": "React Hooks for River SDK",
     "repository": {
         "type": "git",

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/sdk",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

packages/sdk/src/sync-agent/spaces/models/channel.ts

@@ -1,6 +1,6 @@
 import { PlainMessage } from '@bufbuild/protobuf'
 import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable'
-import { Identifiable, Store } from '../../../store/store'
+import { Identifiable, LoadPriority, Store } from '../../../store/store'
 import { RiverConnection } from '../../river-connection/riverConnection'
 import { ChannelMessage_Post_Attachment, ChannelMessage_Post_Mention } from '@river-build/proto'
 import { Timeline } from '../../timeline/timeline'
@@ -29,7 +29,7 @@ export class Channel extends PersistedObservable<ChannelModel> {
         private spaceDapp: SpaceDapp,
         store: Store,
     ) {
-        super({ id, spaceId, isJoined: false }, store)
+        super({ id, spaceId, isJoined: false }, store, LoadPriority.high)
         this.timeline = new Timeline(riverConnection.userId)
         this.members = new Members(id, riverConnection, store)
     }

packages/sdk/src/sync-agent/spaces/models/space.ts

@@ -1,8 +1,12 @@
 import { check, dlogger } from '@river-build/dlog'
 import { isDefined } from '../../../check'
-import { makeDefaultChannelStreamId, makeUniqueChannelStreamId } from '../../../id'
+import {
+    isChannelStreamId,
+    makeDefaultChannelStreamId,
+    makeUniqueChannelStreamId,
+} from '../../../id'
 import { PersistedObservable, persistedObservable } from '../../../observable/persistedObservable'
-import { Identifiable, Store } from '../../../store/store'
+import { Identifiable, LoadPriority, Store } from '../../../store/store'
 import { RiverConnection } from '../../river-connection/riverConnection'
 import { Channel } from './channel'
 import { ethers } from 'ethers'
@@ -28,7 +32,7 @@ export class Space extends PersistedObservable<SpaceModel> {
         store: Store,
         private spaceDapp: SpaceDapp,
     ) {
-        super({ id, channelIds: [], initialized: false }, store)
+        super({ id, channelIds: [], initialized: false }, store, LoadPriority.high)
         this.channels = {
             [makeDefaultChannelStreamId(id)]: new Channel(
                 makeDefaultChannelStreamId(id),
@@ -111,6 +115,7 @@ export class Space extends PersistedObservable<SpaceModel> {
     }
 
     getChannel(channelId: string): Channel {
+        check(isChannelStreamId(channelId), 'channelId is not a channel stream id')
         if (!this.channels[channelId]) {
             this.channels[channelId] = new Channel(
                 channelId,

packages/stream-metadata/src/environment.ts

@@ -1,6 +1,7 @@
 import * as dotenv from 'dotenv'
 import { getWeb3Deployment } from '@river-build/web3'
 import { z } from 'zod'
+import { v4 } from 'uuid'
 
 dotenv.config({
 	path: ['.env', '.env.local'],
@@ -52,6 +53,10 @@ function makeConfig() {
 			pretty: envMain.LOG_PRETTY,
 		},
 		aws: envAws?.success ? envAws.data : undefined,
+		instance: {
+			id: v4(),
+			deployedAt: new Date().toISOString(),
+		},
 	}
 }
 

packages/stream-metadata/src/logger.ts

@@ -18,5 +18,5 @@ const pinoOptions: LoggerOptions = {
 const baseLogger = pino(pinoOptions)
 
 export function getLogger(name: string, meta: Record<string, unknown> = {}) {
-	return baseLogger.child({ name, ...meta })
+	return baseLogger.child({ name, instance: config.instance, ...meta })
 }

packages/stream-metadata/src/opensea.ts

@@ -5,16 +5,20 @@ import { FastifyBaseLogger } from 'fastify'
 import { config } from './environment'
 import { spaceDapp } from './contract-utils'
 
-const getOpenSeaAPIUrl = (space: SpaceInfo) => {
+const getOpenSeaAPIUrl = (logger: FastifyBaseLogger, space: SpaceInfo) => {
 	const spaceOwnerAddress = config.web3Config.base.addresses.spaceOwner
+	const chainId = config.web3Config.base.chainId
 	const tokenId = BigNumber.from(space.tokenId).toString()
 
-	if (space.networkId === String(BASE_MAINNET)) {
+	if (chainId === BASE_MAINNET) {
 		return `https://api.opensea.io/api/v2/chain/base/contract/${spaceOwnerAddress}/nfts/${tokenId}/refresh`
-	} else if (space.networkId === String(BASE_SEPOLIA)) {
+	} else if (chainId === BASE_SEPOLIA) {
+		return `https://testnets-api.opensea.io/api/v2/chain/base_sepolia/contract/${spaceOwnerAddress}/nfts/${tokenId}/refresh`
+	} else if (chainId === 31337) {
 		return `https://testnets-api.opensea.io/api/v2/chain/base_sepolia/contract/${spaceOwnerAddress}/nfts/${tokenId}/refresh`
 	} else {
-		throw new Error('Unsupported network')
+		logger.error({ chainId }, 'Unsupported network')
+		throw new Error(`Unsupported network ${chainId}`)
 	}
 }
 
@@ -40,7 +44,7 @@ export const refreshOpenSea = async ({
 		throw new Error('Space not found')
 	}
 
-	const url = getOpenSeaAPIUrl(space)
+	const url = getOpenSeaAPIUrl(logger, space)
 	logger.info({ url, spaceAddress }, 'refreshing openSea')
 
 	const response = await fetch(url, {

packages/web3/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/web3",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@river-build/proto-source",
-    "version": "0.0.59",
+    "version": "0.0.61",
     "packageManager": "[email protected]",
     "files": [
         "*.proto"