@aztec/simulator 0.70.0 → 0.71.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/dest/acvm/deserialize.d.ts +9 -0
  2. package/dest/acvm/deserialize.d.ts.map +1 -1
  3. package/dest/acvm/deserialize.js +12 -1
  4. package/dest/acvm/oracle/oracle.d.ts +5 -9
  5. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  6. package/dest/acvm/oracle/oracle.js +25 -28
  7. package/dest/acvm/oracle/typed_oracle.d.ts +5 -2
  8. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  9. package/dest/acvm/oracle/typed_oracle.js +14 -5
  10. package/dest/avm/opcodes/memory.d.ts.map +1 -1
  11. package/dest/avm/opcodes/memory.js +9 -5
  12. package/dest/client/db_oracle.d.ts +43 -12
  13. package/dest/client/db_oracle.d.ts.map +1 -1
  14. package/dest/client/private_execution.js +2 -2
  15. package/dest/client/simulator.js +2 -2
  16. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  17. package/dest/client/unconstrained_execution.js +5 -2
  18. package/dest/client/view_data_oracle.d.ts +5 -2
  19. package/dest/client/view_data_oracle.d.ts.map +1 -1
  20. package/dest/client/view_data_oracle.js +32 -11
  21. package/dest/public/fixtures/index.d.ts.map +1 -1
  22. package/dest/public/fixtures/index.js +15 -16
  23. package/dest/public/public_processor.d.ts +3 -3
  24. package/dest/public/public_processor.d.ts.map +1 -1
  25. package/dest/public/public_processor.js +8 -8
  26. package/dest/public/public_tx_simulator.d.ts +1 -1
  27. package/dest/public/public_tx_simulator.d.ts.map +1 -1
  28. package/dest/public/public_tx_simulator.js +3 -3
  29. package/package.json +9 -9
  30. package/src/acvm/deserialize.ts +12 -0
  31. package/src/acvm/oracle/oracle.ts +70 -29
  32. package/src/acvm/oracle/typed_oracle.ts +25 -4
  33. package/src/avm/opcodes/memory.ts +8 -4
  34. package/src/client/db_oracle.ts +55 -12
  35. package/src/client/private_execution.ts +1 -1
  36. package/src/client/simulator.ts +1 -1
  37. package/src/client/unconstrained_execution.ts +4 -1
  38. package/src/client/view_data_oracle.ts +44 -14
  39. package/src/public/fixtures/index.ts +14 -20
  40. package/src/public/public_processor.ts +13 -6
  41. package/src/public/public_tx_simulator.ts +2 -2
