@aztec/accounts 0.0.0-test.0 → 0.0.1-commit.21caa21

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 (122) hide show
  1. package/artifacts/EcdsaKAccount.json +4320 -3340
  2. package/artifacts/EcdsaRAccount.json +4046 -3066
  3. package/artifacts/SchnorrAccount.json +4420 -3285
  4. package/artifacts/SchnorrSingleKeyAccount.json +2566 -1824
  5. package/artifacts/SimulatedAccount.d.json.ts +3 -0
  6. package/artifacts/SimulatedAccount.json +4623 -0
  7. package/dest/defaults/account_contract.d.ts +10 -5
  8. package/dest/defaults/account_contract.d.ts.map +1 -1
  9. package/dest/defaults/account_contract.js +2 -2
  10. package/dest/defaults/account_interface.d.ts +7 -6
  11. package/dest/defaults/account_interface.d.ts.map +1 -1
  12. package/dest/defaults/account_interface.js +6 -7
  13. package/dest/defaults/index.d.ts +2 -2
  14. package/dest/defaults/index.js +1 -1
  15. package/dest/ecdsa/ecdsa_k/account_contract.d.ts +5 -4
  16. package/dest/ecdsa/ecdsa_k/account_contract.d.ts.map +1 -1
  17. package/dest/ecdsa/ecdsa_k/account_contract.js +8 -5
  18. package/dest/ecdsa/ecdsa_k/index.d.ts +1 -25
  19. package/dest/ecdsa/ecdsa_k/index.d.ts.map +1 -1
  20. package/dest/ecdsa/ecdsa_k/index.js +2 -23
  21. package/dest/ecdsa/ecdsa_k/lazy.d.ts +1 -25
  22. package/dest/ecdsa/ecdsa_k/lazy.d.ts.map +1 -1
  23. package/dest/ecdsa/ecdsa_k/lazy.js +5 -26
  24. package/dest/ecdsa/ecdsa_r/account_contract.d.ts +19 -0
  25. package/dest/ecdsa/ecdsa_r/account_contract.d.ts.map +1 -0
  26. package/dest/ecdsa/ecdsa_r/account_contract.js +41 -0
  27. package/dest/ecdsa/ecdsa_r/index.d.ts +19 -0
  28. package/dest/ecdsa/ecdsa_r/index.d.ts.map +1 -0
  29. package/dest/ecdsa/ecdsa_r/index.js +23 -0
  30. package/dest/ecdsa/ecdsa_r/lazy.d.ts +23 -0
  31. package/dest/ecdsa/ecdsa_r/lazy.d.ts.map +1 -0
  32. package/dest/ecdsa/ecdsa_r/lazy.js +31 -0
  33. package/dest/ecdsa/index.d.ts +2 -1
  34. package/dest/ecdsa/index.d.ts.map +1 -1
  35. package/dest/ecdsa/index.js +1 -0
  36. package/dest/ecdsa/lazy.d.ts +2 -1
  37. package/dest/ecdsa/lazy.d.ts.map +1 -1
  38. package/dest/ecdsa/lazy.js +1 -0
  39. package/dest/ecdsa/ssh_ecdsa_r/account_contract.d.ts +5 -4
  40. package/dest/ecdsa/ssh_ecdsa_r/account_contract.d.ts.map +1 -1
  41. package/dest/ecdsa/ssh_ecdsa_r/account_contract.js +8 -5
  42. package/dest/ecdsa/ssh_ecdsa_r/index.d.ts +2 -27
  43. package/dest/ecdsa/ssh_ecdsa_r/index.d.ts.map +1 -1
  44. package/dest/ecdsa/ssh_ecdsa_r/index.js +3 -28
  45. package/dest/ecdsa/ssh_ecdsa_r/lazy.d.ts +2 -30
  46. package/dest/ecdsa/ssh_ecdsa_r/lazy.d.ts.map +1 -1
  47. package/dest/ecdsa/ssh_ecdsa_r/lazy.js +3 -38
  48. package/dest/schnorr/account_contract.d.ts +5 -2
  49. package/dest/schnorr/account_contract.d.ts.map +1 -1
  50. package/dest/schnorr/account_contract.js +8 -5
  51. package/dest/schnorr/index.d.ts +2 -37
  52. package/dest/schnorr/index.d.ts.map +1 -1
  53. package/dest/schnorr/index.js +2 -33
  54. package/dest/schnorr/lazy.d.ts +2 -37
  55. package/dest/schnorr/lazy.d.ts.map +1 -1
  56. package/dest/schnorr/lazy.js +5 -36
  57. package/dest/single_key/account_contract.d.ts +2 -2
  58. package/dest/single_key/account_contract.d.ts.map +1 -1
  59. package/dest/single_key/account_contract.js +1 -1
  60. package/dest/single_key/index.d.ts +2 -21
  61. package/dest/single_key/index.d.ts.map +1 -1
  62. package/dest/single_key/index.js +2 -24
  63. package/dest/single_key/lazy.d.ts +2 -21
  64. package/dest/single_key/lazy.d.ts.map +1 -1
  65. package/dest/single_key/lazy.js +5 -27
  66. package/dest/stub/account_contract.d.ts +29 -0
  67. package/dest/stub/account_contract.d.ts.map +1 -0
  68. package/dest/stub/account_contract.js +30 -0
  69. package/dest/stub/index.d.ts +21 -0
  70. package/dest/stub/index.d.ts.map +1 -0
  71. package/dest/stub/index.js +29 -0
  72. package/dest/stub/lazy.d.ts +23 -0
  73. package/dest/stub/lazy.d.ts.map +1 -0
  74. package/dest/stub/lazy.js +35 -0
  75. package/dest/testing/configuration.d.ts +1 -1
  76. package/dest/testing/index.d.ts +6 -30
  77. package/dest/testing/index.d.ts.map +1 -1
  78. package/dest/testing/index.js +18 -30
  79. package/dest/testing/lazy.d.ts +5 -28
  80. package/dest/testing/lazy.d.ts.map +1 -1
  81. package/dest/testing/lazy.js +19 -30
  82. package/dest/utils/index.d.ts +1 -1
  83. package/dest/utils/ssh_agent.d.ts +2 -5
  84. package/dest/utils/ssh_agent.d.ts.map +1 -1
  85. package/package.json +26 -20
  86. package/src/defaults/account_contract.ts +13 -5
  87. package/src/defaults/account_interface.ts +15 -11
  88. package/src/defaults/index.ts +1 -1
  89. package/src/ecdsa/ecdsa_k/account_contract.ts +5 -2
  90. package/src/ecdsa/ecdsa_k/index.ts +1 -33
  91. package/src/ecdsa/ecdsa_k/lazy.ts +4 -36
  92. package/src/ecdsa/ecdsa_r/account_contract.ts +42 -0
  93. package/src/ecdsa/ecdsa_r/index.ts +31 -0
  94. package/src/ecdsa/ecdsa_r/lazy.ts +39 -0
  95. package/src/ecdsa/index.ts +1 -0
  96. package/src/ecdsa/lazy.ts +1 -0
  97. package/src/ecdsa/ssh_ecdsa_r/account_contract.ts +5 -2
  98. package/src/ecdsa/ssh_ecdsa_r/index.ts +3 -42
  99. package/src/ecdsa/ssh_ecdsa_r/lazy.ts +3 -53
  100. package/src/schnorr/account_contract.ts +2 -2
  101. package/src/schnorr/index.ts +8 -56
  102. package/src/schnorr/lazy.ts +11 -59
  103. package/src/single_key/account_contract.ts +5 -2
  104. package/src/single_key/index.ts +2 -33
  105. package/src/single_key/lazy.ts +5 -36
  106. package/src/stub/account_contract.ts +39 -0
  107. package/src/stub/index.ts +41 -0
  108. package/src/stub/lazy.ts +49 -0
  109. package/src/testing/index.ts +19 -51
  110. package/src/testing/lazy.ts +18 -50
  111. package/dest/dapp/dapp_interface.d.ts +0 -10
  112. package/dest/dapp/dapp_interface.d.ts.map +0 -1
  113. package/dest/dapp/dapp_interface.js +0 -16
  114. package/dest/dapp/index.d.ts +0 -2
  115. package/dest/dapp/index.d.ts.map +0 -1
  116. package/dest/dapp/index.js +0 -1
  117. package/dest/testing/create_account.d.ts +0 -43
  118. package/dest/testing/create_account.d.ts.map +0 -1
  119. package/dest/testing/create_account.js +0 -58
  120. package/src/dapp/dapp_interface.ts +0 -38
  121. package/src/dapp/index.ts +0 -1
  122. package/src/testing/create_account.ts +0 -93
