@aztec/txe 0.45.1 → 0.46.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.45.1",
+  "version": "0.46.2",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -57,18 +57,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.45.1",
-    "@aztec/aztec.js": "0.45.1",
-    "@aztec/circuit-types": "0.45.1",
-    "@aztec/circuits.js": "0.45.1",
-    "@aztec/foundation": "0.45.1",
-    "@aztec/key-store": "0.45.1",
-    "@aztec/kv-store": "0.45.1",
-    "@aztec/noir-contracts.js": "0.45.1",
-    "@aztec/pxe": "0.45.1",
-    "@aztec/simulator": "0.45.1",
-    "@aztec/types": "0.45.1",
-    "@aztec/world-state": "0.45.1"
+    "@aztec/archiver": "0.46.2",
+    "@aztec/aztec.js": "0.46.2",
+    "@aztec/circuit-types": "0.46.2",
+    "@aztec/circuits.js": "0.46.2",
+    "@aztec/foundation": "0.46.2",
+    "@aztec/key-store": "0.46.2",
+    "@aztec/kv-store": "0.46.2",
+    "@aztec/noir-contracts.js": "0.46.2",
+    "@aztec/pxe": "0.46.2",
+    "@aztec/simulator": "0.46.2",
+    "@aztec/types": "0.46.2",
+    "@aztec/world-state": "0.46.2"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",

package/src/oracle/txe_oracle.ts

@@ -179,7 +179,6 @@ export class TXE implements TypedOracle {
     inputs.historicalHeader.state = stateReference;
     inputs.callContext.msgSender = this.msgSender;
     inputs.callContext.storageContractAddress = this.contractAddress;
-    inputs.callContext.sideEffectCounter = sideEffectsCounter;
     inputs.callContext.isStaticCall = isStaticCall;
     inputs.callContext.isDelegateCall = isDelegateCall;
     inputs.startSideEffectCounter = sideEffectsCounter;
@@ -721,7 +720,6 @@ export class TXE implements TypedOracle {
       TxContext.empty(),
       /* pendingNullifiers */ [],
       /* transactionFee */ Fr.ONE,
-      callContext.sideEffectCounter,
     );
   }
 
@@ -743,7 +741,6 @@ export class TXE implements TypedOracle {
     const callContext = CallContext.empty();
     callContext.msgSender = this.msgSender;
     callContext.functionSelector = this.functionSelector;
-    callContext.sideEffectCounter = this.sideEffectsCounter;
     callContext.storageContractAddress = targetContractAddress;
     callContext.isStaticCall = isStaticCall;
     callContext.isDelegateCall = isDelegateCall;
@@ -785,7 +782,6 @@ export class TXE implements TypedOracle {
     const callContext = CallContext.empty();
     callContext.msgSender = this.msgSender;
     callContext.functionSelector = this.functionSelector;
-    callContext.sideEffectCounter = sideEffectCounter;
     callContext.storageContractAddress = targetContractAddress;
     callContext.isStaticCall = isStaticCall;
     callContext.isDelegateCall = isDelegateCall;
@@ -827,7 +823,6 @@ export class TXE implements TypedOracle {
     const callContext = CallContext.empty();
     callContext.msgSender = this.msgSender;
     callContext.functionSelector = this.functionSelector;
-    callContext.sideEffectCounter = sideEffectCounter;
     callContext.storageContractAddress = targetContractAddress;
     callContext.isStaticCall = isStaticCall;
     callContext.isDelegateCall = isDelegateCall;
@@ -850,7 +845,6 @@ export class TXE implements TypedOracle {
     const parentCallContext = CallContext.empty();
     parentCallContext.msgSender = currentMessageSender;
     parentCallContext.functionSelector = currentFunctionSelector;
-    parentCallContext.sideEffectCounter = sideEffectCounter;
     parentCallContext.storageContractAddress = currentContractAddress;
     parentCallContext.isStaticCall = isStaticCall;
     parentCallContext.isDelegateCall = isDelegateCall;
@@ -860,6 +854,7 @@ export class TXE implements TypedOracle {
       contractAddress: targetContractAddress,
       functionSelector,
       callContext,
+      sideEffectCounter,
       args,
     });
   }

package/src/txe_service/txe_service.ts

@@ -574,13 +574,15 @@ export class TXEService {
     ovskApp: ForeignCallSingle,
     ovpkMX: ForeignCallSingle,
     ovpkMY: ForeignCallSingle,
+    ovpkMIsInfinite: ForeignCallSingle,
     ivpkMX: ForeignCallSingle,
     ivpkMY: ForeignCallSingle,
+    ivpkMIsInfinite: ForeignCallSingle,
     preimage: ForeignCallArray,
   ) {
-    const ovpkM = new Point(fromSingle(ovpkMX), fromSingle(ovpkMY));
+    const ovpkM = new Point(fromSingle(ovpkMX), fromSingle(ovpkMY), !fromSingle(ovpkMIsInfinite).isZero());
     const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(fromSingle(ovskApp).toString()));
-    const ivpkM = new Point(fromSingle(ivpkMX), fromSingle(ivpkMY));
+    const ivpkM = new Point(fromSingle(ivpkMX), fromSingle(ivpkMY), !fromSingle(ivpkMIsInfinite).isZero());
     const encLog = this.typedOracle.computeEncryptedNoteLog(
       AztecAddress.fromString(fromSingle(contractAddress).toString()),
       Fr.fromString(fromSingle(storageSlot).toString()),
@@ -599,7 +601,7 @@ export class TXEService {
 
   emitEncryptedLog(
     _contractAddress: ForeignCallSingle,
-    _randomandomness: ForeignCallSingle,
+    _randomness: ForeignCallSingle,
     _encryptedLog: ForeignCallSingle,
     _counter: ForeignCallSingle,
   ) {
@@ -675,6 +677,7 @@ export class TXEService {
       publicCallRequest.contractAddress.toField(),
       publicCallRequest.functionSelector.toField(),
       ...publicCallRequest.callContext.toFields(),
+      fromSingle(sideEffectCounter),
       publicCallRequest.getArgsHash(),
     ];
     return toForeignCallResult([toArray(fields)]);
@@ -701,6 +704,7 @@ export class TXEService {
       publicTeardownCallRequest.contractAddress.toField(),
       publicTeardownCallRequest.functionSelector.toField(),
       ...publicTeardownCallRequest.callContext.toFields(),
+      fromSingle(sideEffectCounter),
       publicTeardownCallRequest.getArgsHash(),
     ];