Merge pull request #11 from axiom-crypto/release/v2.1.1

[release] v2.1.1
axiom-crypto · Apr 19, 2024 · 1cb8f22 · 1cb8f22
2 parents 43891b2 + 1467050
commit 1cb8f22
Show file tree

Hide file tree

Showing 13 changed files with 185 additions and 309 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,8 +29,9 @@ jobs:
     - name: Test with Jest
       run: |
         export PROVIDER_URI=${{ secrets.PROVIDER_URI }}
-        export PROVIDER_URI_GOERLI=${{ secrets.PROVIDER_URI_GOERLI }}
         export PROVIDER_URI_SEPOLIA=${{ secrets.PROVIDER_URI_SEPOLIA }}
+        export PROVIDER_URI_10=${{ secrets.PROVIDER_URI_10 }}
+        export PROVIDER_URI_8453=${{ secrets.PROVIDER_URI_8453 }}
         export PINATA_JWT=${{ secrets.PINATA_JWT }}
         export QUICKNODE_API_KEY=${{ secrets.QUICKNODE_API_KEY }}
         export QUICKNODE_IPFS_URL=${{ secrets.QUICKNODE_IPFS_URL }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axiom-crypto/tools",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Useful data, field, and byte manipulation tools for Axiom.",
   "author": "Intrinsic Technologies",
   "license": "MIT",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/codec/v2/types.ts b/src/codec/v2/types.ts
@@ -60,7 +60,13 @@ export interface AxiomV2Result {
   computeResultsHash: string;
 }
 
-export interface Subquery {}
+export interface Subquery {
+  /**
+   * The block number of the block that the subquery needs data from.
+   * `undefined` if no block is needed.
+   */
+  blockNumber?: number;
+}
 
 export interface StorageSubqueryV1 extends Subquery {
   blockNumber: number;
@@ -190,8 +196,9 @@ export enum ReceiptField {
 }
 
 export enum TxType {
-  Legacy,
-  Eip2930,
-  Eip1559,
-  Eip4844,
+  Legacy = 0,
+  Eip2930 = 1,
+  Eip1559 = 2,
+  Eip4844 = 3,
+  OpSystem = 126, // 0x7E
 }
diff --git a/src/rpc/subqueryField.ts b/src/rpc/subqueryField.ts
@@ -369,6 +369,9 @@ export async function getTxFieldValue(
   if (type === TxType.Eip4844) {
     logger.error(`EIP-4844 transactions are not yet supported`);
     return null;
+  } else if (type === TxType.OpSystem) {
+    logger.error(`OP stack System transactions are not yet supported`);
+    return null;
   }
   const value = getValue(tx, type);
 
@@ -487,6 +490,9 @@ export async function getReceiptFieldValue(
   if (Number(receipt?.type) === TxType.Eip4844) {
     logger.error(`EIP-4844 transaction receipts are not yet supported`);
     return null;
+  } else if (Number(receipt?.type) === TxType.OpSystem) {
+    logger.error(`OP stack System transaction receipts are not yet supported`);
+    return null;
   }
 
   const value = getValue(receipt);

diff --git a/src/utils/gasCalc.ts b/src/utils/gasCalc.ts
@@ -0,0 +1,16 @@
+import { ByteStringReader } from "./byteStringReader";
+
+export function calculateCalldataGas(hexString: string): number {
+  let gas = 0;
+  const reader = new ByteStringReader(hexString);
+  while (reader.getNumBytesRemaining() > 0) {
+    const byte = reader.readBytes(1);
+    if (byte === "0x00") {
+      gas += 4;
+    } else {
+      gas += 16;
+    }
+  }
+
+  return gas;
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -4,3 +4,4 @@ export * from "./storage";
 export * from "./byteStringReader";
 export * from "./evm";
 export * from "./rlp";
+export * from "./gasCalc";
diff --git a/test/codec/v2/data/codecData.ts b/test/codec/v2/data/codecData.ts
@@ -11,6 +11,12 @@ import {
   AxiomV2DataQuery,
   bytes32,
   AxiomV2FeeData,
+  HeaderSubquery,
+  AccountSubquery,
+  StorageSubquery,
+  TxSubquery,
+  ReceiptSubquery,
+  SolidityNestedMappingSubquery,
 } from "../../../../src";
 
 
@@ -88,38 +94,38 @@ export const dataSubqueries: DataSubquery[] = [
       subqueryData: {
         blockNumber: BLOCK_NUMBER,
         fieldIdx: HeaderField.Miner,
-      },
+      } as HeaderSubquery,
     },
     {
       type: DataSubqueryType.Header,
       subqueryData: {
         blockNumber: BLOCK_NUMBER + 1,
         fieldIdx: HeaderField.GasLimit,
-      },
+      } as HeaderSubquery,
     },
     {
       type: DataSubqueryType.Account,
       subqueryData: {
         blockNumber: BLOCK_NUMBER,
         addr: WETH_ADDR,
         fieldIdx: AccountField.CodeHash,
-      },
+      } as AccountSubquery,
     },
     {
       type: DataSubqueryType.Storage,
       subqueryData: {
         blockNumber: BLOCK_NUMBER,
         addr: WETH_ADDR,
         slot: bytes32(1),
-      },
+      } as StorageSubquery,
     },
     {
       type: DataSubqueryType.Transaction,
       subqueryData: {
         blockNumber: 15060942,
         txIdx: 114,
         fieldOrCalldataIdx: TxField.To,
-      },
+      } as TxSubquery,
     },
     {
       type: DataSubqueryType.Receipt,
@@ -129,7 +135,7 @@ export const dataSubqueries: DataSubquery[] = [
         fieldOrLogIdx: 0,
         topicOrDataOrAddressIdx: 0,
         eventSchema: "0x255910aca2752f3c05fcb4a54d3d8d93bb809a9c8cc215d5eed2504d44cbd865",
-      },
+      } as ReceiptSubquery,
     },
     {
       type: DataSubqueryType.SolidityNestedMapping,
@@ -139,7 +145,7 @@ export const dataSubqueries: DataSubquery[] = [
         mappingSlot: bytes32(5),
         mappingDepth: 3,
         keys: [bytes32(WETH_ADDR), bytes32(WSOL_ADDR), bytes32(10000)],
-      },
+      } as SolidityNestedMappingSubquery,
     },
   ];
 export const dataQuery: AxiomV2DataQuery = {

diff --git a/test/codec/v2/encode.test.ts b/test/codec/v2/encode.test.ts
@@ -29,6 +29,12 @@ import {
   getCallbackHash,
   AxiomV2FeeData,
   encodeFullQueryV2,
+  HeaderSubquery,
+  AccountSubquery,
+  StorageSubquery,
+  TxSubquery,
+  ReceiptSubquery,
+  SolidityNestedMappingSubquery,
 } from "../../../src";
 import {
   BLOCK_NUMBER,
@@ -277,38 +283,38 @@ describe("Encoder V2", () => {
         subqueryData: {
           blockNumber,
           fieldIdx,
-        },
+        } as HeaderSubquery,
       },
       {
         type: DataSubqueryType.Header,
         subqueryData: {
           blockNumber: blockNumber + 1,
           fieldIdx: fieldIdx + 1,
-        },
+        } as HeaderSubquery,
       },
       {
         type: DataSubqueryType.Account,
         subqueryData: {
           blockNumber,
           addr,
           fieldIdx,
-        },
+        } as AccountSubquery,
       },
       {
         type: DataSubqueryType.Storage,
         subqueryData: {
           blockNumber,
           addr,
           slot,
-        },
+        } as StorageSubquery,
       },
       {
         type: DataSubqueryType.Transaction,
         subqueryData: {
           blockNumber: 15060942,
           txIdx: 114,
           fieldOrCalldataIdx,
-        },
+        } as TxSubquery,
       },
       {
         type: DataSubqueryType.Receipt,
@@ -318,7 +324,7 @@ describe("Encoder V2", () => {
           fieldOrLogIdx,
           topicOrDataOrAddressIdx,
           eventSchema: "0x255910aca2752f3c05fcb4a54d3d8d93bb809a9c8cc215d5eed2504d44cbd865",
-        },
+        } as ReceiptSubquery,
       },
       {
         type: DataSubqueryType.SolidityNestedMapping,
@@ -328,7 +334,7 @@ describe("Encoder V2", () => {
           mappingSlot,
           mappingDepth,
           keys,
-        },
+        } as SolidityNestedMappingSubquery,
       },
     ];
 

diff --git a/test/ipfs/scenarios.test.ts b/test/ipfs/scenarios.test.ts
@@ -50,7 +50,7 @@ describe("Additional IPFS scenarios to test", () => {
         };
       }
     }
-  }, 30000);
+  }, 50000);
 
   test(`Read all pinned data`, async () => {
     for await (const client of ipfsClients) {
@@ -64,7 +64,7 @@ describe("Additional IPFS scenarios to test", () => {
         }
       }
     }
-  }, 30000);
+  }, 60000);
 
   test(`Unpin all data`, async () => {
     for await (const client of ipfsClients) {
@@ -73,5 +73,5 @@ describe("Additional IPFS scenarios to test", () => {
         expect(unpin.value as boolean).toEqual(true);
       }
     }
-  }, 30000);
+  }, 50000);
 });