Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support op blob decode #76

Merged
merged 8 commits into from
Jul 11, 2024
Merged

support op blob decode #76

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fef754f
support op blob decode
iteyelmp Feb 22, 2024
81a4bb0
Merge remote-tracking branch 'origin/main' into opencode
iteyelmp May 16, 2024
6b00eb2
change check size
iteyelmp May 16, 2024
e78c8df
Merge remote-tracking branch 'origin/main' into opencode
iteyelmp Jul 10, 2024
3ccb30e
fix merge
iteyelmp Jul 10, 2024
2dc8c76
fix commit
iteyelmp Jul 10, 2024
20f99f7
fix commit
iteyelmp Jul 11, 2024
0dad4d1
remove text
iteyelmp Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions contracts/DecentralizedKV.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@ contract DecentralizedKV is OwnableUpgradeable {
/// @notice Enum representing different decoding types when getting key-value.
/// @custom:field RawData Don't do any decoding.
/// @custom:field PaddingPer31Bytes Will remove the padding byte every 31 bytes.
/// @custom:field OptimismCompact Use Op blob encoding format.
enum DecodeType {
RawData,
PaddingPer31Bytes
PaddingPer31Bytes,
OptimismCompact
}

/// @notice The maximum value of optimization blob storage content. It can store 3068 bytes more data than standard blob.
/// https://github.com/ethereum-optimism/optimism/blob/develop/op-service/eth/blob.go#L16
uint256 internal constant MAX_OPTIMISM_BLOB_DATA_SIZE = (4 * 31 + 3) * 1024 - 4;

/// @notice Upfront storage cost (pre-dcf)
uint256 internal immutable STORAGE_COST;

Expand Down Expand Up @@ -172,7 +178,13 @@ contract DecentralizedKV is OwnableUpgradeable {
bytes32 skey = keccak256(abi.encode(msg.sender, _key));
PhyAddr memory paddr = kvMap[skey];
require(paddr.hash != 0, "DecentralizedKV: data not exist");
if (_decodeType == DecodeType.PaddingPer31Bytes) {
if (_decodeType == DecodeType.OptimismCompact) {
// kvSize is the actual data size that dApp contract stores
require(
(paddr.kvSize >= _off + _len) && (_off + _len <= MAX_OPTIMISM_BLOB_DATA_SIZE),
"DecentralizedKV: beyond the range of kvSize"
);
} else if (_decodeType == DecodeType.PaddingPer31Bytes) {
// kvSize is the actual data size that dApp contract stores
require(
(paddr.kvSize >= _off + _len) && (_off + _len <= MAX_KV_SIZE - 4096),
Expand All @@ -182,6 +194,7 @@ contract DecentralizedKV is OwnableUpgradeable {
// maxKvSize is blob size
require(MAX_KV_SIZE >= _off + _len, "DecentralizedKV: beyond the range of maxKvSize");
}

bytes memory input = abi.encode(paddr.kvIdx, _decodeType, _off, _len, paddr.hash);
bytes memory output = new bytes(_len);

Expand Down
Loading