@@ -1,15 +1,20 @@
1
- import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
1
+ import type { AccountContract, AccountInterface, AuthWitnessProvider, ChainInfo } from '@aztec/aztec.js/account';
2
2
  import type { ContractArtifact } from '@aztec/stdlib/abi';
3
- import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
3
+ import type { CompleteAddress } from '@aztec/stdlib/contract';
4
4
  /**
5
5
  * Base class for implementing an account contract. Requires that the account uses the
6
6
  * default entrypoint method signature.
7
7
  */
8
8
  export declare abstract class DefaultAccountContract implements AccountContract {
9
9
  abstract getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
10
- abstract getDeploymentArgs(): Promise<any[] | undefined>;
10
+ abstract getInitializationFunctionAndArgs(): Promise<{
11
+ /** The name of the function used to initialize the contract */
12
+ constructorName: string;
13
+ /** The args to the function used to initialize the contract */
14
+ constructorArgs: any[];
15
+ } | undefined>;
11
16
  abstract getContractArtifact(): Promise<ContractArtifact>;
12
17
  constructor();
13
- getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface;
18
+ getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface;
14
19
  }
15
- //# sourceMappingURL=account_contract.d.ts.map
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2FjY291bnRfY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLG1CQUFtQixFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pILE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFJOUQ7OztHQUdHO0FBQ0gsOEJBQXNCLHNCQUF1QixZQUFXLGVBQWU7SUFDckUsUUFBUSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxlQUFlLEdBQUcsbUJBQW1CLENBQUM7SUFDL0UsUUFBUSxDQUFDLGdDQUFnQyxJQUFJLE9BQU8sQ0FDaEQ7UUFDRSwrREFBK0Q7UUFDL0QsZUFBZSxFQUFFLE1BQU0sQ0FBQztRQUN4QiwrREFBK0Q7UUFDL0QsZUFBZSxFQUFFLEdBQUcsRUFBRSxDQUFDO0tBQ3hCLEdBQ0QsU0FBUyxDQUNaLENBQUM7SUFDRixRQUFRLENBQUMsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFFMUQsY0FBZ0I7SUFFaEIsWUFBWSxDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxnQkFBZ0IsQ0FFN0U7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/defaults/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACtG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIxE;;;GAGG;AACH,8BAAsB,sBAAuB,YAAW,eAAe;IACrE,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,mBAAmB;IAC9E,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxD,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;;IAIzD,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,gBAAgB;CAG7E"}
1
+ {"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/defaults/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACjH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D;;;GAGG;AACH,8BAAsB,sBAAuB,YAAW,eAAe;IACrE,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,mBAAmB,CAAC;IAC/E,QAAQ,CAAC,gCAAgC,IAAI,OAAO,CAChD;QACE,+DAA+D;QAC/D,eAAe,EAAE,MAAM,CAAC;QACxB,+DAA+D;QAC/D,eAAe,EAAE,GAAG,EAAE,CAAC;KACxB,GACD,SAAS,CACZ,CAAC;IACF,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE1D,cAAgB;IAEhB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAE7E;CACF"}
@@ -4,7 +4,7 @@ import { DefaultAccountInterface } from '../defaults/account_interface.js';
4
4
  * default entrypoint method signature.
