@exodus/ethereum-api 8.62.4 → 8.63.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/package.json +2 -2
- package/src/create-asset-utils.js +12 -8
- package/src/tx-send/nonce-utils.js +23 -11
- package/src/tx-send/tx-send.js +9 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [8.63.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.62.4...@exodus/ethereum-api@8.63.0) (2026-01-14)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
* feat: add 'latest' evm nonce support (#7267)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
6
16
|
## [8.62.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.62.3...@exodus/ethereum-api@8.62.4) (2026-01-14)
|
|
7
17
|
|
|
8
18
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@exodus/ethereum-api",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.63.0",
|
|
4
4
|
"description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Ethereum and EVM-based blockchains",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"type": "git",
|
|
68
68
|
"url": "git+https://github.com/ExodusMovement/assets.git"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "db8bd0629b287cd2031a12ff2a3fed3fc765bbab"
|
|
71
71
|
}
|
|
@@ -7,7 +7,7 @@ import { ClarityMonitor } from './tx-log/clarity-monitor.js'
|
|
|
7
7
|
import { ClarityMonitorV2 } from './tx-log/clarity-monitor-v2.js'
|
|
8
8
|
import { EthereumMonitor } from './tx-log/ethereum-monitor.js'
|
|
9
9
|
import { EthereumNoHistoryMonitor } from './tx-log/ethereum-no-history-monitor.js'
|
|
10
|
-
import { resolveNonce } from './tx-send/nonce-utils.js'
|
|
10
|
+
import { BLOCK_TAG_PENDING, resolveNonce } from './tx-send/nonce-utils.js'
|
|
11
11
|
|
|
12
12
|
// Determines the appropriate `monitorType`, `serverUrl` and `monitorInterval`
|
|
13
13
|
// to use for a given config.
|
|
@@ -184,7 +184,16 @@ export const getNonceFactory = ({ assetClientInterface, useAbsoluteBalanceAndNon
|
|
|
184
184
|
assert(assetClientInterface, 'expected assetClientInterface')
|
|
185
185
|
assert(typeof useAbsoluteBalanceAndNonce === 'boolean', 'expected useAbsoluteBalanceAndNonce')
|
|
186
186
|
|
|
187
|
-
const getNonce = async ({
|
|
187
|
+
const getNonce = async ({
|
|
188
|
+
asset,
|
|
189
|
+
fromAddress,
|
|
190
|
+
walletAccount,
|
|
191
|
+
forceFromNode,
|
|
192
|
+
// NOTE: By default, Exodus assumes the client will by default want
|
|
193
|
+
// to send transactions on top of those which are currently
|
|
194
|
+
// pending at the public mempool.
|
|
195
|
+
tag = BLOCK_TAG_PENDING,
|
|
196
|
+
}) => {
|
|
188
197
|
assert(asset, 'expected asset')
|
|
189
198
|
assert(typeof fromAddress === 'string', 'expected fromAddress')
|
|
190
199
|
assert(walletAccount, 'expected walletAccount')
|
|
@@ -198,13 +207,8 @@ export const getNonceFactory = ({ assetClientInterface, useAbsoluteBalanceAndNon
|
|
|
198
207
|
asset,
|
|
199
208
|
fromAddress,
|
|
200
209
|
txLog,
|
|
201
|
-
triedNonce,
|
|
202
210
|
forceFromNode,
|
|
203
|
-
|
|
204
|
-
// search for pending transactions. For base assets with history,
|
|
205
|
-
// we'll fall back to the `TxLog` since this also has a knowledge
|
|
206
|
-
// of which transactions are currently in pending.
|
|
207
|
-
tag: 'pending',
|
|
211
|
+
tag,
|
|
208
212
|
useAbsoluteNonce: useAbsoluteBalanceAndNonce,
|
|
209
213
|
})
|
|
210
214
|
}
|
|
@@ -3,29 +3,32 @@ import assert from 'minimalistic-assert'
|
|
|
3
3
|
import { getNonce } from '../eth-like-util.js'
|
|
4
4
|
import { getLatestCanonicalAbsoluteNonceTx } from '../tx-log/clarity-utils/absolute.js'
|
|
5
5
|
|
|
6
|
+
export const BLOCK_TAG_LATEST = 'latest'
|
|
7
|
+
export const BLOCK_TAG_PENDING = 'pending'
|
|
8
|
+
|
|
9
|
+
const VALID_BLOCK_TAGS = new Set([BLOCK_TAG_LATEST, BLOCK_TAG_PENDING])
|
|
10
|
+
|
|
11
|
+
// NOTE: We do not yet support tags at arbitrary block heights.
|
|
12
|
+
const assertValidBlockTag = (tag) => assert(VALID_BLOCK_TAGS.has(tag), `invalid tag "${tag}"`)
|
|
13
|
+
|
|
6
14
|
export const resolveNonce = async ({
|
|
7
15
|
asset,
|
|
8
16
|
forceFromNode,
|
|
9
17
|
fromAddress,
|
|
10
|
-
providedNonce,
|
|
11
18
|
txLog = [],
|
|
12
|
-
|
|
13
|
-
tag = 'latest', // use 'pending' for unconfirmed txs
|
|
19
|
+
tag = BLOCK_TAG_LATEST,
|
|
14
20
|
useAbsoluteNonce,
|
|
15
21
|
}) => {
|
|
22
|
+
assertValidBlockTag(tag)
|
|
23
|
+
|
|
16
24
|
const nonceFromNode =
|
|
17
25
|
asset.baseAsset?.api?.features?.noHistory || forceFromNode
|
|
18
26
|
? await getNonce({ asset: asset.baseAsset, address: fromAddress, tag })
|
|
19
27
|
: 0
|
|
20
28
|
|
|
21
|
-
const nonceFromLog = getNonceFromTxLog({ txLog, useAbsoluteNonce })
|
|
29
|
+
const nonceFromLog = getNonceFromTxLog({ txLog, useAbsoluteNonce, tag })
|
|
22
30
|
|
|
23
|
-
return Math.max(
|
|
24
|
-
nonceFromNode,
|
|
25
|
-
nonceFromLog,
|
|
26
|
-
providedNonce ?? 0,
|
|
27
|
-
triedNonce === undefined ? 0 : triedNonce + 1
|
|
28
|
-
)
|
|
31
|
+
return Math.max(nonceFromNode, nonceFromLog)
|
|
29
32
|
}
|
|
30
33
|
|
|
31
34
|
const getLatestTxWithNonceChange = ({ reversedTxLog }) => {
|
|
@@ -44,7 +47,7 @@ const getLatestTxWithNonceChange = ({ reversedTxLog }) => {
|
|
|
44
47
|
}
|
|
45
48
|
}
|
|
46
49
|
|
|
47
|
-
|
|
50
|
+
const getNonceFromTxLog = ({ txLog, useAbsoluteNonce, tag }) => {
|
|
48
51
|
let absoluteNonce = 0
|
|
49
52
|
|
|
50
53
|
if (useAbsoluteNonce) {
|
|
@@ -52,12 +55,21 @@ export const getNonceFromTxLog = ({ txLog, useAbsoluteNonce }) => {
|
|
|
52
55
|
const maybeLatestTxWithNonceChange = getLatestTxWithNonceChange({ reversedTxLog })
|
|
53
56
|
|
|
54
57
|
if (maybeLatestTxWithNonceChange) {
|
|
58
|
+
// NOTE: This is the latest nonce currently confirmed by
|
|
59
|
+
// Clarity, which lags behind `CLARITY_MIN_CONFIRMS`
|
|
60
|
+
// depth:
|
|
61
|
+
//
|
|
62
|
+
// https://github.com/ExodusMovement/clarity/blob/4a6ea30fce33246d1ef1440e61b0a84b876900d6/deployment/eth-clarity-indexer/values.yaml#L34
|
|
55
63
|
absoluteNonce = parseInt(maybeLatestTxWithNonceChange.data.nonceChange.to, 10)
|
|
56
64
|
}
|
|
57
65
|
}
|
|
58
66
|
|
|
59
67
|
const nonceFromLog = [...txLog]
|
|
60
68
|
.filter((tx) => tx.sent && !tx.dropped && tx.data.nonce != null)
|
|
69
|
+
// NOTE: If we're only considering the `'latest'` block `tag`,
|
|
70
|
+
// then we should not take into account unconfirmed
|
|
71
|
+
// transactions when computing the `nonce`.
|
|
72
|
+
.filter((tx) => tag !== BLOCK_TAG_LATEST || !tx.pending)
|
|
61
73
|
.reduce((nonce, tx) => Math.max(tx.data.nonce + 1, nonce), 0)
|
|
62
74
|
|
|
63
75
|
return Math.max(absoluteNonce, nonceFromLog)
|
package/src/tx-send/tx-send.js
CHANGED
|
@@ -83,15 +83,22 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
|
|
|
83
83
|
})
|
|
84
84
|
} else if (nonceTooLowErr && !unsignedTx.txMeta.isHardware) {
|
|
85
85
|
console.info('trying to send again...') // inject logger factory from platform
|
|
86
|
+
|
|
86
87
|
// let's try to fix the nonce issue
|
|
87
|
-
|
|
88
|
+
let newNonce = await baseAsset.getNonce({
|
|
88
89
|
asset,
|
|
89
90
|
fromAddress,
|
|
90
91
|
walletAccount,
|
|
91
|
-
triedNonce: parsedTx.nonce,
|
|
92
92
|
forceFromNode: true,
|
|
93
93
|
})
|
|
94
94
|
|
|
95
|
+
// TODO: We should only do this for non-replacement transactions.
|
|
96
|
+
const triedNonce = parsedTx.nonce
|
|
97
|
+
|
|
98
|
+
if (typeof triedNonce === 'number') {
|
|
99
|
+
newNonce = Math.max(newNonce, triedNonce + 1)
|
|
100
|
+
}
|
|
101
|
+
|
|
95
102
|
// NOTE: An `unsignedTx.txData.transactionBuffer` may be optional
|
|
96
103
|
// in `unsignedTx`, since a `providedUnsignedTx` may be
|
|
97
104
|
// truthy but composed only of `legacyParams`:
|