From a2f4c9890d0aac0d5b6badb495afa2dc50ae3819 Mon Sep 17 00:00:00 2001 From: GabrielMartinezRodriguez Date: Tue, 25 Mar 2025 16:58:31 +0100 Subject: [PATCH 1/5] fix(txm): nonce gap --- packages/txm/lib/NonceManager.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 } } From ac02e17150b1eec74d54b5428e7b51d1af77c45c Mon Sep 17 00:00:00 2001 From: GabrielMartinezRodriguez Date: Tue, 8 Apr 2025 14:28:13 +0200 Subject: [PATCH 2/5] fix(contracts): deploy randomness --- contracts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/Makefile b/contracts/Makefile index 5d0641b502..d9ecca88ff 100755 --- a/contracts/Makefile +++ b/contracts/Makefile @@ -337,7 +337,7 @@ define post-deploy @# Extract ABIs from the deployed contracts and save to out/abis.json. @export CONTRACTS=$$(bun node-jq '[.[]] | unique' out/abiMap.json) && \ node-jq '[.[]] | unique[]' out/abiMap.json \ - | xargs -I'{}' forge inspect {} abi --json \ + | xargs -I'{}' forge inspect {} abi \ | node-jq --slurp --argjson contracts "$$CONTRACTS" '[$$contracts, .] | transpose | map({ (.[0]): .[1] }) | add' \ > out/abis.json; From 3e1921c635571cc95ab8257fadeb5f4724055c46 Mon Sep 17 00:00:00 2001 From: GabrielMartinezRodriguez Date: Thu, 10 Apr 2025 09:52:22 +0200 Subject: [PATCH 3/5] chore(contracts): added json flag to post-deploy rule --- contracts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/Makefile b/contracts/Makefile index d9ecca88ff..5d0641b502 100755 --- a/contracts/Makefile +++ b/contracts/Makefile @@ -337,7 +337,7 @@ define post-deploy @# Extract ABIs from the deployed contracts and save to out/abis.json. @export CONTRACTS=$$(bun node-jq '[.[]] | unique' out/abiMap.json) && \ node-jq '[.[]] | unique[]' out/abiMap.json \ - | xargs -I'{}' forge inspect {} abi \ + | xargs -I'{}' forge inspect {} abi --json \ | node-jq --slurp --argjson contracts "$$CONTRACTS" '[$$contracts, .] | transpose | map({ (.[0]): .[1] }) | add' \ > out/abis.json; From d03ec85ff204b652d2b7490ddd9a0c947dee383d Mon Sep 17 00:00:00 2001 From: GabrielMartinezRodriguez Date: Thu, 10 Apr 2025 10:37:26 +0200 Subject: [PATCH 4/5] chore(contracts): update mock address --- contracts/deployments/anvil/mocks/deployment.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From de3af6c56326b49def038dbbba944f30ed45a186 Mon Sep 17 00:00:00 2001 From: GabrielMartinezRodriguez Date: Thu, 10 Apr 2025 11:12:27 +0200 Subject: [PATCH 5/5] chore(contracts): update mock address --- contracts/deployments/anvil/mocks/abis.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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