5
5
  */ export class DefaultAccountContract {
6
6
  constructor(){}
7
- getInterface(address, nodeInfo) {
8
- return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);
7
+ getInterface(address, chainInfo) {
8
+ return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
9
9
  }
10
10
  }
@@ -1,11 +1,12 @@
1
1
  import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
2
- import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
2
+ import { type DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
3
+ import type { ChainInfo, EntrypointInterface } from '@aztec/entrypoints/interfaces';
3
4
  import { Fr } from '@aztec/foundation/fields';
4
5
  import type { AuthWitness } from '@aztec/stdlib/auth-witness';
5
6
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
6
7
  import { CompleteAddress } from '@aztec/stdlib/contract';
7
- import type { NodeInfo } from '@aztec/stdlib/contract';
8
- import type { TxExecutionRequest } from '@aztec/stdlib/tx';
8
+ import type { GasSettings } from '@aztec/stdlib/gas';
9
+ import type { ExecutionPayload, TxExecutionRequest } from '@aztec/stdlib/tx';
9
10
  /**
10
11
  * Default implementation for an account interface. Requires that the account uses the default
11
12
  * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -16,12 +17,12 @@ export declare class DefaultAccountInterface implements AccountInterface {
16
17
  protected entrypoint: EntrypointInterface;
17
18
  private chainId;
18
19
  private version;
19
- constructor(authWitnessProvider: AuthWitnessProvider, address: CompleteAddress, nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'protocolVersion'>);
20
- createTxExecutionRequest(execution: ExecutionRequestInit): Promise<TxExecutionRequest>;
20
+ constructor(authWitnessProvider: AuthWitnessProvider, address: CompleteAddress, chainInfo: ChainInfo);
21
+ createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: DefaultAccountEntrypointOptions): Promise<TxExecutionRequest>;
21
22
  createAuthWit(messageHash: Fr): Promise<AuthWitness>;
22
23
  getCompleteAddress(): CompleteAddress;
23
24
  getAddress(): AztecAddress;
24
25
  getChainId(): Fr;
25
26
  getVersion(): Fr;
26
27
  }
27
- //# sourceMappingURL=account_interface.d.ts.map
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9pbnRlcmZhY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWZhdWx0cy9hY2NvdW50X2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JGLE9BQU8sRUFBNEIsS0FBSywrQkFBK0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzVHLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3BGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3RTs7O0dBR0c7QUFDSCxxQkFBYSx1QkFBd0IsWUFBVyxnQkFBZ0I7SUFPNUQsT0FBTyxDQUFDLG1CQUFtQjtJQUMzQixPQUFPLENBQUMsT0FBTztJQVBqQixTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBRTFDLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBSztJQUVwQixZQUNVLG1CQUFtQixFQUFFLG1CQUFtQixFQUN4QyxPQUFPLEVBQUUsZUFBZSxFQUNoQyxTQUFTLEVBQUUsU0FBUyxFQVVyQjtJQUVELHdCQUF3QixDQUN0QixJQUFJLEVBQUUsZ0JBQWdCLEVBQ3RCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLE9BQU8sRUFBRSwrQkFBK0IsR0FDdkMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBRTdCO0lBRUQsYUFBYSxDQUFDLFdBQVcsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUVuRDtJQUVELGtCQUFrQixJQUFJLGVBQWUsQ0FFcEM7SUFFRCxVQUFVLElBQUksWUFBWSxDQUV6QjtJQUVELFVBQVUsSUFBSSxFQUFFLENBRWY7SUFFRCxVQUFVLElBQUksRUFBRSxDQUVmO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"account_interface.d.ts","sourceRoot":"","sources":["../../src/defaults/account_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAO5D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,OAAO;IAPjB,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAE1C,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;gBAGV,mBAAmB,EAAE,mBAAmB,EACxC,OAAO,EAAE,eAAe,EAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,iBAAiB,CAAC;IAY3D,wBAAwB,CAAC,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAItF,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAIpD,kBAAkB,IAAI,eAAe;IAIrC,UAAU,IAAI,YAAY;IAI1B,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;CAGjB"}
1
+ {"version":3,"file":"account_interface.d.ts","sourceRoot":"","sources":["../../src/defaults/account_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAA4B,KAAK,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC5G,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAO5D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,OAAO;IAPjB,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAE1C,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACU,mBAAmB,EAAE,mBAAmB,EACxC,OAAO,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EAUrB;IAED,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAE7B;IAED,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAEnD;IAED,kBAAkB,IAAI,eAAe,CAEpC;IAED,UAAU,IAAI,YAAY,CAEzB;IAED,UAAU,IAAI,EAAE,CAEf;IAED,UAAU,IAAI,EAAE,CAEf;CACF"}
@@ -1,5 +1,4 @@
1
1
  import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
2
- import { Fr } from '@aztec/foundation/fields';
3
2
  /**
4
3
  * Default implementation for an account interface. Requires that the account uses the default
5
4
  * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -9,15 +8,15 @@ import { Fr } from '@aztec/foundation/fields';
9
8
  entrypoint;
10
9
  chainId;
11
10
  version;
12
- constructor(authWitnessProvider, address, nodeInfo){
11
+ constructor(authWitnessProvider, address, chainInfo){
13
12
  this.authWitnessProvider = authWitnessProvider;
14
13
  this.address = address;
15
- this.entrypoint = new DefaultAccountEntrypoint(address.address, authWitnessProvider, nodeInfo.l1ChainId, nodeInfo.protocolVersion);
16
- this.chainId = new Fr(nodeInfo.l1ChainId);
17
- this.version = new Fr(nodeInfo.protocolVersion);
14
+ this.entrypoint = new DefaultAccountEntrypoint(address.address, authWitnessProvider, chainInfo.chainId.toNumber(), chainInfo.version.toNumber());
15
+ this.chainId = chainInfo.chainId;
16
+ this.version = chainInfo.version;
18
17
  }
19
- createTxExecutionRequest(execution) {
20
- return this.entrypoint.createTxExecutionRequest(execution);
18
+ createTxExecutionRequest(exec, gasSettings, options) {
19
+ return this.entrypoint.createTxExecutionRequest(exec, gasSettings, options);
21
20
  }
22
21
  createAuthWit(messageHash) {
23
22
  return this.authWitnessProvider.createAuthWit(messageHash);
@@ -1,10 +1,10 @@
1
1
  /**
2
2
  * The `@aztec/accounts/defaults` export provides the base class {@link DefaultAccountContract} for implementing account contracts that use the default entrypoint payload module.
3
3
  *
4
- * Read more in {@link https://docs.aztec.network/developers/tutorials/codealong/contract_tutorials/write_accounts_contract | Writing an account contract}.
4
+ * Read more in {@link https://docs.aztec.network/developers/tutorials/contract_tutorials/counter_contract | Writing an account contract}.
5
5
  *
6
6
  * @packageDocumentation
7
7
  */
8
8
  export * from './account_interface.js';
9
9
  export * from './account_contract.js';
10
- //# sourceMappingURL=index.d.ts.map
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWZhdWx0cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsdUJBQXVCLENBQUMifQ==
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * The `@aztec/accounts/defaults` export provides the base class {@link DefaultAccountContract} for implementing account contracts that use the default entrypoint payload module.
3
3
  *
4
- * Read more in {@link https://docs.aztec.network/developers/tutorials/codealong/contract_tutorials/write_accounts_contract | Writing an account contract}.
4
+ * Read more in {@link https://docs.aztec.network/developers/tutorials/contract_tutorials/counter_contract | Writing an account contract}.
5
5
  *
6
6
  * @packageDocumentation
7
7
  */ export * from './account_interface.js';
@@ -1,5 +1,3 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="node" resolution-mode="require"/>
3
1
  import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
4
2
  import { CompleteAddress } from '@aztec/stdlib/contract';
5
3
  import { DefaultAccountContract } from '../../defaults/account_contract.js';
@@ -12,7 +10,10 @@ import { DefaultAccountContract } from '../../defaults/account_contract.js';
12
10
  export declare abstract class EcdsaKBaseAccountContract extends DefaultAccountContract {
13
11
  private signingPrivateKey;
14
12
  constructor(signingPrivateKey: Buffer);
15
- getDeploymentArgs(): Promise<Buffer[]>;
13
+ getInitializationFunctionAndArgs(): Promise<{
14
+ constructorName: string;
15
+ constructorArgs: Buffer<ArrayBufferLike>[];
16
+ }>;
16
17
  getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider;
17
18
  }
18
- //# sourceMappingURL=account_contract.d.ts.map
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VjZHNhL2VjZHNhX2svYWNjb3VudF9jb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSW5FLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUU1RTs7Ozs7R0FLRztBQUNILDhCQUFzQix5QkFBMEIsU0FBUSxzQkFBc0I7SUFDaEUsT0FBTyxDQUFDLGlCQUFpQjtJQUFyQyxZQUFvQixpQkFBaUIsRUFBRSxNQUFNLEVBRTVDO0lBRUssZ0NBQWdDOzs7T0FNckM7SUFFRCxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsZUFBZSxHQUFHLG1CQUFtQixDQUVyRTtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/account_contract.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E;;;;;GAKG;AACH,8BAAsB,yBAA0B,SAAQ,sBAAsB;IAChE,OAAO,CAAC,iBAAiB;gBAAjB,iBAAiB,EAAE,MAAM;IAIvC,iBAAiB;IAKvB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,mBAAmB;CAGvE"}
1
+ {"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E;;;;;GAKG;AACH,8BAAsB,yBAA0B,SAAQ,sBAAsB;IAChE,OAAO,CAAC,iBAAiB;IAArC,YAAoB,iBAAiB,EAAE,MAAM,EAE5C;IAEK,gCAAgC;;;OAMrC;IAED,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,mBAAmB,CAErE;CACF"}
@@ -11,12 +11,15 @@ import { DefaultAccountContract } from '../../defaults/account_contract.js';
11
11
  constructor(signingPrivateKey){
12
12
  super(), this.signingPrivateKey = signingPrivateKey;
13
13
  }
14
- async getDeploymentArgs() {
14
+ async getInitializationFunctionAndArgs() {
15
15
  const signingPublicKey = await new Ecdsa().computePublicKey(this.signingPrivateKey);
16
- return [
17
- signingPublicKey.subarray(0, 32),
18
- signingPublicKey.subarray(32, 64)
19
- ];
16
+ return {
17
+ constructorName: 'constructor',
18
+ constructorArgs: [
19
+ signingPublicKey.subarray(0, 32),
20
+ signingPublicKey.subarray(32, 64)
21
+ ]
22
+ };
20
23
  }
21
24
  getAuthWitnessProvider(_address) {
22
25
  return new EcdsaKAuthWitnessProvider(this.signingPrivateKey);
@@ -1,17 +1,10 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="node" resolution-mode="require"/>
3
1
  /**
4
2
  * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
5
3
  * Consider using this account type when working with integrations with Ethereum wallets.
6
4
  *
7
5
  * @packageDocumentation
8
6
  */
9
- import { AccountManager, type Salt } from '@aztec/aztec.js/account';
10
- import { type AccountWallet } from '@aztec/aztec.js/wallet';
11
- import { Fr } from '@aztec/foundation/fields';
12
7
  import type { ContractArtifact } from '@aztec/stdlib/abi';
13
- import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
- import type { PXE } from '@aztec/stdlib/interfaces/client';
15
8
  import { EcdsaKBaseAccountContract } from './account_contract.js';
16
9
  export declare const EcdsaKAccountContractArtifact: ContractArtifact;
17
10
  /**
@@ -23,21 +16,4 @@ export declare class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
23
16
  constructor(signingPrivateKey: Buffer);
24
17
  getContractArtifact(): Promise<ContractArtifact>;
25
18
  }
26
- /**
27
- * Creates an Account that relies on an ECDSA signing key for authentication.
28
- * @param pxe - An PXE server instance.
29
- * @param secretKey - Secret key used to derive all the keystore keys.
30
- * @param signingPrivateKey - Secp256k1 key used for signing transactions.
31
- * @param salt - Deployment salt.
32
- * @returns An account manager initialized with the account contract and its deployment params
33
- */
34
- export declare function getEcdsaKAccount(pxe: PXE, secretKey: Fr, signingPrivateKey: Buffer, salt?: Salt): Promise<AccountManager>;
35
- /**
36
- * Gets a wallet for an already registered account using ECDSA signatures.
37
- * @param pxe - An PXE server instance.
38
- * @param address - Address for the account.
39
- * @param signingPrivateKey - ECDSA key used for signing transactions.
40
- * @returns A wallet for this account that can be used to interact with a contract instance.
41
- */
42
- export declare function getEcdsaKWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet>;
43
- //# sourceMappingURL=index.d.ts.map
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lY2RzYS9lY2RzYV9rL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUsxRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxlQUFPLE1BQU0sNkJBQTZCLEVBQUUsZ0JBRTNDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gscUJBQWEscUJBQXNCLFNBQVEseUJBQXlCO0lBQ2xFLFlBQVksaUJBQWlCLEVBQUUsTUFBTSxFQUVwQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,aAAa,EAAa,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAI3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,6BAA6B,EAAE,gBAE3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;gBACtD,iBAAiB,EAAE,MAAM;IAI5B,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAG1D;AACD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,EACb,iBAAiB,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,IAAI,GACV,OAAO,CAAC,cAAc,CAAC,CAEzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAElH"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,6BAA6B,EAAE,gBAE3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;IAClE,YAAY,iBAAiB,EAAE,MAAM,EAEpC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF"}
@@ -3,10 +3,8 @@
3
3
  * Consider using this account type when working with integrations with Ethereum wallets.
4
4
  *
5
5
  * @packageDocumentation
6
- */ import { AccountManager } from '@aztec/aztec.js/account';
7
- import { getWallet } from '@aztec/aztec.js/wallet';
8
- import { loadContractArtifact } from '@aztec/stdlib/abi';
9
- import EcdsaKAccountContractJson from '../../../artifacts/EcdsaKAccount.json' assert {
6
+ */ import { loadContractArtifact } from '@aztec/stdlib/abi';
7
+ import EcdsaKAccountContractJson from '../../../artifacts/EcdsaKAccount.json' with {
10
8
  type: 'json'
11
9
  };
12
10
  import { EcdsaKBaseAccountContract } from './account_contract.js';
@@ -23,22 +21,3 @@ export const EcdsaKAccountContractArtifact = loadContractArtifact(EcdsaKAccountC
23
21
  return Promise.resolve(EcdsaKAccountContractArtifact);
24
22
  }
25
23
  }
26
- /**
27
- * Creates an Account that relies on an ECDSA signing key for authentication.
28
- * @param pxe - An PXE server instance.
29
- * @param secretKey - Secret key used to derive all the keystore keys.
30
- * @param signingPrivateKey - Secp256k1 key used for signing transactions.
31
- * @param salt - Deployment salt.
32
- * @returns An account manager initialized with the account contract and its deployment params
33
- */ export function getEcdsaKAccount(pxe, secretKey, signingPrivateKey, salt) {
34
- return AccountManager.create(pxe, secretKey, new EcdsaKAccountContract(signingPrivateKey), salt);
35
- }
36
- /**
37
- * Gets a wallet for an already registered account using ECDSA signatures.
38
- * @param pxe - An PXE server instance.
39
- * @param address - Address for the account.
40
- * @param signingPrivateKey - ECDSA key used for signing transactions.
41
- * @returns A wallet for this account that can be used to interact with a contract instance.
42
- */ export function getEcdsaKWallet(pxe, address, signingPrivateKey) {
43
- return getWallet(pxe, address, new EcdsaKAccountContract(signingPrivateKey));
44
- }
@@ -1,17 +1,10 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="node" resolution-mode="require"/>
3
1
  /**
4
2
  * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
5
3
  * Consider using this account type when working with integrations with Ethereum wallets.
6
4
  *
7
5
  * @packageDocumentation
8
6
  */
9
- import { AccountManager, type Salt } from '@aztec/aztec.js/account';
10
- import { type AccountWallet } from '@aztec/aztec.js/wallet';
11
- import { Fr } from '@aztec/foundation/fields';
12
7
  import type { ContractArtifact } from '@aztec/stdlib/abi';
13
- import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
- import type { PXE } from '@aztec/stdlib/interfaces/client';
15
8
  import { EcdsaKBaseAccountContract } from './account_contract.js';
16
9
  /**
17
10
  * Lazily loads the contract artifact
@@ -27,21 +20,4 @@ export declare class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
27
20
  constructor(signingPrivateKey: Buffer);
28
21
  getContractArtifact(): Promise<ContractArtifact>;
29
22
  }
30
- /**
31
- * Creates an Account that relies on an ECDSA signing key for authentication.
32
- * @param pxe - An PXE server instance.
33
- * @param secretKey - Secret key used to derive all the keystore keys.
34
- * @param signingPrivateKey - Secp256k1 key used for signing transactions.
35
- * @param salt - Deployment salt.
36
- * @returns An account manager initialized with the account contract and its deployment params
37
- */
38
- export declare function getEcdsaKAccount(pxe: PXE, secretKey: Fr, signingPrivateKey: Buffer, salt?: Salt): Promise<AccountManager>;
39
- /**
40
- * Gets a wallet for an already registered account using ECDSA signatures.
41
- * @param pxe - An PXE server instance.
42
- * @param address - Address for the account.
43
- * @param signingPrivateKey - ECDSA key used for signing transactions.
44
- * @returns A wallet for this account that can be used to interact with a contract instance.
45
- */
46
- export declare function getEcdsaKWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet>;
47
- //# sourceMappingURL=lazy.d.ts.map
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VjZHNhL2VjZHNhX2svbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7R0FLRztBQUNILE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHMUQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEU7OztHQUdHO0FBQ0gsd0JBQXNCLGdDQUFnQyw4QkFRckQ7QUFFRDs7OztHQUlHO0FBQ0gscUJBQWEscUJBQXNCLFNBQVEseUJBQXlCO0lBQ2xFLFlBQVksaUJBQWlCLEVBQUUsTUFBTSxFQUVwQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/lazy.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,KAAK,aAAa,EAAa,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE;;;GAGG;AACH,wBAAsB,gCAAgC,8BAQrD;AAED;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;gBACtD,iBAAiB,EAAE,MAAM;IAI5B,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAG1D;AACD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,EACb,iBAAiB,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,IAAI,GACV,OAAO,CAAC,cAAc,CAAC,CAEzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAElH"}
1
+ {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_k/lazy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE;;;GAGG;AACH,wBAAsB,gCAAgC,8BAQrD;AAED;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;IAClE,YAAY,iBAAiB,EAAE,MAAM,EAEpC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF"}
@@ -3,18 +3,16 @@
3
3
  * Consider using this account type when working with integrations with Ethereum wallets.
4
4
  *
5
5
  * @packageDocumentation
6
- */ import { AccountManager } from '@aztec/aztec.js/account';
7
- import { getWallet } from '@aztec/aztec.js/wallet';
8
- import { loadContractArtifact } from '@aztec/stdlib/abi';
6
+ */ import { loadContractArtifact } from '@aztec/stdlib/abi';
9
7
  import { EcdsaKBaseAccountContract } from './account_contract.js';
10
8
  /**
11
9
  * Lazily loads the contract artifact
12
10
  * @returns The contract artifact for the ecdsa K account contract
13
11
  */ export async function getEcdsaKAccountContractArtifact() {
14
- // Cannot assert this import as it's incompatible with browsers
15
- // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
16
- // Use the new "with" syntax once supported by firefox
17
- // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
12
+ // Cannot assert this import as it's incompatible with bundlers like vite
13
+ // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
14
+ // Even if now supported by al major browsers, the MIME type is replaced with
15
+ // "text/javascript"
18
16
  // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
19
17
  const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaKAccount.json');
20
18
  return loadContractArtifact(ecdsaKAccountContractJson);
@@ -31,22 +29,3 @@ import { EcdsaKBaseAccountContract } from './account_contract.js';
31
29
  return getEcdsaKAccountContractArtifact();
32
30
  }
33
31
  }
34
- /**
35
- * Creates an Account that relies on an ECDSA signing key for authentication.
36
- * @param pxe - An PXE server instance.
37
- * @param secretKey - Secret key used to derive all the keystore keys.
38
- * @param signingPrivateKey - Secp256k1 key used for signing transactions.
39
- * @param salt - Deployment salt.
40
- * @returns An account manager initialized with the account contract and its deployment params
41
- */ export function getEcdsaKAccount(pxe, secretKey, signingPrivateKey, salt) {
42
- return AccountManager.create(pxe, secretKey, new EcdsaKAccountContract(signingPrivateKey), salt);
43
- }
44
- /**
45
- * Gets a wallet for an already registered account using ECDSA signatures.
46
- * @param pxe - An PXE server instance.
47
- * @param address - Address for the account.
48
- * @param signingPrivateKey - ECDSA key used for signing transactions.
49
- * @returns A wallet for this account that can be used to interact with a contract instance.
50
- */ export function getEcdsaKWallet(pxe, address, signingPrivateKey) {
51
- return getWallet(pxe, address, new EcdsaKAccountContract(signingPrivateKey));
52
- }
@@ -0,0 +1,19 @@
1
+ import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
2
+ import { CompleteAddress } from '@aztec/stdlib/contract';
3
+ import { DefaultAccountContract } from '../../defaults/account_contract.js';
4
+ /**
5
+ * Account contract that authenticates transactions using ECDSA signatures
6
+ * verified against a secp256r1 public key stored in an immutable encrypted note.
7
+ * This abstract version does not provide a way to retrieve the artifact, as it
8
+ * can be implemented with or without lazy loading.
9
+ */
10
+ export declare abstract class EcdsaRBaseAccountContract extends DefaultAccountContract {
11
+ private signingPrivateKey;
12
+ constructor(signingPrivateKey: Buffer);
13
+ getInitializationFunctionAndArgs(): Promise<{
14
+ constructorName: string;
15
+ constructorArgs: Buffer<ArrayBufferLike>[];
16
+ }>;
17
+ getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider;
18
+ }
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VjZHNhL2VjZHNhX3IvYWNjb3VudF9jb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSW5FLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUU1RTs7Ozs7R0FLRztBQUNILDhCQUFzQix5QkFBMEIsU0FBUSxzQkFBc0I7SUFDaEUsT0FBTyxDQUFDLGlCQUFpQjtJQUFyQyxZQUFvQixpQkFBaUIsRUFBRSxNQUFNLEVBRTVDO0lBRUssZ0NBQWdDOzs7T0FNckM7SUFFRCxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsZUFBZSxHQUFHLG1CQUFtQixDQUVyRTtDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_r/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E;;;;;GAKG;AACH,8BAAsB,yBAA0B,SAAQ,sBAAsB;IAChE,OAAO,CAAC,iBAAiB;IAArC,YAAoB,iBAAiB,EAAE,MAAM,EAE5C;IAEK,gCAAgC;;;OAMrC;IAED,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,mBAAmB,CAErE;CACF"}
@@ -0,0 +1,41 @@
1
+ import { Ecdsa } from '@aztec/foundation/crypto';
2
+ import { AuthWitness } from '@aztec/stdlib/auth-witness';
3
+ import { DefaultAccountContract } from '../../defaults/account_contract.js';
4
+ /**
5
+ * Account contract that authenticates transactions using ECDSA signatures
6
+ * verified against a secp256r1 public key stored in an immutable encrypted note.
7
+ * This abstract version does not provide a way to retrieve the artifact, as it
8
+ * can be implemented with or without lazy loading.
9
+ */ export class EcdsaRBaseAccountContract extends DefaultAccountContract {
10
+ signingPrivateKey;
11
+ constructor(signingPrivateKey){
12
+ super(), this.signingPrivateKey = signingPrivateKey;
13
+ }
14
+ async getInitializationFunctionAndArgs() {
15
+ const signingPublicKey = await new Ecdsa('secp256r1').computePublicKey(this.signingPrivateKey);
16
+ return {
17
+ constructorName: 'constructor',
18
+ constructorArgs: [
19
+ signingPublicKey.subarray(0, 32),
20
+ signingPublicKey.subarray(32, 64)
21
+ ]
22
+ };
23
+ }
24
+ getAuthWitnessProvider(_address) {
25
+ return new EcdsaRAuthWitnessProvider(this.signingPrivateKey);
26
+ }
27
+ }
28
+ /** Creates auth witnesses using ECDSA signatures. */ class EcdsaRAuthWitnessProvider {
29
+ signingPrivateKey;
30
+ constructor(signingPrivateKey){
31
+ this.signingPrivateKey = signingPrivateKey;
32
+ }
33
+ async createAuthWit(messageHash) {
34
+ const ecdsa = new Ecdsa('secp256r1');
35
+ const signature = await ecdsa.constructSignature(messageHash.toBuffer(), this.signingPrivateKey);
36
+ return Promise.resolve(new AuthWitness(messageHash, [
37
+ ...signature.r,
38
+ ...signature.s
39
+ ]));
40
+ }
41
+ }
@@ -0,0 +1,19 @@
1
+ /**
2
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
3
+ * Consider using this account type when working with integrations with Ethereum wallets.
4
+ *
5
+ * @packageDocumentation
6
+ */
7
+ import type { ContractArtifact } from '@aztec/stdlib/abi';
8
+ import { EcdsaRBaseAccountContract } from './account_contract.js';
9
+ export declare const EcdsaRAccountContractArtifact: ContractArtifact;
10
+ /**
11
+ * Account contract that authenticates transactions using ECDSA signatures
12
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
13
+ * Eagerly loads the contract artifact
14
+ */
15
+ export declare class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
16
+ constructor(signingPrivateKey: Buffer);
17
+ getContractArtifact(): Promise<ContractArtifact>;
18
+ }
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lY2RzYS9lY2RzYV9yL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUsxRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxlQUFPLE1BQU0sNkJBQTZCLEVBQUUsZ0JBRTNDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gscUJBQWEscUJBQXNCLFNBQVEseUJBQXlCO0lBQ2xFLFlBQVksaUJBQWlCLEVBQUUsTUFBTSxFQUVwQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_r/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,6BAA6B,EAAE,gBAE3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;IAClE,YAAY,iBAAiB,EAAE,MAAM,EAEpC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF"}
@@ -0,0 +1,23 @@
1
+ /**
2
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
3
+ * Consider using this account type when working with integrations with Ethereum wallets.
4
+ *
5
+ * @packageDocumentation
6
+ */ import { loadContractArtifact } from '@aztec/stdlib/abi';
7
+ import EcdsaRAccountContractJson from '../../../artifacts/EcdsaRAccount.json' with {
8
+ type: 'json'
9
+ };
10
+ import { EcdsaRBaseAccountContract } from './account_contract.js';
11
+ export const EcdsaRAccountContractArtifact = loadContractArtifact(EcdsaRAccountContractJson);
12
+ /**
13
+ * Account contract that authenticates transactions using ECDSA signatures
14
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
15
+ * Eagerly loads the contract artifact
16
+ */ export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
17
+ constructor(signingPrivateKey){
18
+ super(signingPrivateKey);
19
+ }
20
+ getContractArtifact() {
21
+ return Promise.resolve(EcdsaRAccountContractArtifact);
22
+ }
23
+ }
@@ -0,0 +1,23 @@
1
+ /**
2
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
3
+ * Consider using this account type when working with integrations with Ethereum wallets.
4
+ *
5
+ * @packageDocumentation
6
+ */
7
+ import type { ContractArtifact } from '@aztec/stdlib/abi';
8
+ import { EcdsaRBaseAccountContract } from './account_contract.js';
9
+ /**
10
+ * Lazily loads the contract artifact
11
+ * @returns The contract artifact for the ecdsa K account contract
12
+ */
13
+ export declare function getEcdsaRAccountContractArtifact(): Promise<ContractArtifact>;
14
+ /**
15
+ * Account contract that authenticates transactions using ECDSA signatures
16
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
17
+ * Lazily loads the contract artifact
18
+ */
19
+ export declare class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
20
+ constructor(signingPrivateKey: Buffer);
21
+ getContractArtifact(): Promise<ContractArtifact>;
22
+ }
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VjZHNhL2VjZHNhX3IvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7R0FLRztBQUNILE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHMUQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEU7OztHQUdHO0FBQ0gsd0JBQXNCLGdDQUFnQyw4QkFRckQ7QUFFRDs7OztHQUlHO0FBQ0gscUJBQWEscUJBQXNCLFNBQVEseUJBQXlCO0lBQ2xFLFlBQVksaUJBQWlCLEVBQUUsTUFBTSxFQUVwQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../../src/ecdsa/ecdsa_r/lazy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE;;;GAGG;AACH,wBAAsB,gCAAgC,8BAQrD;AAED;;;;GAIG;AACH,qBAAa,qBAAsB,SAAQ,yBAAyB;IAClE,YAAY,iBAAiB,EAAE,MAAM,EAEpC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF"}
@@ -0,0 +1,31 @@
1
+ /**
2
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
3
+ * Consider using this account type when working with integrations with Ethereum wallets.
4
+ *
5
+ * @packageDocumentation
6
+ */ import { loadContractArtifact } from '@aztec/stdlib/abi';
7
+ import { EcdsaRBaseAccountContract } from './account_contract.js';
8
+ /**
9
+ * Lazily loads the contract artifact
10
+ * @returns The contract artifact for the ecdsa K account contract
11
+ */ export async function getEcdsaRAccountContractArtifact() {
12
+ // Cannot assert this import as it's incompatible with bundlers like vite
13
+ // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
14
+ // Even if now supported by al major browsers, the MIME type is replaced with
15
+ // "text/javascript"
16
+ // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
17
+ const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaRAccount.json');
18
+ return loadContractArtifact(ecdsaKAccountContractJson);
19
+ }
20
+ /**
21
+ * Account contract that authenticates transactions using ECDSA signatures
22
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
23
+ * Lazily loads the contract artifact
24
+ */ export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
25
+ constructor(signingPrivateKey){
26
+ super(signingPrivateKey);
27
+ }
28
+ getContractArtifact() {
29
+ return getEcdsaRAccountContractArtifact();
30
+ }
31
+ }
@@ -1,3 +1,4 @@
1
1
  export * from './ecdsa_k/index.js';
