@aztec/entrypoints 0.40.1 → 0.42.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../src/account_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../src/account_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,EAA0B,MAAM,oBAAoB,CAAC;AAK/E;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,mBAAmB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAHP,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwBvF,OAAO,CAAC,gBAAgB;CAmGzB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EntrypointPayload } from '@aztec/aztec.js/entrypoint';
|
|
2
2
|
import { PackedValues, TxExecutionRequest } from '@aztec/circuit-types';
|
|
3
|
-
import {
|
|
4
|
-
import { encodeArguments } from '@aztec/foundation/abi';
|
|
3
|
+
import { GasSettings, TxContext } from '@aztec/circuits.js';
|
|
4
|
+
import { FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
|
|
5
5
|
import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
|
|
6
6
|
/**
|
|
7
7
|
* Implementation for an entrypoint interface that follows the default entrypoint signature
|
|
@@ -17,7 +17,7 @@ export class DefaultAccountEntrypoint {
|
|
|
17
17
|
async createTxExecutionRequest(exec) {
|
|
18
18
|
const { calls, fee } = exec;
|
|
19
19
|
const appPayload = EntrypointPayload.fromAppExecution(calls);
|
|
20
|
-
const feePayload = await EntrypointPayload.fromFeeOptions(fee);
|
|
20
|
+
const feePayload = await EntrypointPayload.fromFeeOptions(this.address, fee);
|
|
21
21
|
const abi = this.getEntrypointAbi();
|
|
22
22
|
const entrypointPackedArgs = PackedValues.fromValues(encodeArguments(abi, [appPayload, feePayload]));
|
|
23
23
|
const gasSettings = exec.fee?.gasSettings ?? GasSettings.default();
|
|
@@ -26,7 +26,7 @@ export class DefaultAccountEntrypoint {
|
|
|
26
26
|
const txRequest = TxExecutionRequest.from({
|
|
27
27
|
firstCallArgsHash: entrypointPackedArgs.hash,
|
|
28
28
|
origin: this.address,
|
|
29
|
-
|
|
29
|
+
functionSelector: FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
|
|
30
30
|
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
31
31
|
argsOfCalls: [...appPayload.packedArguments, ...feePayload.packedArguments, entrypointPackedArgs],
|
|
32
32
|
authWitnesses: [appAuthWitness, feeAuthWitness],
|
|
@@ -37,8 +37,9 @@ export class DefaultAccountEntrypoint {
|
|
|
37
37
|
return {
|
|
38
38
|
name: 'entrypoint',
|
|
39
39
|
isInitializer: false,
|
|
40
|
-
functionType: '
|
|
40
|
+
functionType: 'private',
|
|
41
41
|
isInternal: false,
|
|
42
|
+
isStatic: false,
|
|
42
43
|
parameters: [
|
|
43
44
|
{
|
|
44
45
|
name: 'app_payload',
|
|
@@ -73,6 +74,7 @@ export class DefaultAccountEntrypoint {
|
|
|
73
74
|
},
|
|
74
75
|
},
|
|
75
76
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
77
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
76
78
|
],
|
|
77
79
|
},
|
|
78
80
|
},
|
|
@@ -115,11 +117,13 @@ export class DefaultAccountEntrypoint {
|
|
|
115
117
|
},
|
|
116
118
|
},
|
|
117
119
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
120
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
118
121
|
],
|
|
119
122
|
},
|
|
120
123
|
},
|
|
121
124
|
},
|
|
122
125
|
{ name: 'nonce', type: { kind: 'field' } },
|
|
126
|
+
{ name: 'is_fee_payer', type: { kind: 'boolean' } },
|
|
123
127
|
],
|
|
124
128
|
},
|
|
125
129
|
visibility: 'public',
|
|
@@ -129,4 +133,4 @@ export class DefaultAccountEntrypoint {
|
|
|
129
133
|
};
|
|
130
134
|
}
|
|
131
135
|
}
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FjY291bnRfZW50cnlwb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQTRCLGlCQUFpQixFQUE2QixNQUFNLDRCQUE0QixDQUFDO0FBQ3BILE9BQU8sRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RSxPQUFPLEVBQXFCLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMvRSxPQUFPLEVBQW9CLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTVGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVuRTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sd0JBQXdCO0lBQ25DLFlBQ1UsT0FBcUIsRUFDckIsSUFBeUIsRUFDekIsVUFBa0IsZ0JBQWdCLEVBQ2xDLFVBQWtCLGVBQWU7UUFIakMsWUFBTyxHQUFQLE9BQU8sQ0FBYztRQUNyQixTQUFJLEdBQUosSUFBSSxDQUFxQjtRQUN6QixZQUFPLEdBQVAsT0FBTyxDQUEyQjtRQUNsQyxZQUFPLEdBQVAsT0FBTyxDQUEwQjtJQUN4QyxDQUFDO0lBRUosS0FBSyxDQUFDLHdCQUF3QixDQUFDLElBQTBCO1FBQ3ZELE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDO1FBQzVCLE1BQU0sVUFBVSxHQUFHLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzdELE1BQU0sVUFBVSxHQUFHLE1BQU0saUJBQWlCLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFFN0UsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDcEMsTUFBTSxvQkFB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dapp_entrypoint.d.ts","sourceRoot":"","sources":["../src/dapp_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"dapp_entrypoint.d.ts","sourceRoot":"","sources":["../src/dapp_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,mBAAmB,EAAqB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAgB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,EAA8B,MAAM,oBAAoB,CAAC;AAKnF;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,mBAAmB;IAE7D,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAJP,WAAW,EAAE,YAAY,EACzB,uBAAuB,EAAE,mBAAmB,EAC5C,qBAAqB,EAAE,YAAY,EACnC,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmCvF,OAAO,CAAC,gBAAgB;CAgEzB"}
|
package/dest/dapp_entrypoint.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.js';
|
|
2
2
|
import { EntrypointPayload } from '@aztec/aztec.js/entrypoint';
|
|
3
3
|
import { PackedValues, TxExecutionRequest } from '@aztec/circuit-types';
|
|
4
|
-
import { Fr,
|
|
5
|
-
import { encodeArguments } from '@aztec/foundation/abi';
|
|
4
|
+
import { Fr, GasSettings, TxContext } from '@aztec/circuits.js';
|
|
5
|
+
import { FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
|
|
6
6
|
import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
|
|
7
7
|
/**
|
|
8
8
|
* Implementation for an entrypoint interface that follows the default entrypoint signature
|
|
@@ -25,14 +25,14 @@ export class DefaultDappEntrypoint {
|
|
|
25
25
|
const abi = this.getEntrypointAbi();
|
|
26
26
|
const entrypointPackedArgs = PackedValues.fromValues(encodeArguments(abi, [payload, this.userAddress]));
|
|
27
27
|
const gasSettings = exec.fee?.gasSettings ?? GasSettings.default();
|
|
28
|
-
const
|
|
29
|
-
const innerHash = computeInnerAuthWitHash([Fr.ZERO,
|
|
28
|
+
const functionSelector = FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
|
|
29
|
+
const innerHash = computeInnerAuthWitHash([Fr.ZERO, functionSelector.toField(), entrypointPackedArgs.hash]);
|
|
30
30
|
const outerHash = computeOuterAuthWitHash(this.dappEntrypointAddress, new Fr(this.chainId), new Fr(this.version), innerHash);
|
|
31
31
|
const authWitness = await this.userAuthWitnessProvider.createAuthWit(outerHash);
|
|
32
32
|
const txRequest = TxExecutionRequest.from({
|
|
33
33
|
firstCallArgsHash: entrypointPackedArgs.hash,
|
|
34
34
|
origin: this.dappEntrypointAddress,
|
|
35
|
-
|
|
35
|
+
functionSelector,
|
|
36
36
|
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
37
37
|
argsOfCalls: [...payload.packedArguments, entrypointPackedArgs],
|
|
38
38
|
authWitnesses: [authWitness],
|
|
@@ -43,8 +43,9 @@ export class DefaultDappEntrypoint {
|
|
|
43
43
|
return {
|
|
44
44
|
name: 'entrypoint',
|
|
45
45
|
isInitializer: false,
|
|
46
|
-
functionType: '
|
|
46
|
+
functionType: 'private',
|
|
47
47
|
isInternal: false,
|
|
48
|
+
isStatic: false,
|
|
48
49
|
parameters: [
|
|
49
50
|
{
|
|
50
51
|
name: 'payload',
|
|
@@ -79,6 +80,7 @@ export class DefaultDappEntrypoint {
|
|
|
79
80
|
},
|
|
80
81
|
},
|
|
81
82
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
83
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
82
84
|
],
|
|
83
85
|
},
|
|
84
86
|
},
|
|
@@ -102,4 +104,4 @@ export class DefaultDappEntrypoint {
|
|
|
102
104
|
};
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFwcF9lbnRyeXBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2RhcHBfZW50cnlwb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVuRixPQUFPLEVBQTRCLGlCQUFpQixFQUE2QixNQUFNLDRCQUE0QixDQUFDO0FBQ3BILE9BQU8sRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RSxPQUFPLEVBQXFCLEVBQUUsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbkYsT0FBTyxFQUFvQixnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU1RixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFbkU7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHFCQUFxQjtJQUNoQyxZQUNVLFdBQXlCLEVBQ3pCLHVCQUE0QyxFQUM1QyxxQkFBbUMsRUFDbkMsVUFBa0IsZ0JBQWdCLEVBQ2xDLFVBQWtCLGVBQWU7UUFKakMsZ0JBQVcsR0FBWCxXQUFXLENBQWM7UUFDekIsNEJBQXVCLEdBQXZCLHVCQUF1QixDQUFxQjtRQUM1QywwQkFBcUIsR0FBckIscUJBQXFCLENBQWM7UUFDbkMsWUFBTyxHQUFQLE9BQU8sQ0FBMkI7UUFDbEMsWUFBTyxHQUFQLE9BQU8sQ0FBMEI7SUFDeEMsQ0FBQztJQUVKLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxJQUEwQjtRQUN2RCxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN2QixNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMs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
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@aztec/entrypoints",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/entrypoints",
|
|
4
4
|
"description": "Implementation of sample contract entrypoints for the Aztec Network",
|
|
5
|
-
"version": "0.
|
|
5
|
+
"version": "0.42.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
8
8
|
"./dapp": "./dest/dapp_entrypoint.js",
|
|
@@ -51,11 +51,11 @@
|
|
|
51
51
|
]
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@aztec/aztec.js": "0.
|
|
55
|
-
"@aztec/circuit-types": "0.
|
|
56
|
-
"@aztec/circuits.js": "0.
|
|
57
|
-
"@aztec/foundation": "0.
|
|
58
|
-
"@aztec/protocol-contracts": "0.
|
|
54
|
+
"@aztec/aztec.js": "0.42.0",
|
|
55
|
+
"@aztec/circuit-types": "0.42.0",
|
|
56
|
+
"@aztec/circuits.js": "0.42.0",
|
|
57
|
+
"@aztec/foundation": "0.42.0",
|
|
58
|
+
"@aztec/protocol-contracts": "0.42.0",
|
|
59
59
|
"tslib": "^2.4.0"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
|
|
2
2
|
import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
|
|
3
3
|
import { PackedValues, TxExecutionRequest } from '@aztec/circuit-types';
|
|
4
|
-
import { type AztecAddress,
|
|
5
|
-
import { type FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
|
|
4
|
+
import { type AztecAddress, GasSettings, TxContext } from '@aztec/circuits.js';
|
|
5
|
+
import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
|
|
6
6
|
|
|
7
7
|
import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
|
|
8
8
|
|
|
@@ -21,7 +21,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
21
21
|
async createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
|
|
22
22
|
const { calls, fee } = exec;
|
|
23
23
|
const appPayload = EntrypointPayload.fromAppExecution(calls);
|
|
24
|
-
const feePayload = await EntrypointPayload.fromFeeOptions(fee);
|
|
24
|
+
const feePayload = await EntrypointPayload.fromFeeOptions(this.address, fee);
|
|
25
25
|
|
|
26
26
|
const abi = this.getEntrypointAbi();
|
|
27
27
|
const entrypointPackedArgs = PackedValues.fromValues(encodeArguments(abi, [appPayload, feePayload]));
|
|
@@ -33,7 +33,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
33
33
|
const txRequest = TxExecutionRequest.from({
|
|
34
34
|
firstCallArgsHash: entrypointPackedArgs.hash,
|
|
35
35
|
origin: this.address,
|
|
36
|
-
|
|
36
|
+
functionSelector: FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
|
|
37
37
|
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
38
38
|
argsOfCalls: [...appPayload.packedArguments, ...feePayload.packedArguments, entrypointPackedArgs],
|
|
39
39
|
authWitnesses: [appAuthWitness, feeAuthWitness],
|
|
@@ -46,8 +46,9 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
46
46
|
return {
|
|
47
47
|
name: 'entrypoint',
|
|
48
48
|
isInitializer: false,
|
|
49
|
-
functionType: '
|
|
49
|
+
functionType: 'private',
|
|
50
50
|
isInternal: false,
|
|
51
|
+
isStatic: false,
|
|
51
52
|
parameters: [
|
|
52
53
|
{
|
|
53
54
|
name: 'app_payload',
|
|
@@ -82,6 +83,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
82
83
|
},
|
|
83
84
|
},
|
|
84
85
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
86
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
85
87
|
],
|
|
86
88
|
},
|
|
87
89
|
},
|
|
@@ -124,11 +126,13 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
|
|
|
124
126
|
},
|
|
125
127
|
},
|
|
126
128
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
129
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
127
130
|
],
|
|
128
131
|
},
|
|
129
132
|
},
|
|
130
133
|
},
|
|
131
134
|
{ name: 'nonce', type: { kind: 'field' } },
|
|
135
|
+
{ name: 'is_fee_payer', type: { kind: 'boolean' } },
|
|
132
136
|
],
|
|
133
137
|
},
|
|
134
138
|
visibility: 'public',
|
package/src/dapp_entrypoint.ts
CHANGED
|
@@ -2,8 +2,8 @@ import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.j
|
|
|
2
2
|
import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
|
|
3
3
|
import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
|
|
4
4
|
import { PackedValues, TxExecutionRequest } from '@aztec/circuit-types';
|
|
5
|
-
import { type AztecAddress, Fr,
|
|
6
|
-
import { type FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
|
|
5
|
+
import { type AztecAddress, Fr, GasSettings, TxContext } from '@aztec/circuits.js';
|
|
6
|
+
import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
|
|
7
7
|
|
|
8
8
|
import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
|
|
9
9
|
|
|
@@ -31,9 +31,9 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
|
|
|
31
31
|
const abi = this.getEntrypointAbi();
|
|
32
32
|
const entrypointPackedArgs = PackedValues.fromValues(encodeArguments(abi, [payload, this.userAddress]));
|
|
33
33
|
const gasSettings = exec.fee?.gasSettings ?? GasSettings.default();
|
|
34
|
-
const
|
|
34
|
+
const functionSelector = FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
|
|
35
35
|
|
|
36
|
-
const innerHash = computeInnerAuthWitHash([Fr.ZERO,
|
|
36
|
+
const innerHash = computeInnerAuthWitHash([Fr.ZERO, functionSelector.toField(), entrypointPackedArgs.hash]);
|
|
37
37
|
const outerHash = computeOuterAuthWitHash(
|
|
38
38
|
this.dappEntrypointAddress,
|
|
39
39
|
new Fr(this.chainId),
|
|
@@ -46,7 +46,7 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
|
|
|
46
46
|
const txRequest = TxExecutionRequest.from({
|
|
47
47
|
firstCallArgsHash: entrypointPackedArgs.hash,
|
|
48
48
|
origin: this.dappEntrypointAddress,
|
|
49
|
-
|
|
49
|
+
functionSelector,
|
|
50
50
|
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
51
51
|
argsOfCalls: [...payload.packedArguments, entrypointPackedArgs],
|
|
52
52
|
authWitnesses: [authWitness],
|
|
@@ -59,8 +59,9 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
|
|
|
59
59
|
return {
|
|
60
60
|
name: 'entrypoint',
|
|
61
61
|
isInitializer: false,
|
|
62
|
-
functionType: '
|
|
62
|
+
functionType: 'private',
|
|
63
63
|
isInternal: false,
|
|
64
|
+
isStatic: false,
|
|
64
65
|
parameters: [
|
|
65
66
|
{
|
|
66
67
|
name: 'payload',
|
|
@@ -95,6 +96,7 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
|
|
|
95
96
|
},
|
|
96
97
|
},
|
|
97
98
|
{ name: 'is_public', type: { kind: 'boolean' } },
|
|
99
|
+
{ name: 'is_static', type: { kind: 'boolean' } },
|
|
98
100
|
],
|
|
99
101
|
},
|
|
100
102
|
},
|