Merge branch 'main' into g/10-06-membership_small_refactors

giuseppecrj · web-flow · commit 57d042bf8a86 · 2025-10-07T09:27:46.000-07:00
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packages": ["packages/*", "protocol"],
     "npmClient": "yarn",
     "command": {
diff --git a/packages/bot/package.json b/packages/bot/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/bot",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.363",
+  "version": "0.0.364",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build-types": "bash scripts/build-contract-types.sh",
diff --git a/packages/create-towns-protocol-app/package.json b/packages/create-towns-protocol-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-towns-protocol-app",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "scripts": {
         "build": "tsup",
         "watch": "tsup --watch"
diff --git a/packages/encryption/package.json b/packages/encryption/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/encryption",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/eslint-config",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "license": "MIT",
     "main": "typescript.js",
     "publishConfig": {
diff --git a/packages/generated/package.json b/packages/generated/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/generated",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "scripts": {
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/prettier-config",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "license": "MIT",
     "main": "config.js",
     "dependencies": {
diff --git a/packages/proto/package.json b/packages/proto/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/proto",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@towns-protocol/react-sdk",
     "description": "React Hooks for Towns Protocol SDK",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "type": "module",
     "main": "./dist/esm/index.js",
     "types": "./dist/types/index.d.ts",
diff --git a/packages/rpc-connector/package.json b/packages/rpc-connector/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/rpc-connector",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "./dist/node/index.cjs",
diff --git a/packages/sdk-crypto/package.json b/packages/sdk-crypto/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/sdk-crypto",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "./dist/web/index.cjs",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/sdk",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/sdk/src/streamStateView_Members.ts b/packages/sdk/src/streamStateView_Members.ts
@@ -335,6 +335,9 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
             case 'keySolicitation':
                 {
                     const stateMember = this.joined.get(event.creatorUserId)
+                    if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                        break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                    }
                     check(isDefined(stateMember), 'key solicitation from non-member')
                     this.solicitHelper.applySolicitation(
                         stateMember,
@@ -349,6 +352,9 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
                 {
                     const userId = userIdFromAddress(payload.content.value.userAddress)
                     const stateMember = this.joined.get(userId)
+                    if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                        break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                    }
                     check(isDefined(stateMember), 'key fulfillment from non-member')
                     this.solicitHelper.applyFulfillment(
                         stateMember,
@@ -360,6 +366,9 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
             case 'displayName':
                 {
                     const stateMember = this.joined.get(event.creatorUserId)
+                    if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                        break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                    }
                     check(isDefined(stateMember), 'displayName from non-member')
                     stateMember.encryptedDisplayName = create(WrappedEncryptedDataSchema, {
                         data: payload.content.value,
@@ -377,6 +386,9 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
             case 'username':
                 {
                     const stateMember = this.joined.get(event.creatorUserId)
+                    if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                        break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                    }
                     check(isDefined(stateMember), 'username from non-member')
                     stateMember.encryptedUsername = create(WrappedEncryptedDataSchema, {
                         data: payload.content.value,
@@ -393,7 +405,10 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
                 break
             case 'ensAddress': {
                 const stateMember = this.joined.get(event.creatorUserId)
-                check(isDefined(stateMember), 'username from non-member')
+                if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                    break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                }
+                check(isDefined(stateMember), 'ensAddress from non-member')
                 this.memberMetadata.appendEnsAddress(
                     event.hashStr,
                     payload.content.value,
@@ -404,6 +419,9 @@ export class StreamStateView_Members extends StreamStateView_AbstractContent {
             }
             case 'nft': {
                 const stateMember = this.joined.get(event.creatorUserId)
+                if (!isDefined(stateMember) && event.createdAtEpochMs < 1748736000000n) {
+                    break // bug fixed in https://github.com/towns-protocol/towns/pull/3150
+                }
                 check(isDefined(stateMember), 'nft from non-member')
                 this.memberMetadata.appendNft(
                     event.hashStr,
diff --git a/packages/towns-bot-cli/package.json b/packages/towns-bot-cli/package.json
@@ -1,7 +1,7 @@
 {
     "name": "towns-bot",
     "description": "CLI for creating and managing Towns Protocol bot projects",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "author": "Towns Protocol",
     "scripts": {
         "build": "tsup",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/utils",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/web3/package.json b/packages/web3/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/web3",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",
diff --git a/packages/xchain-monitor/package.json b/packages/xchain-monitor/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/xchain-monitor",
-    "version": "0.0.363",
+    "version": "0.0.364",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "main": "dist/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packages": ["packages/*", "protocol"],`
`5`	`5`	`"npmClient": "yarn",`
`6`	`6`	`"command": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/bot",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packageManager": "[email protected]",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/contracts",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packageManager": "[email protected]",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build-types": "bash scripts/build-contract-types.sh",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-towns-protocol-app",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"build": "tsup",`
`6`	`6`	`"watch": "tsup --watch"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/encryption",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packageManager": "[email protected]",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/eslint-config",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"main": "typescript.js",`
`6`	`6`	`"publishConfig": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/generated",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packageManager": "[email protected]",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/prettier-config",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"main": "config.js",`
`6`	`6`	`"dependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/proto",`
`3`		`- "version": "0.0.363",`
	`3`	`+ "version": "0.0.364",`
`4`	`4`	`"packageManager": "[email protected]",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@towns-protocol/react-sdk",`
`3`	`3`	`"description": "React Hooks for Towns Protocol SDK",`
`4`		`- "version": "0.0.363",`
	`4`	`+ "version": "0.0.364",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "./dist/esm/index.js",`
`7`	`7`	`"types": "./dist/types/index.d.ts",`