u128

Author: jialinli98

.github/workflows/circuits_e2e.yaml

@@ -8,8 +8,7 @@ on:
 jobs:
   test:
     name: Circuits E2E Tests
-    runs-on:
-      group: Default Larger Runners
+    runs-on: ubuntu-latest
     environment: CI
     env:
       ETHEREUM_JSON_RPC_API_URL: ${{ secrets.ETHEREUM_JSON_RPC_API_URL }}

.github/workflows/contract_test.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: true
 
     name: Foundry project
-    runs-on: 32-core-ubuntu-runner
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/e2e_test.yaml

@@ -9,8 +9,7 @@ on:
 jobs:
   test:
     name: E2E Tests
-    runs-on:
-      group: Default Larger Runners
+    runs-on: ubuntu-latest
     environment: CI
     env:
       ETHEREUM_JSON_RPC_API_URL: ${{ secrets.ETHEREUM_JSON_RPC_API_URL }}

ethereum/oracles/src/noir/oracles/common/encode.ts

@@ -23,13 +23,20 @@ export function encodeField(arg: number | bigint): Hex {
   return `0x${hex}`;
 }
 
-export function encodeU128(arg: bigint): Hex[] {
+export function encodeU128Split(arg: bigint): Hex[] {
   assert(arg < U128_MAX, 'U128 overflow');
   assert(arg >= 0, 'U128 underflow');
 
   return [encodeField(arg / (U64_MAX + 1n)), encodeField(arg % (U64_MAX + 1n))];
 }
 
+export function encodeU128(arg: bigint): Hex {
+  assert(arg < U128_MAX, 'U128 overflow');
+  assert(arg >= 0, 'U128 underflow');
+
+  return encodeField(arg);
+}
+
 export function encodeBytes32(value: bigint): Hex[] {
   return encodeBytes(value, BYTES32_LEN);
 }

ethereum/oracles/src/noir/oracles/rpc/transactionOracle.int.test.ts

@@ -31,8 +31,7 @@ describe('getTransactionOracle', () => {
         '0x40','0xdf','0xf8','0x3e','0x82','0x64','0xec','0xf9','0x86','0xca'
     ]);
     expect(txWithProof[OFFSETS.TO_IS_SOME]).toStrictEqual('0x01');
-    expect(txWithProof[OFFSETS.VALUE_HI]).toStrictEqual('0x');
-    expect(txWithProof[OFFSETS.VALUE_LO]).toStrictEqual('0x');
+    expect(txWithProof[OFFSETS.VALUE]).toStrictEqual('0x');
     // prettier-ignore
     expect(txWithProof[OFFSETS.DATA]).toStrictEqual(padArray([
         '0xa9','0x05','0x9c','0xbb','0x00','0x00','0x00','0x00','0x00','0x00',

ethereum/oracles/src/noir/oracles/rpc/transactionOracle.ts

@@ -13,8 +13,7 @@ export enum OFFSETS {
   GAS_LIMIT,
   TO,
   TO_IS_SOME,
-  VALUE_HI,
-  VALUE_LO,
+  VALUE,
   DATA,
   DATA_LEN,
   V,

ethereum/oracles/src/noir/oracles/rpc/transactionOracle/encode.test.ts

@@ -18,8 +18,7 @@ describe('TransactionOracle encode', () => {
       expect(noirTransaction[TX_OFFSETS.NONCE]).toStrictEqual('0x');
       expect(noirTransaction[TX_OFFSETS.GAS_LIMIT]).toStrictEqual('0x5a3c');
       expect(noirTransaction[TX_OFFSETS.TO_IS_SOME]).toStrictEqual('0x01');
-      expect(noirTransaction[TX_OFFSETS.VALUE_HI]).toStrictEqual('0x');
-      expect(noirTransaction[TX_OFFSETS.VALUE_LO]).toStrictEqual('0x038d7ea4c68000');
+      expect(noirTransaction[TX_OFFSETS.VALUE]).toStrictEqual('0x038d7ea4c68000');
       expect(noirTransaction[TX_OFFSETS.DATA_LEN]).toStrictEqual('0x');
     });
 
@@ -35,8 +34,7 @@ describe('TransactionOracle encode', () => {
       expect(noirTransaction[TX_OFFSETS.NONCE]).toStrictEqual('0x485a');
       expect(noirTransaction[TX_OFFSETS.GAS_LIMIT]).toStrictEqual('0x0493e0');
       expect(noirTransaction[TX_OFFSETS.TO_IS_SOME]).toStrictEqual('0x01');
-      expect(noirTransaction[TX_OFFSETS.VALUE_HI]).toStrictEqual('0x');
-      expect(noirTransaction[TX_OFFSETS.VALUE_LO]).toStrictEqual('0x');
+      expect(noirTransaction[TX_OFFSETS.VALUE]).toStrictEqual('0x');
       // prettier-ignore
       expect(noirTransaction[TX_OFFSETS.DATA]).toStrictEqual(padArray([
         '0xa9','0x05','0x9c','0xbb','0x00','0x00','0x00','0x00','0x00','0x00',

ethereum/oracles/src/noir/oracles/rpc/transactionOracle/encode.ts

@@ -14,8 +14,7 @@ export enum TX_OFFSETS {
   GAS_LIMIT,
   TO,
   TO_IS_SOME,
-  VALUE_HI,
-  VALUE_LO,
+  VALUE,
   DATA,
   DATA_LEN
 }
@@ -34,7 +33,7 @@ export function encodeTx(transaction: Transaction): ForeignCallOutput[] {
   const r = encodeHex(transaction.r);
   const s = encodeHex(transaction.s);
 
-  return [nonce, gasLimit, to, toIsSome, ...value, data, data_len, v, r, s];
+  return [nonce, gasLimit, to, toIsSome, value, data, data_len, v, r, s];
 }
 
 export function encodeTxProof(txProof: Proof): ForeignCallOutput {

ethereum/oracles/src/noir/oracles/server/app.ts

@@ -15,6 +15,7 @@ const HTTP_STATUS_NO_CONTENT = 204;
 const jsonRPCServer: TypedJSONRPCServer<JSONRPCServerMethods, ServerParams> = new JSONRPCServer();
 
 // New Nargo 1.0+ protocol: resolve_foreign_call
+// @ts-ignore - resolve_foreign_call has a different signature than other methods
 jsonRPCServer.addMethod('resolve_foreign_call', async (params: any, serverParams: ServerParams) => {
   const { function: functionName, inputs } = params[0];
 

ethereum/oracles/src/noir/oracles/server/handlers.ts

@@ -1,4 +1,4 @@
-import { ForeignCallResult, ForeignCallParams } from './types.js';
+import { ForeignCallResult, ForeignCallParams, ResolveForeignCallResult } from './types.js';
 import { decodeNoirArguments, encodeForeignCallResult, encodeForeignCallResultNew } from './encode.js';
 import { MultiChainClient } from '../../../ethereum/client.js';
 import { Oracle, RpcOracle } from '../types.js';
@@ -12,7 +12,8 @@ import { Oracle, RpcOracle } from '../types.js';
 // This needs to be a type, not an interface because TypedJSONRPCServer requires it to have an index signature.
 /* eslint-disable-next-line @typescript-eslint/consistent-type-definitions */
 export type JSONRPCServerMethods = {
-  resolve_foreign_call(params: any, serverParams: ServerParams): Promise<ForeignCallResult>;
+  // Note: resolve_foreign_call is not included here as it has a different signature (requires serverParams)
+  // It's added directly in app.ts using jsonRPCServer.addMethod()
   get_header(params: ForeignCallParams): ForeignCallResult;
   get_account(params: ForeignCallParams): ForeignCallResult;
   get_proof(params: ForeignCallParams): ForeignCallResult;
@@ -42,7 +43,7 @@ export async function getOracleHandler(oracle: Oracle, params: ForeignCallParams
 }
 
 // New protocol handler (for resolve_foreign_call)
-export async function getOracleHandlerNew(oracle: Oracle, params: ForeignCallParams): Promise<{ values: (string | string[])[] }> {
+export async function getOracleHandlerNew(oracle: Oracle, params: ForeignCallParams): Promise<ResolveForeignCallResult> {
   const noirArguments = decodeNoirArguments(params);
   const noirOutputs = await oracle(noirArguments);
   const result = encodeForeignCallResultNew(noirOutputs);
@@ -53,7 +54,7 @@ export async function getRpcOracleHandlerNew(
   rpcOracle: RpcOracle,
   params: ForeignCallParams,
   { client }: ServerParams
-): Promise<{ values: (string | string[])[] }> {
+): Promise<ResolveForeignCallResult> {
   const oracle = rpcOracle.bind(null, client);
   return getOracleHandlerNew(oracle, params);
 }