diff --git a/contracts/deployments/anvil/mocks/abis.ts b/contracts/deployments/anvil/mocks/abis.ts index f87f01db7c..25de7c480a 100644 --- a/contracts/deployments/anvil/mocks/abis.ts +++ b/contracts/deployments/anvil/mocks/abis.ts @@ -440,12 +440,12 @@ const aliasToContract = ({ }) as const export const deployment = ({ - "HappyCounter": "0x8D45cAd49F37CC512DAFFE6700ddc98084867E68", - "MockGasBurner": "0xdA504Bb1b736b04A5Aec28fD5d693Ad7447Ad438", - "MockRevert": "0x4065fA94A420c30c9bBc32483e65CaC8edDDa855", - "MockTokenA": "0xA41Be5C0a84e4e62273D2D1138456d069F897913", - "MockTokenB": "0xC886E11da9747684B36FA0E9519539A16cB1739a", - "MockTokenC": "0x40C7343b1Ed89bc85D914239154F662Ed6e028Ed" + "HappyCounter": "0xCeC57308B882Cf2A770ed57573B09d77a280b92F", + "MockGasBurner": "0xB37ABfb788e71bb93171ec06F237a05F954E5F85", + "MockRevert": "0x1015B0D8fB2662C1c1A4f3cEE38054ff6d8117Bc", + "MockTokenA": "0x20F24e61ae939B180293E65D54aB8B5941011381", + "MockTokenB": "0x77e1acd06c1eF93441F159c11C2d1d644a460e85", + "MockTokenC": "0x1B9a60C271401De40E90d0100Ab8881B2FaF7210" }) as const export type ContractToAbi = typeof contractToAbi diff --git a/contracts/deployments/anvil/mocks/deployment.json b/contracts/deployments/anvil/mocks/deployment.json index 1169058834..4ccbff3a7a 100644 --- a/contracts/deployments/anvil/mocks/deployment.json +++ b/contracts/deployments/anvil/mocks/deployment.json @@ -1,8 +1,8 @@ { - "HappyCounter": "0x8D45cAd49F37CC512DAFFE6700ddc98084867E68", - "MockGasBurner": "0xdA504Bb1b736b04A5Aec28fD5d693Ad7447Ad438", - "MockRevert": "0x4065fA94A420c30c9bBc32483e65CaC8edDDa855", - "MockTokenA": "0xA41Be5C0a84e4e62273D2D1138456d069F897913", - "MockTokenB": "0xC886E11da9747684B36FA0E9519539A16cB1739a", - "MockTokenC": "0x40C7343b1Ed89bc85D914239154F662Ed6e028Ed" + "HappyCounter": "0xCeC57308B882Cf2A770ed57573B09d77a280b92F", + "MockGasBurner": "0xB37ABfb788e71bb93171ec06F237a05F954E5F85", + "MockRevert": "0x1015B0D8fB2662C1c1A4f3cEE38054ff6d8117Bc", + "MockTokenA": "0x20F24e61ae939B180293E65D54aB8B5941011381", + "MockTokenB": "0x77e1acd06c1eF93441F159c11C2d1d644a460e85", + "MockTokenC": "0x1B9a60C271401De40E90d0100Ab8881B2FaF7210" } \ No newline at end of file diff --git a/packages/txm/lib/NonceManager.ts b/packages/txm/lib/NonceManager.ts index 55c5a6c0ba..426e75655b 100644 --- a/packages/txm/lib/NonceManager.ts +++ b/packages/txm/lib/NonceManager.ts @@ -57,7 +57,7 @@ export class NonceManager { const blockchainNonce = blockchainNonceResult.value - this.maxExecutedNonce = blockchainNonce + this.maxExecutedNonce = blockchainNonce - 1 const highestDbNonce = this.txmgr.transactionRepository.getHighestNonce() @@ -67,7 +67,7 @@ export class NonceManager { } else { this.nonce = highestDbNonce + 1 this.returnedNonceQueue = this.txmgr.transactionRepository - .getNotReservedNoncesInRange(blockchainNonce, highestDbNonce) + .getNotReservedNoncesInRange(this.maxExecutedNonce, highestDbNonce) .sort((a, b) => a - b) } } @@ -113,6 +113,6 @@ export class NonceManager { return } - this.maxExecutedNonce = blockchainNonceResult.value + this.maxExecutedNonce = blockchainNonceResult.value - 1 } }