Fix bad merge (#1600)

* Lock @xmtp/proto versions (#1552)

* release: version packages (#1553)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix remote attachment package version

---------

Co-authored-by: Benny Neugebauer <mail@bennycode.com>
Co-authored-by: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 4 people

content-types/content-type-group-updated/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @xmtp/content-type-group-updated
 
+## 2.0.3
+
+### Patch Changes
+
+- e3779a1: Locked `@xmtp/proto` versions
+
 ## 2.0.2
 
 ### Patch Changes

content-types/content-type-group-updated/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/content-type-group-updated",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "An XMTP content type to support group updated messages",
   "keywords": [
     "xmtp",
@@ -63,7 +63,7 @@
   },
   "dependencies": {
     "@xmtp/content-type-primitives": "^2.0.2",
-    "@xmtp/proto": "^3.78.0"
+    "@xmtp/proto": "3.78.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.4",

content-types/content-type-remote-attachment/CHANGELOG.md

@@ -1,11 +1,17 @@
 # @xmtp/content-type-remote-attachment
 
-## 2.0.3
+## 2.0.4
 
 ### Patch Changes
 
 - cf4337e: Added error handling for fetching remote attachments
 
+## 2.0.3
+
+### Patch Changes
+
+- e3779a1: Locked `@xmtp/proto` versions
+
 ## 2.0.2
 
 ### Patch Changes

content-types/content-type-remote-attachment/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/content-type-remote-attachment",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "An XMTP content type to support sending file attachments that are stored off network",
   "keywords": [
     "xmtp",
@@ -65,7 +65,7 @@
   "dependencies": {
     "@noble/secp256k1": "^2.2.3",
     "@xmtp/content-type-primitives": "^2.0.2",
-    "@xmtp/proto": "^3.78.0"
+    "@xmtp/proto": "3.78.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.4",

content-types/content-type-reply/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @xmtp/content-type-reply
 
+## 2.0.3
+
+### Patch Changes
+
+- e3779a1: Locked `@xmtp/proto` versions
+
 ## 2.0.2
 
 ### Patch Changes

content-types/content-type-reply/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/content-type-reply",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "An XMTP content type to support replying to a message",
   "keywords": [
     "xmtp",
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@xmtp/content-type-primitives": "^2.0.2",
-    "@xmtp/proto": "^3.78.0"
+    "@xmtp/proto": "3.78.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.4",

yarn.lock

@@ -4763,7 +4763,7 @@ __metadata:
     "@rollup/plugin-typescript": "npm:^12.3.0"
     "@types/node": "npm:^24.9.1"
     "@xmtp/content-type-primitives": "npm:^2.0.2"
-    "@xmtp/proto": "npm:^3.78.0"
+    "@xmtp/proto": "npm:3.78.0"
     rimraf: "npm:^6.0.1"
     rollup: "npm:^4.52.5"
     rollup-plugin-dts: "npm:^6.2.3"
@@ -4854,7 +4854,7 @@ __metadata:
     "@types/node": "npm:^24.9.1"
     "@xmtp/content-type-primitives": "npm:^2.0.2"
     "@xmtp/node-sdk": "workspace:^"
-    "@xmtp/proto": "npm:^3.78.0"
+    "@xmtp/proto": "npm:3.78.0"
     "@xmtp/rollup-plugin-resolve-extensions": "npm:^1.0.1"
     rimraf: "npm:^6.0.1"
     rollup: "npm:^4.52.5"
@@ -4876,7 +4876,7 @@ __metadata:
     "@xmtp/content-type-remote-attachment": "workspace:^"
     "@xmtp/content-type-text": "workspace:^"
     "@xmtp/node-sdk": "workspace:^"
-    "@xmtp/proto": "npm:^3.78.0"
+    "@xmtp/proto": "npm:3.78.0"
     rimraf: "npm:^6.0.1"
     rollup: "npm:^4.52.5"
     rollup-plugin-dts: "npm:^6.2.3"
@@ -5005,7 +5005,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@xmtp/proto@npm:^3.78.0":
+"@xmtp/proto@npm:3.78.0, @xmtp/proto@npm:^3.78.0":
   version: 3.78.0
   resolution: "@xmtp/proto@npm:3.78.0"
   dependencies: