Fix bytes32 toString bug (#243)

rabbitholegg · Dec 23, 2023 · 5695678 · 5695678
1 parent 8adb30f
commit 5695678
Show file tree

Hide file tree

Showing 24 changed files with 1,884 additions and 190 deletions.
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703359823.json b/broadcast/QuestFactory.s.sol/10/run-1703359823.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703359830.json b/broadcast/QuestFactory.s.sol/10/run-1703359830.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703359848.json b/broadcast/QuestFactory.s.sol/10/run-1703359848.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703361667.json b/broadcast/QuestFactory.s.sol/10/run-1703361667.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703361674.json b/broadcast/QuestFactory.s.sol/10/run-1703361674.json
diff --git a/broadcast/QuestFactory.s.sol/10/run-1703361692.json b/broadcast/QuestFactory.s.sol/10/run-1703361692.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-1703361553.json b/broadcast/QuestFactory.s.sol/11155111/run-1703361553.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703361566.json b/broadcast/QuestFactory.s.sol/11155111/run-1703361566.json
diff --git a/broadcast/QuestFactory.s.sol/11155111/run-1703361611.json b/broadcast/QuestFactory.s.sol/11155111/run-1703361611.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-1703361704.json b/broadcast/QuestFactory.s.sol/137/run-1703361704.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-1703361712.json b/broadcast/QuestFactory.s.sol/137/run-1703361712.json
diff --git a/broadcast/QuestFactory.s.sol/137/run-1703361741.json b/broadcast/QuestFactory.s.sol/137/run-1703361741.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-1703361638.json b/broadcast/QuestFactory.s.sol/42161/run-1703361638.json
diff --git a/broadcast/QuestFactory.s.sol/42161/run-1703361656.json b/broadcast/QuestFactory.s.sol/42161/run-1703361656.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-1703361751.json b/broadcast/QuestFactory.s.sol/8453/run-1703361751.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-1703361758.json b/broadcast/QuestFactory.s.sol/8453/run-1703361758.json
diff --git a/broadcast/QuestFactory.s.sol/8453/run-1703361776.json b/broadcast/QuestFactory.s.sol/8453/run-1703361776.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
@@ -300,7 +300,7 @@ contract QuestFactory is Initializable, LegacyStorage, OwnableRoles, IQuestFacto
 
         string memory questIdString_ = bytes16ToUUID(questid_);
         Quest storage quest_ = quests[questIdString_];
-        string memory jsonData_ = buildJsonString(uint256(txHash_).toHexString(), uint256(txHashChainId_).toString(), quest_.actionType, quest_.questName);
+        string memory jsonData_ = buildJsonString(uint256(txHash_).toHexString(32), uint256(txHashChainId_).toString(), quest_.actionType, quest_.questName);
         bytes memory claimData_ = abi.encode(msg.sender, ref_, questIdString_, jsonData_);
 
         this.claimOptimized{value: msg.value}(abi.encodePacked(r_,vs_), claimData_);
@@ -542,6 +542,10 @@ contract QuestFactory is Initializable, LegacyStorage, OwnableRoles, IQuestFacto
         emit MintFeePaid(questId_, protocolFeeRecipient_, protocolPayout_, mintFeeRecipient_, mintPayout, address(0), 0);
     }
 
+    function getQuestName(string calldata questId_) external view returns (string memory) {
+        return quests[questId_].questName;
+    }
+
     /*//////////////////////////////////////////////////////////////
                             INTERNAL UPDATE
     //////////////////////////////////////////////////////////////*/

diff --git a/test/QuestFactory.t.sol b/test/QuestFactory.t.sol
@@ -334,9 +334,9 @@ contract TestQuestFactory is Test, Errors, Events, TestUtils {
         vm.warp(START_TIME + 1);
 
         bytes16 questId = hex'550e8400e29b41d4a716446655440000';
-        bytes32 txHash = hex'7e1975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516';
+        bytes32 txHash = hex'001975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516';
         uint32 txHashChainId = 101;
-        string memory json = '{"actionTxHashes":["0x7e1975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516"],"actionNetworkChainIds":[101],"questName":"questName","actionType":"actionType"}';
+        string memory json = '{"actionTxHashes":["0x001975a6bf513022a8cc382a3cdb1e1dbcd58ebb1cb9abf11e64aadb21262516"],"actionNetworkChainIds":[101],"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);