Fix verify error when use sha256 hash

buckyos · Jan 31, 2024 · c79e589 · c79e589
1 parent c4ba898
commit c79e589
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/contracts/PublicDataProof.sol b/contracts/PublicDataProof.sol
@@ -115,8 +115,9 @@ library PublicDataProof {
  computedHash = sha256(bytes.concat(proof[i], currentHash));
  }
  currentHash = _bytes32To16(computedHash);
- leaf_index = leaf_index / 2;
  }
+
+ leaf_index = leaf_index / 2;
  }
 
  return computedHash;

diff --git a/contracts/public_data_storage.sol b/contracts/public_data_storage.sol
@@ -160,12 +160,17 @@ contract PublicDataStorage is Initializable, UUPSUpgradeable, OwnableUpgradeable
 
  }
 
- function allowPublicDataContract(address contractAddr) public onlyOwner {
- _allowedPublicDataContract[contractAddr] = true;
+ function allowPublicDataContract(address[] calldata contractAddrs) public onlyOwner {
+ for (uint i = 0; i < contractAddrs.length; i++) {
+ _allowedPublicDataContract[contractAddrs[i]] = true;
+ }
+
  }
 
- function denyPublicDataContract(address contractAddr) public onlyOwner {
- _allowedPublicDataContract[contractAddr] = false;
+ function denyPublicDataContract(address[] calldata contractAddrs) public onlyOwner {
+ for (uint i = 0; i < contractAddrs.length; i++) {
+ _allowedPublicDataContract[contractAddrs[i]] = false;
+ }
  }
 
  function setSysConfig(SysConfig calldata config) public onlyOwner {
@@ -286,6 +291,14 @@ contract PublicDataStorage is Initializable, UUPSUpgradeable, OwnableUpgradeable
  return CycleOutputInfo(_cycleInfos[cycleNumber].totalAward, _cycleInfos[cycleNumber].scoreList.getSortedList());
  }
 
+ function getPledgeInfo(address supplier) public view returns(SupplierInfo memory) {
+ return _supplierInfos[supplier];
+ }
+
+ function isDataContractAllowed(address contractAddr) public view returns(bool) {
+ return _allowedPublicDataContract[contractAddr];
+ }
+
  function getOwner(bytes32 dataMixedHash) public view returns(address) {
  PublicData memory info = _publicDatas[dataMixedHash];
  return _getDataOwner(dataMixedHash, info);

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -162,8 +162,8 @@ export async function main() {
 
 // We recommend this pattern to be able to use async/await everywhere
 // and properly handle errors.
-/*
+
 main().catch((error) => {
  console.error(error);
  process.exitCode = 1;
-});*/
+});