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 optimism blob #22

Merged
merged 14 commits into from
Sep 11, 2024
Merged

Support optimism blob #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
50b226a
add op blob
iteyelmp Aug 20, 2024
a941649
fix blob error
iteyelmp Aug 21, 2024
c189f61
Merge remote-tracking branch 'origin/main' into op
iteyelmp Aug 22, 2024
9288266
support ob blob
iteyelmp Aug 23, 2024
e9454ac
upload bytecode
iteyelmp Aug 23, 2024
5609acf
update test
iteyelmp Aug 23, 2024
6e26b10
Optimize hash acquisition
iteyelmp Aug 23, 2024
e8afedc
Code optimization
iteyelmp Aug 26, 2024
d713348
Code optimization
iteyelmp Aug 27, 2024
69d1b73
Withdraw the code about hashing
iteyelmp Sep 3, 2024
eedb64a
delete
iteyelmp Sep 3, 2024
0441ca4
remove old contract
iteyelmp Sep 5, 2024
ad10045
fix comment
iteyelmp Sep 9, 2024
2ff186a
fix comment
iteyelmp Sep 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
50 changes: 22 additions & 28 deletions src/ethstorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import {
BlobUploader,
stringToHex,
getChainId,
encodeBlobs
encodeOpBlobs
} from "./utils";
import {
ETHSTORAGE_MAPPING,
BLOB_SIZE,
DEFAULT_BLOB_DATA_SIZE,
PaddingPer31Bytes,
OP_BLOB_DATA_SIZE,
OptimismCompact,
EthStorageAbi,
BLOB_COUNT_LIMIT
} from "./param";
Expand Down Expand Up @@ -52,14 +52,7 @@ export class EthStorage {
}

async estimateCost(key, data) {
if (!data) {
throw new Error(`EthStorage: Invalid data.`);
}
data = Buffer.from(data);
if (data.length < 0 || data.length > DEFAULT_BLOB_DATA_SIZE) {
throw new Error(`EthStorage: the length of data(Buffer) should be > 0 && < ${DEFAULT_BLOB_DATA_SIZE}.`);
}

this.#checkData(data);
const hexKey = ethers.keccak256(stringToHex(key));
const contract = new ethers.Contract(this.#contractAddr, EthStorageAbi, this.#wallet);
const [storageCost, maxFeePerBlobGas, gasFeeData] = await Promise.all([
Expand All @@ -68,7 +61,7 @@ export class EthStorage {
this.#blobUploader.getGasPrice(),
]);

const blobs = encodeBlobs(data);
const blobs = encodeOpBlobs(data);
const blobHash = this.#blobUploader.getBlobHash(blobs[0]);
const gasLimit = await contract.putBlob.estimateGas(hexKey, 0, data.length, {
value: storageCost,
Expand All @@ -86,13 +79,7 @@ export class EthStorage {
}

async write(key, data) {
if (!data) {
throw new Error(`EthStorage: Invalid data.`);
}
data = Buffer.from(data);
if (data.length < 0 || data.length > DEFAULT_BLOB_DATA_SIZE) {
throw new Error(`EthStorage: the length of data(Buffer) should be > 0 && < ${DEFAULT_BLOB_DATA_SIZE}.`);
}
this.#checkData(data);

const contract = new ethers.Contract(this.#contractAddr, EthStorageAbi, this.#wallet);
const hexKey = ethers.keccak256(stringToHex(key));
Expand All @@ -102,7 +89,7 @@ export class EthStorage {
value: storageCost,
});

const blobs = encodeBlobs(data);
const blobs = encodeOpBlobs(data);
let txRes = await this.#blobUploader.sendTx(tx, blobs);
console.log(`EthStorage: Tx hash is ${txRes.hash}`)
txRes = await txRes.wait();
Expand All @@ -113,7 +100,7 @@ export class EthStorage {
return false;
}

async read(key) {
async read(key, decodeType = OptimismCompact) {
if (!key) {
throw new Error(`EthStorage: Invalid key.`);
}
Expand All @@ -129,7 +116,7 @@ export class EthStorage {
if (size === 0n) {
throw new Error(`EthStorage: There is no data corresponding to key ${key} under wallet address ${this.#wallet.address}.`)
}
const data = await contract.get(hexKey, PaddingPer31Bytes, 0, size, {
const data = await contract.get(hexKey, decodeType, 0, size, {
from: this.#wallet.address
});
return ethers.getBytes(data);
Expand All @@ -152,15 +139,13 @@ export class EthStorage {
const idArr = [];
const lengthArr = [];
for (let i = 0; i < blobLength; i++) {
const d = Buffer.from(dataBlobs[i]);
if (d.length < 0 || d.length > DEFAULT_BLOB_DATA_SIZE) {
throw new Error(`EthStorage: the length of data(Buffer) should be > 0 && < ${DEFAULT_BLOB_DATA_SIZE}.`);
}
const blob = encodeBlobs(d);
const data = dataBlobs[i];
this.#checkData(data);
const blob = encodeOpBlobs(data);
blobArr.push(blob[0]);
keyArr.push(ethers.keccak256(stringToHex(keys[i])));
idArr.push(i);
lengthArr.push(d.length);
lengthArr.push(data.length);
}

const contract = new ethers.Contract(this.#contractAddr, EthStorageAbi, this.#wallet);
Expand All @@ -179,4 +164,13 @@ export class EthStorage {
}
return false;
}

#checkData(data) {
if (!data || !(data instanceof Uint8Array)) {
throw new Error(`EthStorage: Invalid data.`);
}
if (data.length === 0 || data.length > OP_BLOB_DATA_SIZE) {
throw new Error(`EthStorage: the length of data(Uint8Array) should be > 0 && < ${OP_BLOB_DATA_SIZE}.`);
}
}
}
Loading