Pulled changes from main

Pulled main
Handled conflicts mostly in test files and lock files

android/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"
-  implementation "org.xmtp:android:0.8.0"
+  implementation "org.xmtp:android:0.8.4"
   // xmtp-android local testing setup below (comment org.xmtp:android above)
   // implementation files('<PATH TO XMTP-ANDROID>/xmtp-android/library/build/outputs/aar/library-debug.aar')
   // implementation 'com.google.crypto.tink:tink-android:1.7.0'

android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt

@@ -337,6 +337,14 @@ class XMTPModule : Module() {
             Base64.encodeToString(conversation.toTopicData().toByteArray(), NO_WRAP)
         }
 
+        AsyncFunction("getHmacKeys") { clientAddress: String ->
+            logV("getHmacKeys")
+            val client = clients[clientAddress] ?: throw XMTPException("No client")
+            val hmacKeys = client.conversations.getHmacKeys()
+            logV("$hmacKeys")
+            hmacKeys.toByteArray().map { it.toInt() and 0xFF }
+        }
+
         // Import a conversation from its serialized topic data.
         AsyncFunction("importConversationTopicData") { clientAddress: String, topicData: String ->
             logV("importConversationTopicData")

example/App.tsx

@@ -7,6 +7,8 @@ import {
 } from '@thirdweb-dev/react-native'
 import { Button, Platform } from 'react-native'
 import Config from 'react-native-config'
+// Used to polyfill webCrypto in react-native
+import PolyfillCrypto from 'react-native-webview-crypto'
 import { QueryClient, QueryClientProvider } from 'react-query'
 import { XmtpProvider } from 'xmtp-react-native-sdk'
 
@@ -37,6 +39,7 @@ export default function App() {
       }}
       supportedWallets={[metamaskWallet(), rainbowWallet()]}
     >
+      <PolyfillCrypto />
       <QueryClientProvider client={queryClient}>
         <XmtpProvider>
           <NavigationContainer>

example/EXAMPLE.env

@@ -1 +1,2 @@
+TEST_PRIVATE_KEY=INSERT_TEST_PRIVATE_KEY_HERE
 THIRD_WEB_CLIENT_ID=INSERT_CLIENT_ID_HERE

example/ios/Podfile.lock

@@ -56,7 +56,7 @@ PODS:
     - hermes-engine/Pre-built (= 0.71.14)
   - hermes-engine/Pre-built (0.71.14)
   - libevent (2.1.12)
-  - LibXMTP (0.4.2-beta5)
+  - LibXMTP (0.4.3-beta2)
   - Logging (1.0.0)
   - MessagePacker (0.4.7)
   - MMKV (1.3.3):
@@ -346,6 +346,9 @@ PODS:
     - ReactCommon/turbomodule/core
   - react-native-sqlite-storage (6.0.1):
     - React-Core
+  - react-native-webview (13.8.1):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core
   - React-perflogger (0.71.14)
   - React-RCTActionSheet (0.71.14):
     - React-Core/RCTActionSheetHeaders (= 0.71.14)
@@ -446,16 +449,16 @@ PODS:
     - GenericJSON (~> 2.0)
     - Logging (~> 1.0.0)
     - secp256k1.swift (~> 0.1)
-  - XMTP (0.8.15):
+  - XMTP (0.9.1):
     - Connect-Swift (= 0.3.0)
     - GzipSwift
-    - LibXMTP (= 0.4.2-beta5)
+    - LibXMTP (= 0.4.3-beta2)
     - web3.swift
   - XMTPReactNative (0.1.0):
     - ExpoModulesCore
     - MessagePacker
     - secp256k1.swift
-    - XMTP (= 0.8.15)
+    - XMTP (= 0.9.1)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -507,6 +510,7 @@ DEPENDENCIES:
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-sqlite-storage (from `../node_modules/react-native-sqlite-storage`)
+  - react-native-webview (from `../node_modules/react-native-webview`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -638,6 +642,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-sqlite-storage:
     :path: "../node_modules/react-native-sqlite-storage"
+  react-native-webview:
+    :path: "../node_modules/react-native-webview"
   React-perflogger:
     :path: "../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
@@ -705,7 +711,7 @@ SPEC CHECKSUMS:
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
   hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  LibXMTP: 3cbd1d0dd44ae3648f571a0e81bbe73565759e67
+  LibXMTP: ef1e7d04de6b7f0cb88f7678be44bb6329263f6c
   Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
   MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
   MMKV: f902fb6719da13c2ab0965233d8963a59416f911
@@ -736,6 +742,7 @@ SPEC CHECKSUMS:
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
+  react-native-webview: bdc091de8cf7f8397653e30182efcd9f772e03b3
   React-perflogger: 4987ad83731c23d11813c84263963b0d3028c966
   React-RCTActionSheet: 5ad952b2a9740d87a5bd77280c4bc23f6f89ea0c
   React-RCTAnimation: d2de22af3f536cc80bb5b3918e1a455114d1b985
@@ -756,10 +763,10 @@ SPEC CHECKSUMS:
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
   SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
-  XMTP: 00fe090825e6bc5991870c1925befc06b1a30b78
-  XMTPReactNative: c452a9190442c7cbc0a4c0676cfc598761d463d2
+  XMTP: 1d6bbf66833dc71763de3345f63801dbc6c6de27
+  XMTPReactNative: 28a3ff58d411efe05cf6ee4429b315e5e3bd169a
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
 
 PODFILE CHECKSUM: 95d6ace79946933ecf80684613842ee553dd76a2
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3

example/package.json

@@ -42,9 +42,12 @@
     "react-native-sqlite-storage": "^6.0.1",
     "react-native-svg": "^13.9.0",
     "react-native-url-polyfill": "^2.0.0",
+    "react-native-webview": "^13.8.1",
+    "react-native-webview-crypto": "^0.0.25",
     "react-query": "^3.39.3",
     "stream-browserify": "^3.0.0",
-    "text-encoding": "^0.7.0"
+    "text-encoding": "^0.7.0",
+    "viem": "^2.7.22"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",