main => beta

.github/workflows/buf.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: bufbuild/buf-setup-action@v1
         with:
           github_token: ${{ github.token }}
-          buf_token: ${{ secrets.BUF_TOKEN }}
+          buf_api_token: ${{ secrets.BUF_TOKEN }}
       # Push only the Input in `proto` to the BSR
       - uses: bufbuild/buf-push-action@v1
         with:

.github/workflows/release.yml

@@ -24,7 +24,47 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm run semantic-release
+  dart:
+    # The `semantic-release` from JS calculates the version tag
+    needs: js
+    if: ${{ github.ref_name == 'main' }}
+    name: Release (dart)
+    # https://dart.dev/tools/pub/automated-publishing
+    permissions:
+      id-token: write # This is required for requesting the JWT
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+      - run: dart pub get
+        working-directory: ./dart
+      - run: dev/dart/generate
+      - run: dart test
+        working-directory: ./dart
+      - name: Set Tag
+        run: |
+          TAG=`echo $(git describe --tags --abbrev=0)`
+          echo "GIT_TAG=${TAG#v}" >> $GITHUB_ENV
+      - run: dev/dart/prepublish
+        env:
+          RELEASE_VERSION: ${{ env.GIT_TAG }}
+      - name: Verify pubspec
+        run: cat ./dart/pubspec.yaml
+#      - run: dart pub publish --force
+#        working-directory: ./dart
+        # We can't actually publish to pub.dev from this workflow.
+        #  pub.dev requires the action be triggered by a "tag" (not "branch") push.
+        #  See https://github.com/dart-lang/pub-dev/blob/master/app/lib/package/backend.dart#L1255
+        # Manual Workaround: (after this workflow completes on a clean checkout)
+        #  $ dev/dart/generate
+        #  $ RELEASE_VERSION=#.#.# dev/dart/prepublish
+        #  $ dart pub publish --force
+        # TODO: find safer way to automate
   kotlin:
+    # The `semantic-release` from JS calculates the version tag
+    needs: js
     if: ${{ github.ref_name == 'main' }}
     name: Release (Kotlin)
     runs-on: ubuntu-latest

.protolint.yaml

@@ -37,6 +37,7 @@ lint:
 
     # # The specific linters to remove.
     remove:
+      - RPC_REQUEST_RESPONSE_UNIQUE
       # We should probably turn this back on at some point, but pretty annoying RN
       - FIELDS_HAVE_COMMENT
       # I never want to turn this back on. Enums values should be self-explanatory
@@ -49,7 +50,7 @@ lint:
     # MAX_LINE_LENGTH rule option.
     max_line_length:
       # Enforces a maximum line length
-      max_chars: 80
+      max_chars: 150
       # Specifies the character count for tab characters
       tab_chars: 2
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 XMTP
+Copyright (c) 2023 XMTP (xmtp.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

dart/lib/xmtp_proto.dart

@@ -4,11 +4,14 @@ export 'src/keystore_api/v1/keystore.pb.dart';
 export 'src/message_api/v1/message_api.pbgrpc.dart';
 export 'src/message_api/v1/authn.pb.dart';
 export 'src/message_contents/message.pb.dart';
+export 'src/message_contents/private_preferences.pb.dart';
 export 'src/message_contents/content.pb.dart';
 export 'src/message_contents/composite.pb.dart';
 export 'src/message_contents/private_key.pb.dart';
 export 'src/message_contents/public_key.pb.dart';
 export 'src/message_contents/signature.pb.dart';
+export 'src/message_contents/signed_payload.pb.dart';
 export 'src/message_contents/ciphertext.pb.dart';
+export 'src/message_contents/ecies.pb.dart';
 export 'src/message_contents/contact.pb.dart';
 export 'src/message_contents/invitation.pb.dart';

dev/dart/generate

@@ -30,4 +30,7 @@ docker run --rm -i -v${PWD}:/code xmtp-dart/protoc \
   message_contents/invitation.proto \
   message_contents/private_key.proto \
   message_contents/message.proto \
-  message_contents/content.proto
+  message_contents/content.proto \
+  message_contents/private_preferences.proto \
+  message_contents/signed_payload.proto \
+  message_contents/ecies.proto

dev/dart/prepublish

@@ -15,4 +15,4 @@ cp ./LICENSE ./dart/LICENSE
 
 # Update pubspec.yaml version to use tagged version
 # See https://dart.dev/tools/pub/automated-publishing#triggering-automated-publishing-from-github-actions
-sed -i "s/version: 0.0.0/version: $RELEASE_VERSION/" ./dart/pubspec.yaml
+sed -i'' "s/version: 0.0.0/version: $RELEASE_VERSION/" ./dart/pubspec.yaml

dev/kotlin/generate

@@ -37,4 +37,7 @@ docker run --platform linux/x86_64 --rm -i -v${PWD}:/code xmtp/protoc-kotlin \
   message_contents/invitation.proto \
   message_contents/private_key.proto \
   message_contents/message.proto \
-  message_contents/content.proto
+  message_contents/content.proto \
+  message_contents/private_preferences.proto \
+  message_contents/signed_payload.proto \
+  message_contents/ecies.proto

dev/swift/generate

@@ -32,4 +32,7 @@ docker run --rm -i -v${PWD}:/code xmtp/protoc-swift \
   message_contents/invitation.proto \
   message_contents/private_key.proto \
   message_contents/message.proto \
-  message_contents/content.proto
+  message_contents/content.proto \
+  message_contents/private_preferences.proto \
+  message_contents/signed_payload.proto \
+  message_contents/ecies.proto

dev/ts/generate

@@ -32,4 +32,7 @@ docker run --rm -i -v${PWD}:/code xmtp/protoc \
   message_contents/private_key.proto \
   message_contents/content.proto \
   message_contents/message.proto \
-  keystore_api/v1/keystore.proto
+  keystore_api/v1/keystore.proto \
+  message_contents/private_preferences.proto \
+  message_contents/signed_payload.proto \
+  message_contents/ecies.proto

go/generate.go

@@ -16,6 +16,9 @@ import (
 
 //go:generate compile ../proto/keystore_api/v1/keystore.proto
 //go:generate compile ../proto/message_api/v1/message_api.proto
+//go:generate compile ../proto/mls/api/v1/mls.proto
+//go:generate compile ../proto/mls_validation/v1/service.proto
+//go:generate compile ../proto/mls/message_contents/message.proto
 //go:generate compile ../proto/message_api/v1/authn.proto
 //go:generate compile ../proto/message_contents/content.proto
 //go:generate compile ../proto/message_contents/conversation_reference.proto