Skip to content

Commit

Permalink
fix: fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
immortal-tofu committed Jun 11, 2024
1 parent 2b7a7ff commit 2611874
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 243 deletions.
8 changes: 4 additions & 4 deletions fhevm/operators_comparison.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,11 +624,11 @@ func getVerifiedCiphertexts(environment EVMEnvironment, unpacked interface{}) ([
}
ret := make([]*tfhe.TfheCiphertext, 0, len(big))
for _, b := range big {
ct := getVerifiedCiphertext(environment, common.BigToHash(b))
ct, _ := loadCiphertext(environment, common.BigToHash(b))
if ct == nil {
return nil, fmt.Errorf("fheArrayEq unverified ciphertext")
}
ret = append(ret, ct.ciphertext)
ret = append(ret, ct)
}
return ret, nil
}
Expand Down Expand Up @@ -665,7 +665,7 @@ func fheArrayEqRun(environment EVMEnvironment, caller common.Address, addr commo

// If we are doing gas estimation, skip execution and insert a random ciphertext as a result.
if !environment.IsCommitting() && !environment.IsEthCall() {
return importRandomCiphertext(environment, tfhe.FheBool), nil
return insertRandomCiphertext(environment, tfhe.FheBool), nil
}

result, err := tfhe.EqArray(lhs, rhs)
Expand All @@ -674,7 +674,7 @@ func fheArrayEqRun(environment EVMEnvironment, caller common.Address, addr commo
logger.Error(msg, "err", err)
return nil, err
}
importCiphertext(environment, result)
insertCiphertextToMemory(environment, result)
resultHash := result.GetHash()
logger.Info("fheArrayEqRun success", "result", resultHash.Hex())
return resultHash[:], nil
Expand Down
239 changes: 0 additions & 239 deletions fhevm/protected_storage.go

This file was deleted.

0 comments on commit 2611874

Please sign in to comment.