Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulled changes from main #315

Merged
merged 39 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b0da0fb
chore: update @xmtp/proto
Feb 28, 2024
7807220
feat: add getHmacKeys to android module
Feb 28, 2024
a969580
feat: add getHmacKeys to iOS module
Feb 28, 2024
b77994d
feat: add getHmacKeys to the module
Feb 28, 2024
9773ade
chore: add react-native-webview and react-native-webview-crypto for t…
Feb 28, 2024
0d78691
feat: add HMAC generation and validation tests
Feb 28, 2024
29afa9d
fix: HMAC signature verification and remove unused code
Feb 28, 2024
732bd95
fix: refactor HMAC key verification in tests.ts
Feb 28, 2024
d9a7ebe
get test pass in iOS
Mar 1, 2024
ba8e071
bump XMTP version
Mar 6, 2024
e2d5a30
update tests
Mar 6, 2024
acd1eb1
update Podfile.lock
Mar 6, 2024
e8dc303
Remove Commented tests
Mar 7, 2024
8e6a763
Merge pull request #296 from xmtp/kele/get-hmac-keys-method
alexrisch Mar 7, 2024
9ca7489
Remove duplicate from merge
Mar 7, 2024
cf1ef77
fix: bump the pod spec
nplasterer Mar 7, 2024
e42c656
Merge pull request #298 from xmtp/ar/fix-imports-merge
nplasterer Mar 7, 2024
7f8544f
Merge pull request #299 from xmtp/np/bump-ios-pod-spec
nplasterer Mar 8, 2024
51dfa86
Bumped iOS Swift to revert lib xmtp changes
Mar 8, 2024
db0d787
Merge pull request #302 from xmtp/ar/bump-ios-0.8.17
alexrisch Mar 8, 2024
f836cb2
fix: Bump for semantic
Mar 8, 2024
676d227
Merge pull request #303 from xmtp/ar/bump-ios-0.8.17
alexrisch Mar 8, 2024
b37cd77
adds tests for listing conversations from env variable key
cameronvoell Mar 9, 2024
daaf833
remove blank line
cameronvoell Mar 9, 2024
a9979ca
label test correctly, add assertion
cameronvoell Mar 9, 2024
9d500a7
feat: fix the conversation list pagination in iOS
nplasterer Mar 11, 2024
3c4880d
add message streaming tests with delay
Mar 11, 2024
aced04a
Merge pull request #304 from xmtp/cv/test-list-2000-accounts
cameronvoell Mar 11, 2024
6f88512
refactor conversation streaming and add delay
Mar 11, 2024
d29ec6f
Merge branch 'main' of https://github.com/xmtp/xmtp-react-native into…
nplasterer Mar 11, 2024
1544ca9
fix: Fix HMAC export
Mar 11, 2024
3b97f58
Merge pull request #308 from xmtp/ar/hmac-fixes-hkdf
alexrisch Mar 11, 2024
3040421
bump android version
Mar 12, 2024
f7c3f55
Merge pull request #310 from xmtp/kele/bump-gradle
nplasterer Mar 12, 2024
36be6be
fix: streaming issues
nplasterer Mar 13, 2024
bffdad6
fix: make the test use dev
nplasterer Mar 13, 2024
7a4552d
make the test point at dev
nplasterer Mar 13, 2024
ae6d3c4
Merge pull request #307 from xmtp/kele/stream-tests
nplasterer Mar 13, 2024
47b2c86
Pulled changes from main
Mar 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions example/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -37,6 +39,7 @@ export default function App() {
}}
supportedWallets={[metamaskWallet(), rainbowWallet()]}
>
<PolyfillCrypto />
<QueryClientProvider client={queryClient}>
<XmtpProvider>
<NavigationContainer>
Expand Down
1 change: 1 addition & 0 deletions example/EXAMPLE.env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
TEST_PRIVATE_KEY=INSERT_TEST_PRIVATE_KEY_HERE
THIRD_WEB_CLIENT_ID=INSERT_CLIENT_ID_HERE
23 changes: 15 additions & 8 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -446,16 +449,16 @@ PODS:
- GenericJSON (~> 2.0)
- Logging (~> 1.0.0)
- secp256k1.swift (~> 0.1)
- XMTP (0.8.15):
- XMTP (0.9.1):
zombieobject marked this conversation as resolved.
Show resolved Hide resolved
- 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)
zombieobject marked this conversation as resolved.
Show resolved Hide resolved
- Yoga (1.14.0)

DEPENDENCIES:
Expand Down Expand Up @@ -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`)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -705,7 +711,7 @@ SPEC CHECKSUMS:
GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
LibXMTP: 3cbd1d0dd44ae3648f571a0e81bbe73565759e67
LibXMTP: ef1e7d04de6b7f0cb88f7678be44bb6329263f6c
Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
MMKV: f902fb6719da13c2ab0965233d8963a59416f911
Expand Down Expand Up @@ -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
Expand All @@ -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
5 changes: 4 additions & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading