change txHashChainId to uint32 (#240)

rabbitholegg · Dec 22, 2023 · d873db8 · d873db8
1 parent 25038f7
commit d873db8
Show file tree

Hide file tree

Showing 26 changed files with 1,947 additions and 268 deletions.
diff --git a/broadcast/QuestFactory.s.sol/1/run-1703197395.json b/broadcast/QuestFactory.s.sol/1/run-1703197395.json
diff --git a/broadcast/QuestFactory.s.sol/1/run-latest.json b/broadcast/QuestFactory.s.sol/1/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703197452.json b/broadcast/QuestFactory.s.sol/10/run-1703197452.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703197459.json b/broadcast/QuestFactory.s.sol/10/run-1703197459.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703197477.json b/broadcast/QuestFactory.s.sol/10/run-1703197477.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-latest.json b/broadcast/QuestFactory.s.sol/10/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703195656.json b/broadcast/QuestFactory.s.sol/11155111/run-1703195656.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703195670.json b/broadcast/QuestFactory.s.sol/11155111/run-1703195670.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703195705.json b/broadcast/QuestFactory.s.sol/11155111/run-1703195705.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703197332.json b/broadcast/QuestFactory.s.sol/11155111/run-1703197332.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703197351.json b/broadcast/QuestFactory.s.sol/11155111/run-1703197351.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703197385.json b/broadcast/QuestFactory.s.sol/11155111/run-1703197385.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-latest.json b/broadcast/QuestFactory.s.sol/11155111/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-1703197489.json b/broadcast/QuestFactory.s.sol/137/run-1703197489.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-1703197527.json b/broadcast/QuestFactory.s.sol/137/run-1703197527.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-1703197556.json b/broadcast/QuestFactory.s.sol/137/run-1703197556.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-latest.json b/broadcast/QuestFactory.s.sol/137/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/42161/run-1703197421.json b/broadcast/QuestFactory.s.sol/42161/run-1703197421.json
diff --git a/broadcast/QuestFactory.s.sol/42161/run-1703197439.json b/broadcast/QuestFactory.s.sol/42161/run-1703197439.json
diff --git a/broadcast/QuestFactory.s.sol/42161/run-latest.json b/broadcast/QuestFactory.s.sol/42161/run-latest.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-1703197567.json b/broadcast/QuestFactory.s.sol/8453/run-1703197567.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-1703197573.json b/broadcast/QuestFactory.s.sol/8453/run-1703197573.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-1703197592.json b/broadcast/QuestFactory.s.sol/8453/run-1703197592.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-latest.json b/broadcast/QuestFactory.s.sol/8453/run-latest.json
diff --git a/contracts/QuestFactory.sol b/contracts/QuestFactory.sol
@@ -292,10 +292,10 @@ contract QuestFactory is Initializable, LegacyStorage, OwnableRoles, IQuestFacto
             bytes32 vs_,
             address ref_,
             bytes16 questid_,
-            uint16 txHashChainId_
+            uint32 txHashChainId_
         ) = abi.decode(
             data_,
-            (bytes32, bytes32, bytes32, address, bytes16, uint16)
+            (bytes32, bytes32, bytes32, address, bytes16, uint32)
         );
 
         string memory questIdString_ = bytes16ToUUID(questid_);

diff --git a/test/QuestFactory.t.sol b/test/QuestFactory.t.sol
@@ -250,8 +250,8 @@ contract TestQuestFactory is Test, Errors, Events, TestUtils {
 
         bytes16 questId = hex'550e8400e29b41d4a716446655440000';
         bytes32 txHash = hex'7e1975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516';
-        uint16 txHashChainId = 1011;
-        string memory json = '{"actionTxHashes":["0x7e1975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516"],"actionNetworkChainIds":[1011],"questName":"questName","actionType":"actionType"}';
+        uint32 txHashChainId = 7777777;
+        string memory json = '{"actionTxHashes":["0x7e1975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516"],"actionNetworkChainIds":[7777777],"questName":"questName","actionType":"actionType"}';
         bytes memory signData = abi.encode(participant, referrer, "550e8400-e29b-41d4-a716-446655440000", json);
         bytes32 msgHash = keccak256(signData);
         bytes32 digest = ECDSA.toEthSignedMessageHash(msgHash);
@@ -277,7 +277,7 @@ contract TestQuestFactory is Test, Errors, Events, TestUtils {
         address participantMocked = 0xde967dd32C1d057B368ea9F37d70469Cd7F6bF38;
         address referrerMocked = address(0);
         bytes32 txHash = 0x57498a77018f78c02a0e2f0d0e4a8aab048b6e249ff936d230b7db7ca48782e1;
-        uint16 txHashChainId = 1;
+        uint32 txHashChainId = 1;
         bytes16 questId = 0x88e08cb195e64832845fa92ec8f2034a;
         string memory questIdString = "88e08cb1-95e6-4832-845f-a92ec8f2034a";
         string memory actionType = "other";