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

feat: broadcast mode #1744

Merged
merged 27 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 70 additions & 6 deletions _raw/locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,33 @@
"importedDelegatedAddress": "Imported delegated address",
"noDelegatedAddress": "No imported delegated address",
"coboSafeNotPermission": "This delegate address does not have permission to initiate this transaction",
"BroadcastMode": {
"instant": {
"title": "Instant",
"desc": "Transactions will be immediately broadcast to the network"
},
"lowGas": {
"title": "Gas-saving",
"desc": "Transactions will be broadcast when network gas is low"
},
"mev": {
"title": "MEV Guarded",
"desc": "Transactions will be broadcast to the designated MEV node"
},
"title": "Broadcast Mode",
"tips": {
"walletConnect": "Not supported by WalletConnect",
"notSupportChain": "Not supported on this chain",
"customRPC": "Not supported when using custom RPC",
"notSupported": "Not supported"
},
"lowGasDeadline": {
"label": "Timeout",
"1h": "1h",
"4h": "4h",
"24h": "24h"
}
},
"SafeNonceSelector": {
"explain": {
"contractCall": "Contract Call",
Expand Down Expand Up @@ -229,7 +256,7 @@
"connecting": "Connecting...",
"ledgerNotConnected": "Ledger is not connected",
"ledgerConnected": "Ledger is connected",
"signAndSubmitButton": "Sign and Submit",
"signAndSubmitButton": "Sign and Create",
"walletConnect": {
"connectedButCantSign": "Connected but unable to sign.",
"switchToCorrectAddress": "Please switch to the correct address in mobile wallet",
Expand Down Expand Up @@ -263,9 +290,9 @@
"qrcode": {
"signWith": "Sign with {{brand}}",
"failedToGetExplain": "Failed to get explain",
"txFailed": "Fail to submit",
"txFailed": "Fail to created",
"sigReceived": "Signature received",
"sigCompleted": "Transaction submitted",
"sigCompleted": "Transaction created",
"getSig": "Get signature",
"qrcodeDesc": "Scan with your {{brand}} to sign<br></br>After signing, click the button below to receive the signature",
"misMatchSignId": "Incongruent transaction data. Please check the transaction details.",
Expand All @@ -282,7 +309,7 @@
"updateFirmwareAlert": "Please update the firmware and Ethereum App on your Ledger",
"txRejectedByLedger": "Transaction is rejected on your Ledger",
"blindSigTutorial": "Blind Signature Tutorial from Ledger",
"submitting": "Signed. Submitting transaction",
"submitting": "Signed. Creating transaction",
"resubmited": "Resubmited"
},
"common": {
Expand Down Expand Up @@ -358,13 +385,20 @@
},
"tips": {
"pendingDetail": "Only one transaction will be completed, and it is almost always the one with the highest gas price",
"canNotCancel": "Cannot speed up or cancel: Not the first pending txn"
"canNotCancel": "Cannot speed up or cancel: Not the first pending txn",
"pendingBroadcast": "Gas-saving mode: waiting for lower network fees. Max {{deadline}}h wait.",
"pendingBroadcastBtn": "Broadcast now",
"pendingBroadcastRetry": "Broadcast failed. Last attempt: {{pushAt}}",
"pendingBroadcastRetryBtn": "Re-broadcast"
},
"status": {
"canceled": "Canceled",
"failed": "Failed",
"submitFailed": "Failed to submit",
"pending": "Pending"
"pending": "Pending",
"withdrawed": "Quick cancel",
"pendingBroadcasted": "Pending: broadcasted",
"pendingBroadcast": "Pending: broadcast"
},
"txType": {
"initial": "Initial tx",
Expand All @@ -380,6 +414,36 @@
"cancelSingleNFTApproval": "Cancel Single NFT Approval for {{protocol}}",
"singleNFTApproval": "Single NFT Approval for {{protocol}}",
"nftCollectionApproval": "NFT Collection Approval for {{protocol}}"
},
"CancelTxPopup": {
"title": "Cancel transaction",
"options": {
"quickCancel": {
"title": "Quick Cancel",
"desc": "Cancel before broadcasting, no gas fee",
"tips": "Only supported for transactions that haven't broadcast"
},
"onChainCancel": {
"title": "On-chain Cancel",
"desc": "New transaction to cancel, requires gas"
}
}
},
"MempoolList": {
"empty": "Not found in any node",
"reBroadcastBtn": "Re-broadcast",
"title": "Found in the below memopools"
},
"message": {
"reBroadcastSuccess": "Re-broadcasted",
"broadcastSuccess": "Broadcasted",
"cancelSuccess": "Canceled"
},
"gas": {
"noCost": "No Gas cost"
},
"SkipNonceAlert": {
"alert": "Nonce #{{nonce}} skipped on {{chainName}} chain. This may cause pending transactions ahead. <5></5> <6>Submit a tx</6> <7></7> on chain to resolve"
}
},
"signedText": {
Expand Down
7 changes: 7 additions & 0 deletions _raw/locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,13 @@
"cancelSingleNFTApproval": "Cancelar Aprobación Individual de NFT para {{protocol}}",
"singleNFTApproval": "Aprobación Individual de NFT para {{protocol}}",
"nftCollectionApproval": "Aprobación de Colección de NFT para {{protocol}}"
},
"CancelTxPopup": {
"options": {
"quickCancel": {
"tips": "Only supported for transactions that haven't broadcast"
}
}
}
},
"signedText": {
Expand Down
61 changes: 59 additions & 2 deletions _raw/locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -627,16 +627,50 @@
"canceled": "已取消",
"failed": "交易失败",
"pending": "待完成",
"submitFailed": "提交失败"
"submitFailed": "提交失败",
"pendingBroadcast": "Pending: 等待广播",
"pendingBroadcasted": "Pending: 已广播",
"withdrawed": "已快捷取消"
},
"tips": {
"canNotCancel": "无法加速或取消:不是第一个待完成的交易",
"pendingDetail": "只会有一笔交易成功完成,而且一般是 Gas Price 最高的一笔交易将成功"
"pendingDetail": "只会有一笔交易成功完成,而且一般是 Gas Price 最高的一笔交易将成功",
"pendingBroadcastRetry": "广播失败,上次广播时间:{{pushAt}}",
"pendingBroadcastRetryBtn": "重新广播",
"pendingBroadcast": "已设置为省Gas广播模式,正在等链上Gas较低的时广播。最晚将在创建后{{deadline}}小时后广播。",
"pendingBroadcastBtn": "立即广播"
},
"txType": {
"cancel": "取消交易",
"initial": "发起交易",
"speedUp": "加速交易"
},
"MempoolList": {
"empty": "未发现包含这笔交易的节点",
"reBroadcastBtn": "重新广播",
"title": "已在以下节点的memopool发现这笔交易"
},
"message": {
"broadcastSuccess": "已广播",
"cancelSuccess": "已取消",
"reBroadcastSuccess": "已重新广播"
},
"CancelTxPopup": {
"title": "取消交易",
"options": {
"quickCancel": {
"title": "快捷取消",
"desc": "不需要发起链上取消,不需要Gasfee",
"tips": "不是等待广播的交易,不支持快捷取消"
},
"onChainCancel": {
"title": "链上取消",
"desc": "发起新的链上交易来取消,需要Gasfee"
}
}
},
"SkipNonceAlert": {
"alert": "当前 {{chainName}} 链因快捷取消导致 Nonce#{{nonce}} 被跳过, 导致后续 Pending 交易无法完成, 可 <5></5><6>发起一笔链上交易</6><7></7>来填充"
}
},
"title": "签名记录"
Expand Down Expand Up @@ -1220,6 +1254,29 @@
"contractPopularity": "No.{{0}} on {{1}}",
"myMarkWithContract": "My mark on {{chainName}} contract",
"coboSafeNotPermission": "This delegate address does not have permission to initiate this transaction",
"BroadcastMode": {
"instant": {
"title": "立即广播",
"desc": "交易创建后将被立即广播到链上节点"
},
"lowGas": {
"title": "省 Gas 广播",
"desc": "交易创建后会等链上Gas较低的时广播从而节省Gas"
},
"mev": {
"title": "MEV 广播",
"desc": "交易创建后会被广播到指定MEV节点"
},
"tips": {
"notSupportChain": "当前链不支持该模式",
"customRPC": "使用自定义RPC时不支持该模式",
"walletConnect": "Wallet Connect 签名不支持该模式",
"notSupported": "不支持该模式"
},
"lowGasDeadline": {
"label": "最长等待时间"
}
},
"SafeNonceSelector": {
"optionGroup": {
"recommendTitle": "推荐的Nonce",
Expand Down
6 changes: 6 additions & 0 deletions changeLogs/09227.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- Supported Gas-saving mode and MEV Guarded mode for transaction on Ethereum
- Supported WalletConnect v2
- Supported Scroll chain
- Supported 4 testnets: Ethereum Holesky Testnet, Kava Testnet, Songbird Coston Testnet, and Klaytn Baobab Testnet
- Supported new language - German
- Supported Cobo Argus on Mantle chain
2 changes: 2 additions & 0 deletions changeLogs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import version09222 from './09222.md';
import version09223 from './09223.md';
import version09224 from './09224.md';
import version09225 from './09225.md';
import version09227 from './09227.md';

const version = process.env.release || '0';
const versionMap = {
Expand Down Expand Up @@ -94,6 +95,7 @@ const versionMap = {
'0.92.23': version09223,
'0.92.24': version09224,
'0.92.25': version09225,
'0.92.27': version09227,
};
export const getUpdateContent = () => {
return versionMap[version];
Expand Down
6 changes: 6 additions & 0 deletions changeLogs/zh_CN/09227.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- ETH 链交易支持更多广播模式:省 gas 模式和 MEV 保护模式
- 支持 WalletConnect v2
- 支持 Scroll 链
- 新增4条测试网: Ethereum Holesky Testnet、Kava Testnet、Songbird Coston Testnet、Klaytn Baobab Testnet
- 支持德语
- Cobo Argus 支持 Mantle 链
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@rabby-wallet/eth-watch-keyring": "^1.0.0",
"@rabby-wallet/gnosis-sdk": "^1.3.5",
"@rabby-wallet/page-provider": "^0.1.22",
"@rabby-wallet/rabby-api": "^0.6.22",
"@rabby-wallet/rabby-api": "^0.6.23",
"@rabby-wallet/rabby-security-engine": "^1.1.16",
"@rabby-wallet/rabby-swap": "^0.0.29",
"@rabby-wallet/widgets": "^1.0.9",
Expand Down
Loading
Loading