Skip to content

Commit d7e5b7e

Browse files
authored
Merge pull request #1059 from WalletConnect/feature/foundation/add_published_at
added publishedAt and tag to Relay subscription models
2 parents 9998d3f + 590c9a9 commit d7e5b7e

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/HistoryMessage.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ data class HistoryMessage(
1616
) {
1717
fun toRelay() = Relay.Model.Call.Subscription.Request(
1818
id = 0L, // id is only used for ack the relay, any value is meaningless
19-
params = Relay.Model.Call.Subscription.Request.Params(messageId, Relay.Model.Call.Subscription.Request.Params.SubscriptionData(topic, message))
19+
params = Relay.Model.Call.Subscription.Request.Params(
20+
subscriptionId = messageId,
21+
subscriptionData = Relay.Model.Call.Subscription.Request.Params.SubscriptionData(
22+
topic = topic,
23+
message = message,
24+
publishedAt = 0L, // publishedAt is only used for ack the relay, any value is meaningless
25+
tag = 0 // tag is only used for ack the relay, any value is meaningless
26+
)
27+
)
2028
)
2129
}

foundation/src/main/kotlin/com/walletconnect/foundation/common/RelayMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal fun ShutdownReason.toRelay() =
3434

3535
@JvmSynthetic
3636
internal fun RelayDTO.Subscription.Request.Params.SubscriptionData.toRelay() =
37-
Relay.Model.Call.Subscription.Request.Params.SubscriptionData(topic.value, message)
37+
Relay.Model.Call.Subscription.Request.Params.SubscriptionData(topic.value, message, publishedAt, tag)
3838

3939
@JvmSynthetic
4040
internal fun RelayDTO.Subscription.Request.Params.toRelay() =

foundation/src/main/kotlin/com/walletconnect/foundation/network/model/Relay.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ object Relay {
110110
data class SubscriptionData(
111111
val topic: String,
112112
val message: String,
113+
val publishedAt: Long,
114+
val tag: Int
113115
)
114116
}
115117
}

foundation/src/main/kotlin/com/walletconnect/foundation/network/model/RelayDTO.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ sealed class RelayDTO {
191191
val topic: Topic,
192192
@Json(name = "message")
193193
val message: String, //ack, jsonrpc error, eth_sign
194+
@Json(name = "publishedAt")
195+
val publishedAt: Long,
196+
@Json(name = "tag")
197+
val tag: Int,
194198
)
195199
}
196200
}

0 commit comments

Comments
 (0)