2
+ export * from './ecdsa_r/index.js';
2
3
  export * from './ssh_ecdsa_r/index.js';
3
- //# sourceMappingURL=index.d.ts.map
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lY2RzYS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx3QkFBd0IsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ecdsa/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ecdsa/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC"}
@@ -1,2 +1,3 @@
1
1
  export * from './ecdsa_k/index.js';
2
+ export * from './ecdsa_r/index.js';
2
3
  export * from './ssh_ecdsa_r/index.js';
@@ -1,3 +1,4 @@
1
1
  export * from './ecdsa_k/lazy.js';
2
+ export * from './ecdsa_r/lazy.js';
2
3
  export * from './ssh_ecdsa_r/lazy.js';
3
- //# sourceMappingURL=lazy.d.ts.map
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2VjZHNhL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsdUJBQXVCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/ecdsa/lazy.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/ecdsa/lazy.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}
@@ -1,2 +1,3 @@
1
1
  export * from './ecdsa_k/lazy.js';
2
+ export * from './ecdsa_r/lazy.js';
2
3
  export * from './ssh_ecdsa_r/lazy.js';
@@ -1,5 +1,3 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="node" resolution-mode="require"/>
3
1
  import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
4
2
  import { CompleteAddress } from '@aztec/stdlib/contract';
