Merge branch 'unstable' into column-syncer

Author: agnxsh

beacon_chain/libnimbus_lc/libnimbus_lc.h

@@ -1640,39 +1640,6 @@ const void *ETHAuthorizationGetSignatureBytes(
     const ETHAuthorization *authorization,
     int *numBytes);
 
-/**
- * Indicates the total number of initcodes of a transaction.
- *
- * - Individual initcodes may be inspected using
- *   `ETHTransactionGetInitcode`.
- *
- * @param      transaction          Transaction.
- *
- * @return Number of available initcodes.
- */
-ETH_RESULT_USE_CHECK
-int ETHTransactionGetNumInitcodes(const ETHTransaction *transaction);
-
-/**
- * Obtains an individual initcode by sequential index
- * in a transaction.
- *
- * - The returned value is allocated in the given transaction.
- *   It must neither be released nor written to, and the transaction
- *   must not be released while the returned value is in use.
- *
- * @param      transaction          Transaction.
- * @param      initcodeIndex        Sequential initcode index.
- * @param[out] numBytes             Length of buffer.
- *
- * @return Buffer with initcode.
- */
-ETH_RESULT_USE_CHECK
-const void *ETHTransactionGetInitcodeBytes(
-    const ETHTransaction *transaction,
-    int initcodeIndex,
-    int *numBytes);
-
 /**
  * Obtains the signature of a transaction.
  *

beacon_chain/libnimbus_lc/libnimbus_lc.nim

@@ -1444,7 +1444,6 @@ type
     blobVersionedHashes: seq[Eth2Digest]
     hasAuthorizationList: bool
     authorizationList: seq[ETHAuthorization]
-    initcodes: seq[seq[byte]]
     signature: seq[byte]
     bytes: TypedTransaction
 
@@ -1492,59 +1491,49 @@ proc ETHTransactionsCreateFromJson(
       return nil
 
     # Check fork consistency
-    static: doAssert totalSerializedFields(TransactionObject) == 24,
+    static: doAssert totalSerializedFields(TransactionObject) == 23,
       "Only update this number once code is adjusted to check new fields!"
     let txType =
       case data.`type`.get(0.Quantity):
       of 0.Quantity:
         if data.yParity.isSome or data.accessList.isSome or
             data.maxFeePerGas.isSome or data.maxPriorityFeePerGas.isSome or
             data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome or
-            data.authorizationList.isSome or data.initCodes.isSome:
+            data.authorizationList.isSome:
           return nil
         TxLegacy
       of 1.Quantity:
         if data.chainId.isNone or data.accessList.isNone:
           return nil
         if data.maxFeePerGas.isSome or data.maxPriorityFeePerGas.isSome or
             data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome or
-            data.authorizationList.isSome or data.initCodes.isSome:
+            data.authorizationList.isSome:
           return nil
         TxEip2930
       of 2.Quantity:
         if data.chainId.isNone or data.accessList.isNone or
             data.maxFeePerGas.isNone or data.maxPriorityFeePerGas.isNone:
           return nil
         if data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome or
-            data.authorizationList.isSome or data.initCodes.isSome:
+            data.authorizationList.isSome:
           return nil
         TxEip1559
       of 3.Quantity:
         if data.to.isNone or data.chainId.isNone or data.accessList.isNone or
             data.maxFeePerGas.isNone or data.maxPriorityFeePerGas.isNone or
             data.maxFeePerBlobGas.isNone or data.blobVersionedHashes.isNone:
           return nil
-        if data.authorizationList.isSome or data.initCodes.isSome:
+        if data.authorizationList.isSome:
           return nil
         TxEip4844
       of 4.Quantity:
         if data.to.isNone or data.chainId.isNone or data.accessList.isNone or
             data.maxFeePerGas.isNone or data.maxPriorityFeePerGas.isNone or
             data.authorizationList.isNone:
           return nil
-        if data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome or
-            data.initCodes.isSome:
+        if data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome:
           return nil
         TxEip7702
-      of 6.Quantity:
-        if data.to.isNone or data.chainId.isNone or data.accessList.isNone or
-            data.maxFeePerGas.isNone or data.maxPriorityFeePerGas.isNone or
-            data.initCodes.isNone:
-          return nil
-        if data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome or
-            data.authorizationList.isSome:
-          return nil
-        TxEip7873
       else:
         return nil
 
@@ -1567,17 +1556,6 @@ proc ETHTransactionsCreateFromJson(
       for authorization in data.authorizationList.get:
         if authorization.v > uint8.high:
           return nil
-    if data.initCodes.isSome:
-      const MAX_INITCODE_COUNT = 256
-      if data.initCodes.get.len == 0 or
-          data.initCodes.get.len > MAX_INITCODE_COUNT:
-        return nil
-      for initCode in data.initCodes.get:
-        const
-          MAX_CODE_SIZE = 0x6000
-          MAX_INITCODE_SIZE = 2 * MAX_CODE_SIZE
-        if initCode.len == 0 or initCode.len > MAX_INITCODE_SIZE:
-          return nil
     let
       tx = eth_types.EthTransaction(
         txType: txType,
@@ -1613,11 +1591,6 @@ proc ETHTransactionsCreateFromJson(
             data.authorizationList.get
           else:
             @[],
-        initCodes:
-          if data.initCodes.isSome:
-            data.initCodes.get
-          else:
-            @[],
         V: distinctBase(data.v),
         R: data.r,
         S: data.s)
@@ -1712,7 +1685,6 @@ proc ETHTransactionsCreateFromJson(
       blobVersionedHashes: tx.versionedHashes.mapIt(Eth2Digest(data: it.data)),
       hasAuthorizationList: tx.txType == TxEip7702,
       authorizationList: authorizationList,
-      initcodes: tx.initCodes,
       signature: @rawSig,
       bytes: rlpBytes.TypedTransaction)
 
@@ -2224,46 +2196,6 @@ func ETHAuthorizationGetSignatureBytes(
   cast[ptr UncheckedArray[byte]](
     addr distinctBase(authorization[].signature)[0])
 
-func ETHTransactionGetNumInitcodes(
-    transaction: ptr ETHTransaction): cint {.exported.} =
-  ## Indicates the total number of initcodes of a transaction.
-  ##
-  ## * Individual initcodes may be inspected using
-  ##   `ETHTransactionGetInitcode`.
-  ##
-  ## Parameters:
-  ## * `transaction` - Transaction.
-  ##
-  ## Returns:
-  ## * Number of available initcodes.
-  transaction[].initcodes.len.cint
-
-func ETHTransactionGetInitcodeBytes(
-    transaction: ptr ETHTransaction,
-    initcodeIndex: cint,
-    numBytes #[out]#: ptr cint): ptr UncheckedArray[byte] {.exported.} =
-  ## Obtains an individual initcode by sequential index
-  ## in a transaction.
-  ##
-  ## * The returned value is allocated in the given transaction.
-  ##   It must neither be released nor written to, and the transaction
-  ##   must not be released while the returned value is in use.
-  ##
-  ## Parameters:
-  ## * `transaction` - Transaction.
-  ## * `initcodeIndex` - Sequential initcode index.
-  ## * `numBytes` [out] - Length of buffer.
-  ##
-  ## Returns:
-  ## * Buffer with initcode.
-  numBytes[] = transaction[].initcodes[initcodeIndex.int].len.cint
-  if transaction[].initcodes[initcodeIndex.int].len == 0:
-    # https://github.com/nim-lang/Nim/issues/22389
-    const defaultBytes: cstring = ""
-    return cast[ptr UncheckedArray[byte]](defaultBytes)
-  cast[ptr UncheckedArray[byte]](
-    addr transaction[].initcodes[initcodeIndex.int][0])
-
 func ETHTransactionGetSignatureBytes(
     transaction: ptr ETHTransaction,
     numBytes #[out]#: ptr cint): ptr UncheckedArray[byte] {.exported.} =

beacon_chain/libnimbus_lc/test_libnimbus_lc.c

@@ -579,17 +579,6 @@ int main(void)
             printf("\n");
         }
 
-        printf("    - initcodes:\n");
-        int numInitcodes = ETHTransactionGetNumInitcodes(transaction);
-        for (int initcodeIndex = 0; initcodeIndex < numInitcodes; initcodeIndex++) {
-            int numInitcodeBytes;
-            const void *initcodeBytes =
-                ETHTransactionGetInitcodeBytes(transaction, initcodeIndex, &numInitcodeBytes);
-                printf("        - ");
-            printHexString(initcodeBytes, numInitcodeBytes);
-            printf("\n");
-        }
-
         int numTransactionSignatureBytes;
         const void *transactionSignatureBytes =
             ETHTransactionGetSignatureBytes(transaction, &numTransactionSignatureBytes);

ncli/requirements.txt

@@ -79,7 +79,7 @@ stack-data==0.1.4
 terminado==0.12.1
 testpath==0.5.0
 tomli==1.2.3
-tornado==6.4.2
+tornado==6.5.1
 traitlets==5.1.1
 typing_extensions==4.0.1
 wcwidth==0.2.5