feat(apis/vara-eth): add support for uploading codes in EIP-7594 format

.github/workflows/CI.yml

@@ -86,6 +86,8 @@ jobs:
 
       - name: "Install: Foundry"
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-c07d504b4ae67754584f4e05ff0c547a43c50f7b
 
       - name: 'Install dependencies'
         run: yarn workspaces focus gear-js @gear-js/api
@@ -153,7 +155,7 @@ jobs:
         if: steps.changed-vara-eth.outputs.any_changed == 'true'
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: v1.5.0-rc1
+          version: nightly-c07d504b4ae67754584f4e05ff0c547a43c50f7b
 
       - name: 'Install dependencies'
         if: steps.changed-vara-eth.outputs.any_changed == 'true'

apis/vara-eth/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.0.1"
+version = "0.1.0"
 authors = ["Gear Technologies"]
 edition = "2024"
 license = "GPL-3.0"

apis/vara-eth/package.json

@@ -39,12 +39,12 @@
   },
   "peerDependencies": {
     "kzg-wasm": "1.0.0",
-    "viem": "^2.39.0"
+    "viem": "*"
   },
   "devDependencies": {
     "@types/ws": "8.18.1",
     "kzg-wasm": "1.0.0",
-    "viem": "2.47.4",
+    "viem": "https://pkg.pr.new/StackOverflowExcept1on/viem/viem@98e8516",
     "ws": "8.18.3"
   },
   "files": [

apis/vara-eth/programs/injected/src/main.rs

@@ -1,8 +1,8 @@
 use ethexe_common::{
+    ToDigest,
     ecdsa::{PrivateKey, Signature, SignedMessage},
     gprimitives::{ActorId, H256},
     injected::{InjectedTransaction, Promise},
-    ToDigest,
 };
 use gear_core::rpc::ReplyInfo;
 use gear_core_errors::{ReplyCode, SuccessReplyReason};
@@ -15,10 +15,10 @@ pub fn main() {
 
     let tx = InjectedTransaction {
         destination: ActorId::zero(),
-        payload: Vec::from([0, 1, 2]).into(),
+        payload: Vec::from([0, 1, 2]).try_into().unwrap(),
         value: 256,
         reference_block: H256::zero(),
-        salt: Vec::from([3, 4, 5]).into(),
+        salt: Vec::from([3, 4, 5]).try_into().unwrap(),
     };
 
     println!("hash: <{:?}>", tx.to_digest());

apis/vara-eth/src/eth/router.ts

@@ -1,5 +1,5 @@
 import type { Address, Hex, TransactionRequest } from 'viem';
-import { toHex, zeroAddress, numberToBytes, hexToBytes, bytesToHex, encodeFunctionData } from 'viem';
+import { toHex, zeroAddress, hexToBytes, bytesToHex, encodeFunctionData } from 'viem';
 import { randomBytes } from '@noble/hashes/utils';
 import { loadKZG } from 'kzg-wasm';
 
@@ -225,8 +225,7 @@ export class RouterClient extends BaseContractClient implements IRouterContract
    * @returns A transaction manager with validation-specific helper functions, including
    *          the code ID and a function to wait for the code to be validated
    */
-  private async requestCodeValidation(code: Uint8Array): Promise<TxManagerWithHelpers<CodeValidationHelpers>> {
-    throw new Error('Not implemented');
+  public async requestCodeValidation(code: Uint8Array): Promise<TxManagerWithHelpers<CodeValidationHelpers>> {
     const codeId = generateCodeHash(code);
 
     const data = encodeFunctionData({
@@ -235,21 +234,17 @@ export class RouterClient extends BaseContractClient implements IRouterContract
       args: [codeId],
     });
 
-    const blob = prepareBlob(code);
-
-    if (blob.length != 4096 * 32) {
-      throw new Error('Invalid blob size');
-    }
-
+    const blobs = simpleSidecarEncode(code);
     const kzg = await loadKZG();
 
     const tx = {
       type: 'eip4844' as const,
+      blobVersion: '7594' as const,
       data,
       to: this.address,
       gas: 5_000_000n,
       maxFeePerBlobGas: 400_000_000_000n,
-      blobs: [blob],
+      blobs,
       kzg: {
         blobToKzgCommitment: (blob: Uint8Array) => {
           const result = kzg.blobToKZGCommitment(bytesToHex(blob)) as Hex;
@@ -259,6 +254,10 @@ export class RouterClient extends BaseContractClient implements IRouterContract
           const result = kzg.computeBlobKZGProof(bytesToHex(blob), bytesToHex(commitment)) as Hex;
           return hexToBytes(result);
         },
+        computeCellsAndKzgProofs: (blob: Uint8Array): [Uint8Array[], Uint8Array[]] => {
+          const [cells, proofs] = kzg.computeCellsAndProofs(bytesToHex(blob)) as [`0x${string}`[], `0x${string}`[]];
+          return [cells.map((cell) => hexToBytes(cell)), proofs.map((proof) => hexToBytes(proof))];
+        },
       },
       chain: null,
     };
@@ -278,6 +277,7 @@ export class RouterClient extends BaseContractClient implements IRouterContract
             eventName: 'CodeGotValidated',
             onLogs: (logs) => {
               for (const log of logs) {
+                console.log(log);
                 if (log.args.codeId == codeId) {
                   if (log.args.valid) {
                     resolve(true);
@@ -381,25 +381,49 @@ export function getRouterClient(params: ContractClientParams): RouterClient {
   return new RouterClient(params);
 }
 
-function prepareBlob(data: Uint8Array) {
-  // https://docs.rs/alloy/latest/alloy/consensus/struct.SimpleCoder.html#behavior
-  const BLOB_SIZE = 131_072;
-  const paddedData = new Uint8Array(BLOB_SIZE);
-
-  const dataLength = numberToBytes(data.length, { size: 32 });
-  const length = new Uint8Array(32);
-  length.set(dataLength, 0);
-
-  paddedData.set(length, 0);
-
-  let offset = 32;
-
-  while (data.length > 0) {
-    const chunk = data.slice(0, 31);
-    paddedData.set(chunk, offset + 1);
-    offset += 32;
-    data = data.slice(31);
+const BYTES_PER_BLOB = 131_072;
+const FIELD_ELEMENTS_PER_BLOB = 4096;
+const FE_BYTES = 32;
+const USABLE_BYTES_PER_FE = 31;
+
+export function simpleSidecarEncode(data: Uint8Array): Uint8Array[] {
+  const blobs: Uint8Array[] = [];
+  let feCount = 0;
+
+  const pushEmptyBlob = () => {
+    blobs.push(new Uint8Array(BYTES_PER_BLOB));
+  };
+
+  const currentBlob = () => {
+    const index = Math.floor(feCount / FIELD_ELEMENTS_PER_BLOB);
+    while (blobs.length <= index) pushEmptyBlob();
+    return blobs[index];
+  };
+
+  const feOffsetInCurrentBlob = () => (feCount % FIELD_ELEMENTS_PER_BLOB) * FE_BYTES;
+
+  const ingestFE = (fe: Uint8Array) => {
+    const blob = currentBlob();
+    const offset = feOffsetInCurrentBlob();
+    blob.set(fe, offset);
+    feCount++;
+  };
+
+  if (data.length === 0) return blobs;
+
+  const lenFE = new Uint8Array(FE_BYTES);
+  const lenBytes = new DataView(lenFE.buffer);
+  lenBytes.setBigUint64(1, BigInt(data.length));
+  ingestFE(lenFE);
+
+  let offset = 0;
+  while (offset < data.length) {
+    const fe = new Uint8Array(FE_BYTES);
+    const chunkSize = Math.min(USABLE_BYTES_PER_FE, data.length - offset);
+    fe.set(data.subarray(offset, offset + chunkSize), 1);
+    offset += chunkSize;
+    ingestFE(fe);
   }
 
-  return paddedData;
-}
+  return blobs;
+}