5
3
  import { DefaultAccountContract } from '../../defaults/account_contract.js';
@@ -15,7 +13,10 @@ import { DefaultAccountContract } from '../../defaults/account_contract.js';
15
13
  export declare abstract class EcdsaRSSHBaseAccountContract extends DefaultAccountContract {
16
14
  private signingPublicKey;
17
15
  constructor(signingPublicKey: Buffer);
18
- getDeploymentArgs(): Promise<Buffer[]>;
16
+ getInitializationFunctionAndArgs(): Promise<{
17
+ constructorName: string;
18
+ constructorArgs: Buffer<ArrayBufferLike>[];
19
+ }>;
19
20
  getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider;
20
21
  }
21
- //# sourceMappingURL=account_contract.d.ts.map
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VjZHNhL3NzaF9lY2RzYV9yL2FjY291bnRfY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUluRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFekQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFJNUU7Ozs7Ozs7O0dBUUc7QUFDSCw4QkFBc0IsNEJBQTZCLFNBQVEsc0JBQXNCO0lBQ25FLE9BQU8sQ0FBQyxnQkFBZ0I7SUFBcEMsWUFBb0IsZ0JBQWdCLEVBQUUsTUFBTSxFQUUzQztJQUVELGdDQUFnQzs7O09BSy9CO0lBRUQsc0JBQXNCLENBQUMsUUFBUSxFQUFFLGVBQWUsR0FBRyxtQkFBbUIsQ0FFckU7Q0FDRiJ9