${TAG}"$'\n'"🔗 查看 Release"
+
+ # 发送 Telegram 消息（使用 jq 转义 JSON）
+ curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" \
+ -H "Content-Type: application/json" \
+ -d "$(jq -n \
+ --arg chat_id "$TELEGRAM_CHAT_ID" \
+ --arg text "$MESSAGE" \
+ '{chat_id: $chat_id, text: $text, parse_mode: "HTML", disable_web_page_preview: false}')" > /tmp/telegram_response.json
+
+ # 检查发送结果
+ if [ $? -eq 0 ]; then
+ RESPONSE=$(cat /tmp/telegram_response.json)
+ if echo "$RESPONSE" | grep -q '"ok":true'; then
+ echo "✅ Telegram 通知发送成功"
+ else
+ echo "❌ Telegram 通知发送失败: $RESPONSE"
+ # 通知失败不应该导致整个 job 失败
+ exit 0
+ fi
+ else
+ echo "❌ 发送 Telegram 消息时发生错误"
+ # 通知失败不应该导致整个 job 失败
+ exit 0
+ fi
+
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
@@ -65,3 +108,49 @@ jobs:
GITHUB_REPO_URL=https://github.com/WrBug/PolyHermes
cache-from: type=registry,ref=wrbug/polyhermes:latest
cache-to: type=inline
+
+ - name: Send Telegram notification
+ env:
+ TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+ TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+ run: |
+ # 检查必要的环境变量
+ if [ -z "$TELEGRAM_BOT_TOKEN" ] || [ -z "$TELEGRAM_CHAT_ID" ]; then
+ echo "⚠️ Telegram Bot Token 或 Chat ID 未配置，跳过通知"
+ exit 0
+ fi
+
+ # 获取构建信息
+ VERSION="${{ steps.extract_version.outputs.VERSION }}"
+ TAG="${{ steps.extract_version.outputs.TAG }}"
+ RELEASE_NAME="${{ github.event.release.name }}"
+ RELEASE_URL="${{ github.event.release.html_url }}"
+ REPO_NAME="${{ github.repository }}"
+
+ # 构建消息内容（仅包含关键信息）
+ DEPLOY_DOC_URL="https://github.com/WrBug/PolyHermes/blob/main/docs/zh/DEPLOYMENT.md"
+ MESSAGE="✅ Docker 镜像构建成功"$'\n'$'\n'"📦 版本: ${VERSION}"$'\n'"🏷️ Tag: ${TAG}"$'\n'"🔗 查看 Release"$'\n'"📚 Docker 部署文档"
+
+ # 发送 Telegram 消息（使用 jq 转义 JSON）
+ curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" \
+ -H "Content-Type: application/json" \
+ -d "$(jq -n \
+ --arg chat_id "$TELEGRAM_CHAT_ID" \
+ --arg text "$MESSAGE" \
+ '{chat_id: $chat_id, text: $text, parse_mode: "HTML", disable_web_page_preview: false}')" > /tmp/telegram_response.json
+
+ # 检查发送结果
+ if [ $? -eq 0 ]; then
+ RESPONSE=$(cat /tmp/telegram_response.json)
+ if echo "$RESPONSE" | grep -q '"ok":true'; then
+ echo "✅ Telegram 通知发送成功"
+ else
+ echo "❌ Telegram 通知发送失败: $RESPONSE"
+ # 构建成功，通知失败不应该导致整个 job 失败
+ exit 0
+ fi
+ else
+ echo "❌ 发送 Telegram 消息时发生错误"
+ # 构建成功，通知失败不应该导致整个 job 失败
+ exit 0
+ fi
\ No newline at end of file
diff --git a/.github/workflows/telegram-notify.yml b/.github/workflows/telegram-notify.yml
new file mode 100644
index 0000000..7ae205c
--- /dev/null
+++ b/.github/workflows/telegram-notify.yml
@@ -0,0 +1,103 @@
+name: Telegram Notification on PR Merge
+
+on:
+ pull_request:
+ types:
+ - closed # 当 PR 被关闭（合并或关闭）时触发
+
+jobs:
+ notify:
+ runs-on: ubuntu-latest
+
+ # 只在 PR 被合并到 main 分支时执行
+ if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+
+ - name: Get PR details
+ id: pr_details
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ PR_NUMBER="${{ github.event.pull_request.number }}"
+ REPO="${{ github.repository }}"
+
+ # 获取 PR 详细信息
+ PR_RESPONSE=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
+ -H "Accept: application/vnd.github.v3+json" \
+ "https://api.github.com/repos/${REPO}/pulls/${PR_NUMBER}")
+
+ # 获取 PR 变更的文件列表
+ FILES_RESPONSE=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
+ -H "Accept: application/vnd.github.v3+json" \
+ "https://api.github.com/repos/${REPO}/pulls/${PR_NUMBER}/files")
+
+ # 提取 PR 描述（body），保留换行，限制长度
+ PR_BODY=$(echo "$PR_RESPONSE" | jq -r '.body // ""')
+ if [ ${#PR_BODY} -gt 500 ]; then
+ PR_BODY="${PR_BODY:0:500}..."
+ fi
+
+ # 保存到输出变量（使用 base64 编码避免特殊字符问题）
+ echo "pr_body<$price
-• $quantityLabel: $size shares
+• $priceLabel: $priceDisplay
+• $quantityLabel: $sizeDisplay shares
• $amountLabel: $amountDisplay USDC
• $accountLabel: $escapedAccountInfo
@@ -570,6 +581,68 @@ class TelegramNotificationService(
}
}
+ /**
+ * 格式化价格显示（保留最多4位小数，截断不四舍五入）
+ */
+ private fun formatPrice(price: String): String {
+ return try {
+ val priceDecimal = price.toSafeBigDecimal()
+ val formatted = if (priceDecimal.scale() > 4) {
+ priceDecimal.setScale(4, java.math.RoundingMode.DOWN).stripTrailingZeros()
+ } else {
+ priceDecimal.stripTrailingZeros()
+ }
+ formatted.toPlainString()
+ } catch (e: Exception) {
+ price
+ }
+ }
+
+ /**
+ * 格式化数量显示（保留最多2位小数，截断不四舍五入）
+ */
+ private fun formatQuantity(quantity: String): String {
+ return try {
+ val quantityDecimal = quantity.toSafeBigDecimal()
+ val formatted = if (quantityDecimal.scale() > 2) {
+ quantityDecimal.setScale(2, java.math.RoundingMode.DOWN).stripTrailingZeros()
+ } else {
+ quantityDecimal.stripTrailingZeros()
+ }
+ formatted.toPlainString()
+ } catch (e: Exception) {
+ quantity
+ }
+ }
+
+ /**
+ * 构建账户信息显示（格式：账户名(钱包地址)）
+ */
+ private fun buildAccountInfo(
+ accountName: String?,
+ walletAddress: String?,
+ unknownAccount: String
+ ): String {
+ return when {
+ !accountName.isNullOrBlank() && !walletAddress.isNullOrBlank() -> {
+ // 有账户名和钱包地址：账户名(钱包地址)
+ "${accountName}(${maskAddress(walletAddress)})"
+ }
+ !accountName.isNullOrBlank() -> {
+ // 只有账户名
+ accountName
+ }
+ !walletAddress.isNullOrBlank() -> {
+ // 只有钱包地址
+ maskAddress(walletAddress)
+ }
+ else -> {
+ // 都没有
+ unknownAccount
+ }
+ }
+ }
+
/**
* 构建订单成功消息
*/
@@ -613,18 +686,8 @@ class TelegramNotificationService(
else -> side
}
- // 优先使用账户名称，如果没有账户名称才显示钱包地址
- val accountInfo: String = when {
- !accountName.isNullOrBlank() -> {
- accountName!!
- }
- !walletAddress.isNullOrBlank() -> {
- maskAddress(walletAddress!!)
- }
- else -> {
- unknownAccount
- }
- }
+ // 构建账户信息（格式：账户名(钱包地址)）
+ val accountInfo = buildAccountInfo(accountName, walletAddress, unknownAccount)
// 构建跟单信息（如果有）
val copyTradingInfo = mutableListOf${orderId ?: unknown}
• $marketLabel: $marketDisplay$outcomeDisplay
• $sideLabel: $sideDisplay
-• $priceLabel: $price
-• $quantityLabel: $size shares
+• $priceLabel: $priceDisplay
+• $quantityLabel: $sizeDisplay shares
• $amountLabel: $amountDisplay USDC
• $accountLabel: $escapedAccountInfo$escapedCopyTradingInfo
@@ -748,18 +815,8 @@ class TelegramNotificationService(
else -> side
}
- // 优先使用账户名称，如果没有账户名称才显示钱包地址
- val accountInfo: String = when {
- !accountName.isNullOrBlank() -> {
- accountName!!
- }
- !walletAddress.isNullOrBlank() -> {
- maskAddress(walletAddress!!)
- }
- else -> {
- unknownAccount
- }
- }
+ // 构建账户信息（格式：账户名(钱包地址)）
+ val accountInfo = buildAccountInfo(accountName, walletAddress, unknownAccount)
val time = DateUtils.formatDateTime()
@@ -818,13 +875,17 @@ class TelegramNotificationService(
""
}
+ // 格式化价格和数量
+ val priceDisplay = formatPrice(price)
+ val sizeDisplay = formatQuantity(size)
+
return """❌ $orderCreatedFailed
📊 $orderInfo：
• $marketLabel: $marketDisplay$outcomeDisplay
• $sideLabel: $sideDisplay
-• $priceLabel: $price
-• $quantityLabel: $size shares
+• $priceLabel: $priceDisplay
+• $quantityLabel: $sizeDisplay shares
• $amountLabel: $amountDisplay USDC
• $accountLabel: $escapedAccountInfo
@@ -889,18 +950,8 @@ class TelegramNotificationService(
val timeLabel = messageSource.getMessage("notification.order.time", null, "时间", locale)
val unknownAccount: String = messageSource.getMessage("notification.order.unknown_account", null, "未知账户", locale) ?: "未知账户"
- // 优先使用账户名称，如果没有账户名称才显示钱包地址
- val accountInfo: String = when {
- !accountName.isNullOrBlank() -> {
- accountName!!
- }
- !walletAddress.isNullOrBlank() -> {
- maskAddress(walletAddress!!)
- }
- else -> {
- unknownAccount
- }
- }
+ // 构建账户信息（格式：账户名(钱包地址)）
+ val accountInfo = buildAccountInfo(accountName, walletAddress, unknownAccount)
val time = DateUtils.formatDateTime()
@@ -923,12 +974,7 @@ class TelegramNotificationService(
// 构建仓位列表
val positionsText = positions.joinToString("\n") { position ->
- val quantityDisplay = try {
- val quantityDecimal = position.quantity.toSafeBigDecimal()
- quantityDecimal.stripTrailingZeros().toPlainString()
- } catch (e: Exception) {
- position.quantity
- }
+ val quantityDisplay = formatQuantity(position.quantity)
val valueDisplay = try {
val valueDecimal = position.value.toSafeBigDecimal()
val formatted = if (valueDecimal.scale() > 4) {
diff --git a/backend/src/main/kotlin/com/wrbug/polymarketbot/util/EthereumUtils.kt b/backend/src/main/kotlin/com/wrbug/polymarketbot/util/EthereumUtils.kt
index 51f3d35..f4fc82d 100644
--- a/backend/src/main/kotlin/com/wrbug/polymarketbot/util/EthereumUtils.kt
+++ b/backend/src/main/kotlin/com/wrbug/polymarketbot/util/EthereumUtils.kt
@@ -19,7 +19,7 @@ object EthereumUtils {
* @return 函数选择器，例如 "0x12345678"
*/
fun getFunctionSelector(functionSignature: String): String {
- val hash = keccak256(functionSignature.toByteArray())
+ val hash = keccak256Hex(functionSignature.toByteArray())
return "0x" + hash.substring(0, 8)
}
@@ -77,16 +77,109 @@ object EthereumUtils {
return BigInteger(cleanHex, 16)
}
+ /**
+ * 从 ABI 编码的响应中解析 uint256 数组
+ * ABI 编码格式：
+ * - offset (32 bytes): 数组数据的位置偏移量
+ * - length (32 bytes): 数组长度
+ * - data: 每个元素 32 字节
+ * @param hexResult 十六进制结果（完整的 ABI 编码响应）
+ * @param offset 数组数据的偏移位置（字节数，从 offset 位置开始读取）
+ * @return BigInteger 数组
+ */
+ fun decodeUint256Array(hexResult: String, offset: Int = 0): List