@@ -3,7 +3,7 @@ import { NestedProcessReturnValues, TxExecutionPhase, UnencryptedFunctionL2Logs,
3
3
  import { createLogger } from '@aztec/foundation/log';
4
4
  import { Timer } from '@aztec/foundation/timer';
5
5
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
6
- import { Attributes, trackSpan } from '@aztec/telemetry-client';
6
+ import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
7
7
  import { strict as assert } from 'assert';
8
8
  import { AvmSimulator } from '../avm/index.js';
9
9
  import { NullifierCollisionError } from '../avm/journal/nullifiers.js';
@@ -17,7 +17,7 @@ let PublicTxSimulator = (() => {
17
17
  let _simulateEnqueuedCall_decorators;
18
18
  let _simulateEnqueuedCallInternal_decorators;
19
19
  return _a = class PublicTxSimulator {
20
- constructor(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations = false, enforceFeePayment = true) {
20
+ constructor(db, worldStateDB, globalVariables, doMerkleOperations = false, enforceFeePayment = true, telemetryClient = getTelemetryClient()) {
21
21
  this.db = (__runInitializers(this, _instanceExtraInitializers), db);
22
22
  this.worldStateDB = worldStateDB;
23
23
  this.globalVariables = globalVariables;
@@ -333,4 +333,4 @@ let PublicTxSimulator = (() => {
333
333
  _a;
334
334
  })();
335
335
  export { PublicTxSimulator };
336
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
336
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":";AAAA,OAAO,EAIL,yBAAyB,EAIzB,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAe,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAqC,kBAAkB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEvH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG1C,OAAO,EAAmC,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;IAoB5C,iBAAiB;;;;;sBAAjB,iBAAiB;YAK5B,YACU,EAA4B,EAC5B,YAA0B,EAC1B,eAAgC,EAChC,qBAA8B,KAAK,EACnC,oBAA6B,IAAI,EACzC,kBAAmC,kBAAkB,EAAE;gBAL/C,OAAE,IAND,mDAAiB,EAMlB,EAAE,EAA0B;gBAC5B,iBAAY,GAAZ,YAAY,CAAc;gBAC1B,oBAAe,GAAf,eAAe,CAAiB;gBAChC,uBAAkB,GAAlB,kBAAkB,CAAiB;gBACnC,sBAAiB,GAAjB,iBAAiB,CAAgB;gBAGzC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;gBACzD,IAAI,CAAC,OAAO,GAAG,IAAI,eAAe,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;YAC3E,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YACD;;;;eAIG;YACI,KAAK,CAAC,QAAQ,CAAC,EAAM;gBAC1B,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;gBAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,2BAA2B,CAAC,MAAM,wBAAwB,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEhH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,CAC1C,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,YAAY,EACjB,EAAE,EACF,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,kBAAkB,CACxB,CAAC;gBAEF,wFAAwF;gBACxF,yFAAyF;gBACzF,2DAA2D;gBAC3D,sFAAsF;gBACtF,8EAA8E;gBAC9E,qFAAqF;gBACrF,iEAAiE;gBACjE,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBAE5C,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC/C,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;gBACpD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAM,CAAC,YAAY,GAAG,cAAc,CAAC,GAAG,IAAK,EAAE,gBAAgB,CAAC,CAAC;gBAC5G,MAAM,eAAe,GAAqB,EAAE,CAAC;gBAC7C,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7C,MAAM,WAAW,GAAmB,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;oBAC3E,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACpC,CAAC;gBAED,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC5C,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC1C,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAM,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,IAAK,EAAE,YAAY,CAAC,CAAC;gBAClG,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACjD,MAAM,cAAc,GAAmB,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;oBACjF,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACvC,CAAC;gBAED,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAChD,MAAM,cAAc,GAAmB,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;oBACjF,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACvC,CAAC;gBAED,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE3B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC;gBAE5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;gBAC5E,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAO,CAAC;gBAEhE,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;gBAChD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;oBACvB,8EAA8E;oBAC9E,8DAA8D;oBAC9D,kGAAkG;oBAClG,iEAAiE;oBACjE,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;oBAC/C,uDAAuD;oBACvD,EAAE,CAAC,kBAAkB,CACnB,EAAE,CAAC,IAAI,CAAC,SAAU,CAAC,4BAA4B,EAC/C,sBAAsB,CAAC,eAAe,CAAC,qBAAqB,CAC7D,CAAC;gBACJ,CAAC;gBACD,uDAAuD;gBACvD,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,IAAI,yBAAyB,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;gBAExG,OAAO;oBACL,iBAAiB;oBACjB,OAAO,EAAE;wBACP,QAAQ,EAAE,OAAO,CAAC,gBAAgB,EAAE;wBACpC,WAAW,EAAE,OAAO,CAAC,eAAe;wBACpC,SAAS,EAAE,OAAO,CAAC,sBAAsB,EAAE;qBAC5C;oBACD,UAAU;oBACV,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,eAAe,EAAE,eAAe;iBACjC,CAAC;YACJ,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,kBAAkB,CAAC,OAAwB;gBACvD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACnE,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,qBAAqB,CAAC,OAAwB;gBAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,mDAAmD,CAAC,CAAC;gBAEtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAE7E,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,+EAA+E;oBAC/E,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACjD,4GAA4G;wBAC5G,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACnC,CAAC;gBACH,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,qBAAqB,CAAC,OAAwB;gBAC1D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;oBAC9B,uDAAuD;oBACvD,8DAA8D;oBAC9D,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAE5E,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,+EAA+E;oBAC/E,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,qCAAqC;oBACrC,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBACnC,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;;;eAKG;YACK,KAAK,CAAC,aAAa,CAAC,KAAuB,EAAE,OAAwB;gBAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBAC5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;gBAEtE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,gBAAgB,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,MAAM,EAAE,EAAE;oBACrF,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACjC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;oBAC9B,YAAY,EAAE,YAAY,CAAC,MAAM;oBACjC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM;iBAC5C,CAAC,CAAC;gBAEH,MAAM,YAAY,GAAgC,EAAE,CAAC;gBACrD,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,YAAyC,CAAC;gBAC9C,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC/B,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBAClD,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM;oBACR,CAAC;oBAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;oBACpC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;oBAE9C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;oBAE1G,YAAY,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;oBAE5E,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;wBAChC,QAAQ,GAAG,IAAI,CAAC;wBAChB,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAC;oBACjD,CAAC;gBACH,CAAC;gBAED,OAAO;oBACL,KAAK;oBACL,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE;oBAC3B,YAAY;oBACZ,QAAQ;oBACR,YAAY;iBACb,CAAC;YACJ,CAAC;YAED;;;;;;;eAOG;YAOK,KAAK,CAAC,oBAAoB,CAChC,KAAuB,EACvB,OAAwB,EACxB,WAA8B,EAC9B,gBAAwC;gBAExC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,eAAe,CAAC;gBAC7D,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBAEnG,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAEtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACpD,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EACrC,gBAAgB,EAChB,YAAY;gBACZ,mBAAmB,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,EACpD,MAAM,CACP,CAAC;gBAEF,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB;gBACrE,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,mCAAmC,MAAM,cAAc,OAAO,CAAC,KAAK,uBAAuB,MAAM,CAAC,OAAO,CAAC,KAAK,eAAe,CAC/H,CAAC;gBAEF,YAAY,CAAC,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAEpF,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,MAAM,OAAO,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,eAAe,IAAI,gBAAgB,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBACnH,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,4CAA4C;gBACnG,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;;;;;;;;;;;eAaG;YAOK,KAAK,CAAC,4BAA4B,CACxC,YAAwC,EACxC,gBAAwC,EACxC,YAAiB,EACjB,cAAkB,EAClB,MAAc;gBAEd,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,eAAe,CAAC;gBAC7D,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAAC;gBAEtD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,uDAAuD,MAAM,IAAI,OAAO,SAAS,YAAY,CAAC,KAAK,oBAAoB,CACxH,CAAC;gBACF,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE1B,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,MAAM,CACzC,YAAY,EACZ,OAAO,EACP,MAAM,EACN,cAAc,EACd,IAAI,CAAC,eAAe,EACpB,gBAAgB,CAAC,WAAW,CAAC,YAAY,EACzC,gBAAgB,CAAC,IAAI,EACrB,YAAY,CACb,CAAC;gBACF,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;gBAChD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;gBAExC,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,MAAM,CAAC,QAAQ;oBACb,CAAC,CAAC,sCAAsC,MAAM,yBAAyB,MAAM,CAAC,YAAY,GAAG;oBAC7F,CAAC,CAAC,sCAAsC,MAAM,0BAA0B,EAC1E;oBACE,SAAS,EAAE,gBAAgB;oBAC3B,cAAc,EAAE,MAAM;oBACtB,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;iBACQ,CAC/B,CAAC;gBAEF,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACpG,CAAC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,+BAA+B,CAAC,OAAwB;gBACnE,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBAC3D,IAAI,CAAC;oBACH,MAAM,YAAY,CAAC,gCAAgC,CAAC,OAAO,CAAC,uCAAuC,CAAC,UAAU,CAAC,CAAC;gBAClH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,uBAAuB,EAAE,CAAC;wBACzC,MAAM,IAAI,uBAAuB,CAC/B,oGAAoG,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,KAAK,EAAE,CACnI,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,uCAAuC,CAAC,UAAU,EAAE,CAAC;oBAClF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;wBACxB,YAAY,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;YACH,CAAC;YAED;;;eAGG;YACI,KAAK,CAAC,4BAA4B,CAAC,OAAwB;gBAChE,kFAAkF;gBAClF,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACrB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBAC3D,IAAI,CAAC;oBACH,MAAM,YAAY,CAAC,gCAAgC,CAAC,OAAO,CAAC,oCAAoC,CAAC,UAAU,CAAC,CAAC;gBAC/G,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,YAAY,uBAAuB,EAAE,CAAC;wBACzC,MAAM,IAAI,uBAAuB,CAC/B,gGAAgG,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,KAAK,EAAE,CAC/H,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,oCAAoC,CAAC,UAAU,EAAE,CAAC;oBAC/E,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;wBACxB,6HAA6H;wBAC7H,YAAY,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;YACH,CAAC;YAEO,KAAK,CAAC,MAAM,CAAC,OAAwB;gBAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAEnE,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,QAAQ,CAAC;gBACzD,MAAM,WAAW,GAAG,iCAAiC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAExE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,QAAQ,EAAE,6BAA6B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7F,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBAE3D,IAAI,cAAc,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;gBAClF,wEAAwE;gBACxE,oGAAoG;gBAEpG,IAAI,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBAC3B,MAAM,IAAI,KAAK,CACb,gEAAgE,cAAc,CAAC,QAAQ,EAAE,UAAU,KAAK,CAAC,QAAQ,EAAE,GAAG,CACvH,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,cAAc,GAAG,KAAK,CAAC;oBACzB,CAAC;gBACH,CAAC;gBAED,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACjD,MAAM,YAAY,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;YACtF,CAAC;;;;gDA1LA,SAAS,CAAC,wCAAwC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;oBACxG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAC/C,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE;oBACpF,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC9E,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;iBACjE,CAAC,CAAC;wDAmDF,SAAS,CACR,gDAAgD,EAChD,CAAC,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC7E,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,MAAM;iBACtC,CAAC,CACH;YAvDD,6MAAc,oBAAoB,6DAkCjC;YAsBD,qOAAc,4BAA4B,6DA8CzC;;;;;SAxUU,iBAAiB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/simulator",
3
- "version": "0.70.0",
3
+ "version": "0.71.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./common": "./dest/common.js",
@@ -60,14 +60,14 @@
60
60
  ]
61
61
  },
62
62
  "dependencies": {
63
- "@aztec/circuit-types": "0.70.0",
64
- "@aztec/circuits.js": "0.70.0",
65
- "@aztec/foundation": "0.70.0",
66
- "@aztec/noir-protocol-circuits-types": "0.70.0",
67
- "@aztec/protocol-contracts": "0.70.0",
68
- "@aztec/telemetry-client": "0.70.0",
69
- "@aztec/types": "0.70.0",
70
- "@aztec/world-state": "0.70.0",
63
+ "@aztec/circuit-types": "0.71.0",
64
+ "@aztec/circuits.js": "0.71.0",
65
+ "@aztec/foundation": "0.71.0",
66
+ "@aztec/noir-protocol-circuits-types": "0.71.0",
67
+ "@aztec/protocol-contracts": "0.71.0",
68
+ "@aztec/telemetry-client": "0.71.0",
69
+ "@aztec/types": "0.71.0",
70
+ "@aztec/world-state": "0.71.0",
71
71
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
72
72
  "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
73
73
  "@noir-lang/types": "portal:../../noir/packages/types",
@@ -29,6 +29,18 @@ export function frToBoolean(fr: Fr): boolean {
29
29
  return fr.toBigInt() === BigInt(1);
30
30
  }
31
31
 
32
+ /**
33
+ * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
34
+ * two separate ACVMField arrays.
35
+ *
36
+ * @param storage The array with the BoundedVec's storage (i.e. BoundedVec::storage())
37
+ * @param length The length of the BoundedVec (i.e. BoundedVec::len())
38
+ * @returns An array with the same content as the Noir version. Elements past the length are discarded.
39
+ */
40
+ export function fromBoundedVec(storage: ACVMField[], length: ACVMField): Fr[] {
41
+ return storage.slice(0, frToNumber(fromACVMField(length))).map(fromACVMField);
42
+ }
43
+
32
44
  /**
33
45
  * Transforms a witness map to its field elements.
34
46
  * @param witness - The witness to extract from.
@@ -2,15 +2,12 @@ import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
2
2
  import { FunctionSelector, NoteSelector } from '@aztec/foundation/abi';
3
3
  import { AztecAddress } from '@aztec/foundation/aztec-address';
4
4
  import { Fr } from '@aztec/foundation/fields';
5
- import { createLogger } from '@aztec/foundation/log';
6
5
 
7
6
  import { type ACVMField } from '../acvm_types.js';
8
- import { frToBoolean, frToNumber, fromACVMField } from '../deserialize.js';
7
+ import { frToBoolean, frToNumber, fromACVMField, fromBoundedVec } from '../deserialize.js';
9
8
  import { toACVMField } from '../serialize.js';
10
9
  import { type TypedOracle } from './typed_oracle.js';
11
10
 
12
- const logger = createLogger('simulator:acvm:oracle');
13
-
14
11
  /**
15
12
  * A data source that has all the apis required by Aztec.nr.
16
13
  */
@@ -384,34 +381,78 @@ export class Oracle {
384
381
  await this.typedOracle.syncNotes();
385
382
  }
386
383
 
387
- async store([contract]: ACVMField[], [key]: ACVMField[], values: ACVMField[]) {
388
- const processedContract = AztecAddress.fromField(fromACVMField(contract));
389
- const processedKey = fromACVMField(key);
390
- const processedValues = values.map(fromACVMField);
391
- logger.debug(`Storing data for key ${processedKey} in contract ${processedContract}. Data: [${processedValues}]`);
392
- await this.typedOracle.store(processedContract, processedKey, processedValues);
393
- }
394
-
395
- /**
396
- * Load data from pxe db.
397
- * @param contract - The contract address.
398
- * @param key - The key to load.
399
- * @param tSize - The size of the serialized object to return.
400
- * @returns The data found flag and the serialized object concatenated in one array.
401
- */
402
- async load([contract]: ACVMField[], [key]: ACVMField[], [tSize]: ACVMField[]): Promise<(ACVMField | ACVMField[])[]> {
403
- const processedContract = AztecAddress.fromField(fromACVMField(contract));
404
- const processedKey = fromACVMField(key);
405
- const values = await this.typedOracle.load(processedContract, processedKey);
384
+ async deliverNote(
385
+ [contractAddress]: ACVMField[],
386
+ [storageSlot]: ACVMField[],
387
+ [nonce]: ACVMField[],
388
+ content: ACVMField[],
389
+ [contentLength]: ACVMField[],
390
+ [noteHash]: ACVMField[],
391
+ [nullifier]: ACVMField[],
392
+ [txHash]: ACVMField[],
393
+ [recipient]: ACVMField[],
394
+ ): Promise<ACVMField> {
395
+ // TODO(#10728): try-catch this block and return false if we get an exception so that the contract can decide what
396
+ // to do if a note fails delivery (e.g. not increment the tagging index, or add it to some pending work list).
397
+ // Delivery might fail due to temporary issues, such as poor node connectivity.
398
+ await this.typedOracle.deliverNote(
399
+ AztecAddress.fromString(contractAddress),
400
+ fromACVMField(storageSlot),
401
+ fromACVMField(nonce),
402
+ fromBoundedVec(content, contentLength),
403
+ fromACVMField(noteHash),
404
+ fromACVMField(nullifier),
405
+ fromACVMField(txHash),
406
+ AztecAddress.fromString(recipient),
407
+ );
408
+
409
+ return toACVMField(true);
410
+ }
411
+
412
+ async dbStore([contractAddress]: ACVMField[], [slot]: ACVMField[], values: ACVMField[]) {
413
+ await this.typedOracle.dbStore(
414
+ AztecAddress.fromField(fromACVMField(contractAddress)),
415
+ fromACVMField(slot),
416
+ values.map(fromACVMField),
417
+ );
418
+ }
419
+
420
+ async dbLoad(
421
+ [contractAddress]: ACVMField[],
422
+ [slot]: ACVMField[],
423
+ [tSize]: ACVMField[],
424
+ ): Promise<(ACVMField | ACVMField[])[]> {
425
+ const values = await this.typedOracle.dbLoad(
426
+ AztecAddress.fromField(fromACVMField(contractAddress)),
427
+ fromACVMField(slot),
428
+ );
429
+
430
+ // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
431
+ // with two fields: `some` (a boolean) and `value` (a field array in this case).
406
432
  if (values === null) {
407
- // No data was found so we set the data-found flag to 0 and we pad with zeros get the correct return size.
408
- const processedTSize = frToNumber(fromACVMField(tSize));
409
- logger.debug(`No data found for key ${processedKey} in contract ${processedContract}`);
410
- return [toACVMField(0), Array(processedTSize).fill(toACVMField(0))];
433
+ // No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
434
+ return [toACVMField(0), Array(frToNumber(fromACVMField(tSize))).fill(toACVMField(0))];
411
435
  } else {
412
- // Data was found so we set the data-found flag to 1 and return it along with the data.
413
- logger.debug(`Returning data for key ${processedKey} in contract ${processedContract}. Data: [${values}]`);
436
+ // Data was found so we set `some` to 1 and return it along with `value`.
414
437
  return [toACVMField(1), values.map(toACVMField)];
415
438
  }
416
439
  }
440
+
441
+ async dbDelete([contractAddress]: ACVMField[], [slot]: ACVMField[]) {
442
+ await this.typedOracle.dbDelete(AztecAddress.fromField(fromACVMField(contractAddress)), fromACVMField(slot));
443
+ }
444
+
445
+ async dbCopy(
446
+ [contractAddress]: ACVMField[],
447
+ [srcSlot]: ACVMField[],
448
+ [dstSlot]: ACVMField[],
449
+ [numEntries]: ACVMField[],
450
+ ) {
451
+ await this.typedOracle.dbCopy(
452
+ AztecAddress.fromField(fromACVMField(contractAddress)),
453
+ fromACVMField(srcSlot),
454
+ fromACVMField(dstSlot),
455
+ frToNumber(fromACVMField(numEntries)),
456
+ );
457
+ }
417
458
  }
@@ -237,11 +237,32 @@ export abstract class TypedOracle {
237
237
  throw new OracleMethodNotAvailableError('syncNotes');
238
238
  }
239
239
 
240
- store(_contract: AztecAddress, _key: Fr, _values: Fr[]): Promise<void> {
241
- throw new OracleMethodNotAvailableError('store');
240
+ deliverNote(
241
+ _contractAddress: AztecAddress,
242
+ _storageSlot: Fr,
243
+ _nonce: Fr,
244
+ _content: Fr[],
245
+ _noteHash: Fr,
246
+ _nullifier: Fr,
247
+ _txHash: Fr,
248
+ _recipient: AztecAddress,
249
+ ): Promise<void> {
250
+ throw new OracleMethodNotAvailableError('deliverNote');
251
+ }
252
+
253
+ dbStore(_contractAddress: AztecAddress, _key: Fr, _values: Fr[]): Promise<void> {
254
+ throw new OracleMethodNotAvailableError('dbStore');
255
+ }
256
+
257
+ dbLoad(_contractAddress: AztecAddress, _key: Fr): Promise<Fr[] | null> {
258
+ throw new OracleMethodNotAvailableError('dbLoad');
259
+ }
260
+
261
+ dbDelete(_contractAddress: AztecAddress, _key: Fr): Promise<void> {
262
+ throw new OracleMethodNotAvailableError('dbDelete');
242
263
  }
243
264
 
244
- load(_contract: AztecAddress, _key: Fr): Promise<Fr[] | null> {
245
- throw new OracleMethodNotAvailableError('load');
265
+ dbCopy(_contractAddress: AztecAddress, _srcKey: Fr, _dstKey: Fr, _numEntries: number): Promise<void> {
266
+ throw new OracleMethodNotAvailableError('dbCopy');
246
267
  }
247
268
  }
@@ -190,7 +190,10 @@ export class CalldataCopy extends Instruction {
190
190
  const copySize = memory.get(copySizeOffset).toNumber();
191
191
  context.machineState.consumeGas(this.gasCost(copySize));
192
192
 
193
- const transformedData = context.environment.calldata.slice(cdStart, cdStart + copySize).map(f => new Field(f));
193
+ // Values which are out-of-range of the calldata array will be set with Field(0);
194
+ const slice = context.environment.calldata.slice(cdStart, cdStart + copySize).map(f => new Field(f));
195
+ // slice has size = MIN(copySize, calldata.length - cdStart) as TS truncates out-of-range portion
196
+ const transformedData = [...slice, ...Array(copySize - slice.length).fill(new Field(0))];
194
197
 
195
198
  memory.setSlice(dstOffset, transformedData);
196
199
 
@@ -253,9 +256,10 @@ export class ReturndataCopy extends Instruction {
253
256
  const copySize = memory.get(copySizeOffset).toNumber();
254
257
  context.machineState.consumeGas(this.gasCost(copySize));
255
258
 
256
- const transformedData = context.machineState.nestedReturndata
257
- .slice(rdStart, rdStart + copySize)
258
- .map(f => new Field(f));
259
+ // Values which are out-of-range of the returndata array will be set with Field(0);
260
+ const slice = context.machineState.nestedReturndata.slice(rdStart, rdStart + copySize).map(f => new Field(f));
261
+ // slice has size = MIN(copySize, returndata.length - rdStart) as TS truncates out-of-range portion
262
+ const transformedData = [...slice, ...Array(copySize - slice.length).fill(new Field(0))];
259
263
 
260
264
  memory.setSlice(dstOffset, transformedData);
261
265
 
@@ -233,26 +233,69 @@ export interface DBOracle extends CommitmentsDB {
233
233
  */
234
234
  processTaggedLogs(logs: TxScopedL2Log[], recipient: AztecAddress): Promise<void>;
235
235
 
236
+ /**
237
+ * Delivers the preimage and metadata of a committed note so that it can be later requested via the `getNotes`
238
+ * oracle.
239
+ *
240
+ * @param contractAddress - The address of the contract that created the note (i.e. the siloing contract)
241
+ * @param storageSlot - The storage slot of the note - used for indexing in `getNotes`
242
+ * @param nonce - The nonce of the note used by the kernel to compute the unique note hash
243
+ * @param content - The note's content: this is the primary item to return in `getNotes`
244
+ * @param noteHash - The non-unique non-siloed note hash
245
+ * @param nullifier - The inner (non-siloed) note nullifier
246
+ * @param txHash - The transaction in which the note was added to the note hash tree
247
+ * @param recipient - The account that discovered the note
248
+ */
249
+ deliverNote(
250
+ contractAddress: AztecAddress,
251
+ storageSlot: Fr,
252
+ nonce: Fr,
253
+ content: Fr[],
254
+ noteHash: Fr,
255
+ nullifier: Fr,
256
+ txHash: Fr,
257
+ recipient: AztecAddress,
258
+ ): Promise<void>;
259
+
236
260
  /**
237
261
  * Removes all of a contract's notes that have been nullified from the note database.
238
262
  */
239
263
  removeNullifiedNotes(contractAddress: AztecAddress): Promise<void>;
240
264
 
241
265
  /**
242
- * Used by contracts during execution to store arbitrary data in the local PXE database. The data is siloed/scoped
243
- * to a specific `contract`.
244
- * @param contract - An address of a contract that is requesting to store the data.
245
- * @param key - A field element representing the key to store the data under.
246
- * @param values - An array of field elements representing the data to store.
266
+ * Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `dbLoad`.
267
+ * * If data was already stored at this slot, it is overwrriten.
268
+ * @param contractAddress - The contract address to scope the data under.
269
+ * @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
270
+ * @param values - The data to store.
247
271
  */
248
- store(contract: AztecAddress, key: Fr, values: Fr[]): Promise<void>;
272
+ dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void>;
249
273
 
250
274
  /**
251
- * Used by contracts during execution to load arbitrary data from the local PXE database. The data is siloed/scoped
252
- * to a specific `contract`.
253
- * @param contract - An address of a contract that is requesting to load the data.
254
- * @param key - A field element representing the key under which to load the data..
255
- * @returns An array of field elements representing the stored data or `null` if no data is stored under the key.
275
+ * Returns data previously stored via `dbStore` in the per-contract non-volatile database.
276
+ * @param contractAddress - The contract address under which the data is scoped.
277
+ * @param slot - The slot in the database to read.
278
+ * @returns The stored data or `null` if no data is stored under the slot.
279
+ */
280
+ dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
281
+
282
+ /**
283
+ * Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
284
+ * @param contractAddress - The contract address under which the data is scoped.
285
+ * @param slot - The slot in the database to delete.
286
+ */
287
+ dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void>;
288
+
289
+ /**
290
+ * Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
291
+ * structures by avoiding repeated calls to `dbLoad` and `dbStore`.
292
+ * Supports overlapping source and destination regions (which will result in the overlapped source values being
293
+ * overwritten). All copied slots must exist in the database (i.e. have been stored and not deleted)
294
+ *
295
+ * @param contractAddress - The contract address under which the data is scoped.
296
+ * @param srcSlot - The first slot to copy from.
297
+ * @param dstSlot - The first slot to copy to.
298
+ * @param numEntries - The number of entries to copy.
256
299
  */
257
- load(contract: AztecAddress, key: Fr): Promise<Fr[] | null>;
300
+ dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
258
301
  }
@@ -29,7 +29,7 @@ export async function executePrivateFunction(
29
29
  log = createLogger('simulator:private_execution'),
30
30
  ): Promise<PrivateCallExecutionResult> {
31
31
  const functionName = await context.getDebugFunctionName();
32
- log.verbose(`Executing private function ${functionName}@${contractAddress}`);
32
+ log.verbose(`Executing private function ${functionName}`, { contract: contractAddress });
33
33
  const acir = artifact.bytecode;
34
34
  const initialWitness = context.getInitialWitness(artifact);
35
35
  const acvmCallback = new Oracle(context);
@@ -192,7 +192,7 @@ export class AcirSimulator {
192
192
  const execRequest: FunctionCall = {
193
193
  name: artifact.name,
194
194
  to: contractAddress,
195
- selector: FunctionSelector.empty(),
195
+ selector: FunctionSelector.fromNameAndParameters(artifact),
196
196
  type: FunctionType.UNCONSTRAINED,
197
197
  isStatic: artifact.isStatic,
198
198
  args: encodeArguments(artifact, [
@@ -22,7 +22,10 @@ export async function executeUnconstrainedFunction(
22
22
  args: Fr[],
23
23
  log = createLogger('simulator:unconstrained_execution'),
24
24
  ): Promise<AbiDecoded> {
25
- log.verbose(`Executing unconstrained function ${contractAddress}:${functionSelector}(${artifact.name})`);
25
+ log.verbose(`Executing unconstrained function ${artifact.name}`, {
26
+ contract: contractAddress,
27
+ selector: functionSelector,
28
+ });
26
29
 
27
30
  const acir = artifact.bytecode;
28
31
  const initialWitness = toACVMWitness(0, args);
@@ -310,23 +310,53 @@ export class ViewDataOracle extends TypedOracle {
310
310
  await this.db.removeNullifiedNotes(this.contractAddress);
311
311
  }
312
312
 
313
- public override store(contract: AztecAddress, key: Fr, values: Fr[]): Promise<void> {
314
- if (!contract.equals(this.contractAddress)) {
315
- // TODO(#10727): instead of this check check that this.contractAddress is allowed to process notes for contract
316
- throw new Error(
317
- `Contract address ${contract} does not match the oracle's contract address ${this.contractAddress}`,
318
- );
313
+ public override async deliverNote(
314
+ contractAddress: AztecAddress,
315
+ storageSlot: Fr,
316
+ nonce: Fr,
317
+ content: Fr[],
318
+ noteHash: Fr,
319
+ nullifier: Fr,
320
+ txHash: Fr,
321
+ recipient: AztecAddress,
322
+ ) {
323
+ // TODO(#10727): allow other contracts to deliver notes
324
+ if (!this.contractAddress.equals(contractAddress)) {
325
+ throw new Error(`Got a note delivery request from ${contractAddress}, expected ${this.contractAddress}`);
319
326
  }
320
- return this.db.store(this.contractAddress, key, values);
327
+
328
+ await this.db.deliverNote(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient);
321
329
  }
322
330
 
323
- public override load(contract: AztecAddress, key: Fr): Promise<Fr[] | null> {
324
- if (!contract.equals(this.contractAddress)) {
325
- // TODO(#10727): instead of this check check that this.contractAddress is allowed to process notes for contract
326
- throw new Error(
327
- `Contract address ${contract} does not match the oracle's contract address ${this.contractAddress}`,
328
- );
331
+ public override dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void> {
332
+ if (!contractAddress.equals(this.contractAddress)) {
333
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
334
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
335
+ }
336
+ return this.db.dbStore(this.contractAddress, slot, values);
337
+ }
338
+
339
+ public override dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null> {
340
+ if (!contractAddress.equals(this.contractAddress)) {
341
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
342
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
343
+ }
344
+ return this.db.dbLoad(this.contractAddress, slot);
345
+ }
346
+
347
+ public override dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void> {
348
+ if (!contractAddress.equals(this.contractAddress)) {
349
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
350
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
351
+ }
352
+ return this.db.dbDelete(this.contractAddress, slot);
353
+ }
354
+
355
+ public override dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
356
+ if (!contractAddress.equals(this.contractAddress)) {
357
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
358
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
329
359
  }
330
- return this.db.load(this.contractAddress, key);
360
+ return this.db.dbCopy(this.contractAddress, srcSlot, dstSlot, numEntries);
331
361
  }
332
362
  }
@@ -32,7 +32,6 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
32
32
  import { Fr, Point } from '@aztec/foundation/fields';
33
33
  import { openTmpStore } from '@aztec/kv-store/lmdb';
34
34
  import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
35
- import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
36
35
  import { MerkleTrees } from '@aztec/world-state';
37
36
 
38
37
  import { strict as assert } from 'assert';
@@ -59,17 +58,11 @@ export async function simulateAvmTestContractGenerateCircuitInputs(
59
58
  const globals = GlobalVariables.empty();
60
59
  globals.timestamp = TIMESTAMP;
61
60
 
62
- const merkleTrees = await (await MerkleTrees.new(openTmpStore(), new NoopTelemetryClient())).fork();
61
+ const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
63
62
  await contractDataSource.deployContracts(merkleTrees);
64
63
  const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
65
64
 
66
- const simulator = new PublicTxSimulator(
67
- merkleTrees,
68
- worldStateDB,
69
- new NoopTelemetryClient(),
70
- globals,
71
- /*doMerkleOperations=*/ true,
72
- );
65
+ const simulator = new PublicTxSimulator(merkleTrees, worldStateDB, globals, /*doMerkleOperations=*/ true);
73
66
 
74
67
  const sender = AztecAddress.random();
75
68
  const callContext = new CallContext(
@@ -79,16 +72,14 @@ export async function simulateAvmTestContractGenerateCircuitInputs(
79
72
  /*isStaticCall=*/ false,
80
73
  );
81
74
  const setupExecutionRequests: PublicExecutionRequest[] = [];
82
- // we reverse order because the simulator expects it to be like a "stack" of calls to pop from
83
- for (let i = setupFunctionNames.length - 1; i >= 0; i--) {
75
+ for (let i = 0; i < setupFunctionNames.length; i++) {
84
76
  const functionSelector = getAvmTestContractFunctionSelector(setupFunctionNames[i]);
85
77
  const fnArgs = [functionSelector.toField(), ...setupArgs[i]];
86
78
  const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
87
79
  setupExecutionRequests.push(executionRequest);
88
80
  }
89
81
  const appExecutionRequests: PublicExecutionRequest[] = [];
90
- // we reverse order because the simulator expects it to be like a "stack" of calls to pop from
91
- for (let i = appFunctionNames.length - 1; i >= 0; i--) {
82
+ for (let i = 0; i < appFunctionNames.length; i++) {
92
83
  const functionSelector = getAvmTestContractFunctionSelector(appFunctionNames[i]);
93
84
  const fnArgs = [functionSelector.toField(), ...appArgs[i]];
94
85
  const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
@@ -130,7 +121,7 @@ export async function simulateAvmTestContractCall(
130
121
  const globals = GlobalVariables.empty();
131
122
  globals.timestamp = TIMESTAMP;
132
123
 
133
- const merkleTrees = await (await MerkleTrees.new(openTmpStore(), new NoopTelemetryClient())).fork();
124
+ const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
134
125
  await contractDataSource.deployContracts(merkleTrees);
135
126
  const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
136
127
 
@@ -183,10 +174,11 @@ export function createTxForPublicCalls(
183
174
  // TODO(#9269): Remove this fake nullifier method as we move away from 1st nullifier as hash.
184
175
  forPublic.nonRevertibleAccumulatedData.nullifiers[0] = Fr.random(); // fake tx nullifier
185
176
 
186
- for (let i = 0; i < setupExecutionRequests.length; i++) {
177
+ // We reverse order because the simulator expects it to be like a "stack" of calls to pop from
178
+ for (let i = setupCallRequests.length - 1; i >= 0; i--) {
187
179
  forPublic.nonRevertibleAccumulatedData.publicCallRequests[i] = setupCallRequests[i];
188
180
  }
189
- for (let i = 0; i < appCallRequests.length; i++) {
181
+ for (let i = appCallRequests.length - 1; i >= 0; i--) {
190
182
  forPublic.revertibleAccumulatedData.publicCallRequests[i] = appCallRequests[i];
191
183
  }
192
184
  if (teardownExecutionRequest) {
@@ -207,12 +199,14 @@ export function createTxForPublicCalls(
207
199
  );
208
200
  const tx = Tx.newWithTxData(txData, teardownExecutionRequest);
209
201
 
210
- for (let i = 0; i < setupExecutionRequests.length; i++) {
211
- tx.enqueuedPublicFunctionCalls.push(setupExecutionRequests[i]);
212
- }
213
- for (let i = 0; i < appExecutionRequests.length; i++) {
202
+ // Reverse order because the simulator expects it to be like a "stack" of calls to pop from.
203
+ // Also push app calls before setup calls for this reason.
204
+ for (let i = appExecutionRequests.length - 1; i >= 0; i--) {
214
205
  tx.enqueuedPublicFunctionCalls.push(appExecutionRequests[i]);
215
206
  }
207
+ for (let i = setupExecutionRequests.length - 1; i >= 0; i--) {
208
+ tx.enqueuedPublicFunctionCalls.push(setupExecutionRequests[i]);
209
+ }
216
210
 
217
211
  return tx;
218
212
  }