@aztec/aztec.js 0.1.0-alpha47 → 0.1.0-alpha48
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.
- package/.tsbuildinfo +1 -1
- package/dest/abis/ecdsa_account_contract.json +3 -3
- package/dest/abis/schnorr_account_contract.json +3 -3
- package/dest/abis/schnorr_single_key_account_contract.json +2 -2
- package/dest/account/contract/index.d.ts +8 -4
- package/dest/account/contract/index.d.ts.map +1 -1
- package/dest/account/contract/index.js +2 -1
- package/dest/account/entrypoint/entrypoint_payload.d.ts +4 -3
- package/dest/account/entrypoint/entrypoint_payload.d.ts.map +1 -1
- package/dest/account/entrypoint/entrypoint_payload.js +12 -10
- package/dest/account/entrypoint/entrypoint_utils.d.ts +14 -0
- package/dest/account/entrypoint/entrypoint_utils.d.ts.map +1 -0
- package/dest/account/entrypoint/entrypoint_utils.js +24 -0
- package/dest/account/entrypoint/index.d.ts +2 -0
- package/dest/account/entrypoint/index.d.ts.map +1 -1
- package/dest/account/entrypoint/index.js +4 -1
- package/dest/account/entrypoint/single_key_account_entrypoint.d.ts.map +1 -1
- package/dest/account/entrypoint/single_key_account_entrypoint.js +5 -8
- package/dest/account/entrypoint/stored_key_account_entrypoint.d.ts.map +1 -1
- package/dest/account/entrypoint/stored_key_account_entrypoint.js +5 -8
- package/dest/aztec_rpc_client/aztec_rpc_client.d.ts.map +1 -1
- package/dest/aztec_rpc_client/aztec_rpc_client.js +4 -4
- package/dest/aztec_rpc_client/wallet.d.ts +3 -3
- package/dest/aztec_rpc_client/wallet.d.ts.map +1 -1
- package/dest/aztec_rpc_client/wallet.js +5 -5
- package/dest/contract/base_contract_interaction.d.ts +4 -0
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/base_contract_interaction.js +2 -2
- package/dest/contract/contract.d.ts.map +1 -1
- package/dest/contract/contract.js +4 -4
- package/dest/contract/contract.test.js +16 -9
- package/dest/contract/contract_base.d.ts +6 -6
- package/dest/contract/contract_base.d.ts.map +1 -1
- package/dest/contract/contract_base.js +9 -6
- package/dest/contract_deployer/deploy_method.d.ts +3 -6
- package/dest/contract_deployer/deploy_method.d.ts.map +1 -1
- package/dest/contract_deployer/deploy_method.js +5 -8
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/main.js +1 -1
- package/package.json +4 -4
- package/src/abis/ecdsa_account_contract.json +3 -3
- package/src/abis/schnorr_account_contract.json +3 -3
- package/src/abis/schnorr_single_key_account_contract.json +2 -2
- package/src/account/contract/index.ts +10 -4
- package/src/account/entrypoint/entrypoint_payload.ts +13 -13
- package/src/account/entrypoint/entrypoint_utils.ts +31 -0
- package/src/account/entrypoint/index.ts +6 -0
- package/src/account/entrypoint/single_key_account_entrypoint.ts +4 -8
- package/src/account/entrypoint/stored_key_account_entrypoint.ts +4 -8
- package/src/aztec_rpc_client/aztec_rpc_client.ts +3 -4
- package/src/aztec_rpc_client/wallet.ts +5 -5
- package/src/contract/base_contract_interaction.ts +5 -1
- package/src/contract/contract.test.ts +17 -8
- package/src/contract/contract.ts +3 -3
- package/src/contract/contract_base.ts +9 -6
- package/src/contract_deployer/deploy_method.ts +5 -10
- package/src/index.ts +2 -2
|
@@ -14,7 +14,7 @@ export class BaseContractInteraction {
|
|
|
14
14
|
*/
|
|
15
15
|
async simulate(options = {}) {
|
|
16
16
|
const txRequest = this.txRequest ?? (await this.create(options));
|
|
17
|
-
this.tx = await this.rpc.simulateTx(txRequest);
|
|
17
|
+
this.tx = await this.rpc.simulateTx(txRequest, !options.skipPublicSimulation);
|
|
18
18
|
return this.tx;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
@@ -34,4 +34,4 @@ export class BaseContractInteraction {
|
|
|
34
34
|
return new SentTx(this.rpc, promise);
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9jb250cmFjdF9pbnRlcmFjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9iYXNlX2NvbnRyYWN0X2ludGVyYWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFpQnRDOzs7R0FHRztBQUNILE1BQU0sT0FBZ0IsdUJBQXVCO0lBSTNDLFlBQXNCLEdBQWE7UUFBYixRQUFHLEdBQUgsR0FBRyxDQUFVO0lBQUcsQ0FBQztJQVN2Qzs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUE2QixFQUFFO1FBQ25ELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDOUUsT0FBTyxJQUFJLENBQUMsRUFBRSxDQUFDO0lBQ2pCLENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNJLElBQUksQ0FBQyxVQUE2QixFQUFFO1FBQ3pDLE1BQU0sT0FBTyxHQUFHLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDMUIsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ3JELE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDN0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUVMLE9BQU8sSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN2QyxDQUFDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC;;;;;;OAMG;WACiB,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAOnG"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { isContractDeployed } from '../index.js';
|
|
2
1
|
import { ContractBase } from './contract_base.js';
|
|
3
2
|
/**
|
|
4
3
|
* The Contract class represents a contract and provides utility methods for interacting with it.
|
|
@@ -16,10 +15,11 @@ export class Contract extends ContractBase {
|
|
|
16
15
|
* @returns A promise that resolves to a new Contract instance.
|
|
17
16
|
*/
|
|
18
17
|
static async at(address, abi, wallet) {
|
|
19
|
-
|
|
18
|
+
const extendedContractData = await wallet.getExtendedContractData(address);
|
|
19
|
+
if (extendedContractData === undefined) {
|
|
20
20
|
throw new Error('Contract ' + address.toString() + ' is not deployed');
|
|
21
21
|
}
|
|
22
|
-
return new Contract(
|
|
22
|
+
return new Contract(extendedContractData.getCompleteAddress(), abi, wallet);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxRQUFTLFNBQVEsWUFBWTtJQUN4Qzs7Ozs7O09BTUc7SUFDSSxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFxQixFQUFFLEdBQWdCLEVBQUUsTUFBYztRQUM1RSxNQUFNLG9CQUFvQixHQUFHLE1BQU0sTUFBTSxDQUFDLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzNFLElBQUksb0JBQW9CLEtBQUssU0FBUyxFQUFFO1lBQ3RDLE1BQU0sSUFBSSxLQUFLLENBQUMsV0FBVyxHQUFHLE9BQU8sQ0FBQyxRQUFRLEVBQUUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDO1NBQ3hFO1FBQ0QsT0FBTyxJQUFJLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM5RSxDQUFDO0NBQ0YifQ==
|
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CompleteAddress, EthAddress } from '@aztec/circuits.js';
|
|
2
2
|
import { ABIParameterVisibility, FunctionType } from '@aztec/foundation/abi';
|
|
3
|
-
import {
|
|
3
|
+
import { ExtendedContractData, randomContractAbi, randomDeployedContract, } from '@aztec/types';
|
|
4
4
|
import { mock } from 'jest-mock-extended';
|
|
5
5
|
import { Contract } from './contract.js';
|
|
6
6
|
describe('Contract Class', () => {
|
|
7
7
|
let wallet;
|
|
8
|
-
|
|
8
|
+
let resolvedExtendedContractData;
|
|
9
|
+
let contractAddress;
|
|
9
10
|
let account;
|
|
10
11
|
const mockTx = { type: 'Tx' };
|
|
11
12
|
const mockTxRequest = { type: 'TxRequest' };
|
|
12
13
|
const mockTxHash = { type: 'TxHash' };
|
|
13
14
|
const mockTxReceipt = { type: 'TxReceipt' };
|
|
14
15
|
const mockViewResultValue = 1;
|
|
15
|
-
const mockNodeInfo = { version: 1, chainId: 2, rollupAddress: EthAddress.random() };
|
|
16
|
+
const mockNodeInfo = { version: 1, chainId: 2, rollupAddress: EthAddress.random(), client: '' };
|
|
16
17
|
const defaultAbi = {
|
|
17
18
|
name: 'FooContract',
|
|
18
19
|
functions: [
|
|
@@ -72,10 +73,12 @@ describe('Contract Class', () => {
|
|
|
72
73
|
],
|
|
73
74
|
};
|
|
74
75
|
beforeEach(async () => {
|
|
76
|
+
resolvedExtendedContractData = ExtendedContractData.random();
|
|
77
|
+
contractAddress = resolvedExtendedContractData.contractData.contractAddress;
|
|
75
78
|
account = await CompleteAddress.random();
|
|
76
79
|
wallet = mock();
|
|
77
80
|
wallet.createTxExecutionRequest.mockResolvedValue(mockTxRequest);
|
|
78
|
-
wallet.
|
|
81
|
+
wallet.getExtendedContractData.mockResolvedValue(resolvedExtendedContractData);
|
|
79
82
|
wallet.sendTx.mockResolvedValue(mockTxHash);
|
|
80
83
|
wallet.viewTx.mockResolvedValue(mockViewResultValue);
|
|
81
84
|
wallet.getTxReceipt.mockResolvedValue(mockTxReceipt);
|
|
@@ -117,8 +120,12 @@ describe('Contract Class', () => {
|
|
|
117
120
|
expect(() => fooContract.methods.baz().view()).toThrow();
|
|
118
121
|
});
|
|
119
122
|
it('should add contract and dependencies to aztec rpc', async () => {
|
|
120
|
-
const entry =
|
|
121
|
-
|
|
123
|
+
const entry = {
|
|
124
|
+
abi: randomContractAbi(),
|
|
125
|
+
completeAddress: resolvedExtendedContractData.getCompleteAddress(),
|
|
126
|
+
portalContract: EthAddress.random(),
|
|
127
|
+
};
|
|
128
|
+
const contract = await Contract.at(entry.completeAddress.address, entry.abi, wallet);
|
|
122
129
|
{
|
|
123
130
|
await contract.attach(entry.portalContract);
|
|
124
131
|
expect(wallet.addContracts).toHaveBeenCalledTimes(1);
|
|
@@ -126,11 +133,11 @@ describe('Contract Class', () => {
|
|
|
126
133
|
wallet.addContracts.mockClear();
|
|
127
134
|
}
|
|
128
135
|
{
|
|
129
|
-
const dependencies = [randomDeployedContract(), randomDeployedContract()];
|
|
136
|
+
const dependencies = [await randomDeployedContract(), await randomDeployedContract()];
|
|
130
137
|
await contract.attach(entry.portalContract, dependencies);
|
|
131
138
|
expect(wallet.addContracts).toHaveBeenCalledTimes(1);
|
|
132
139
|
expect(wallet.addContracts).toHaveBeenCalledWith([entry, ...dependencies]);
|
|
133
140
|
}
|
|
134
141
|
});
|
|
135
142
|
});
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdC50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0IsZUFBZSxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQy9FLE9BQU8sRUFBRSxzQkFBc0IsRUFBZSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRixPQUFPLEVBRUwsb0JBQW9CLEVBTXBCLGlCQUFpQixFQUNqQixzQkFBc0IsR0FDdkIsTUFBTSxjQUFjLENBQUM7QUFFdEIsT0FBTyxFQUFhLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFekMsUUFBUSxDQUFDLGdCQUFnQixFQUFFLEdBQUcsRUFBRTtJQUM5QixJQUFJLE1BQXlCLENBQUM7SUFDOUIsSUFBSSw0QkFBa0QsQ0FBQztJQUN2RCxJQUFJLGVBQTZCLENBQUM7SUFDbEMsSUFBSSxPQUF3QixDQUFDO0lBRTdCLE1BQU0sTUFBTSxHQUFHLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBZSxDQUFDO0lBQzNDLE1BQU0sYUFBYSxHQUFHLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBK0IsQ0FBQztJQUN6RSxNQUFNLFVBQVUsR0FBRyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQW1CLENBQUM7SUFDdkQsTUFBTSxhQUFhLEdBQUcsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFzQixDQUFDO0lBQ2hFLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxDQUFDO0lBQzlCLE1BQU0sWUFBWSxHQUFhLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBRTFHLE1BQU0sVUFBVSxH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
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ContractAbi, FunctionSelector } from '@aztec/foundation/abi';
|
|
2
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
-
import { DeployedContract } from '@aztec/types';
|
|
3
|
+
import { CompleteAddress, DeployedContract } from '@aztec/types';
|
|
5
4
|
import { Wallet } from '../aztec_rpc_client/wallet.js';
|
|
6
5
|
import { ContractFunctionInteraction } from './contract_function_interaction.js';
|
|
7
6
|
/**
|
|
@@ -19,9 +18,9 @@ export type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) &
|
|
|
19
18
|
*/
|
|
20
19
|
export declare abstract class ContractBase {
|
|
21
20
|
/**
|
|
22
|
-
* The deployed contract's address.
|
|
21
|
+
* The deployed contract's complete address.
|
|
23
22
|
*/
|
|
24
|
-
readonly
|
|
23
|
+
readonly completeAddress: CompleteAddress;
|
|
25
24
|
/**
|
|
26
25
|
* The Application Binary Interface for the contract.
|
|
27
26
|
*/
|
|
@@ -38,9 +37,9 @@ export declare abstract class ContractBase {
|
|
|
38
37
|
};
|
|
39
38
|
protected constructor(
|
|
40
39
|
/**
|
|
41
|
-
* The deployed contract's address.
|
|
40
|
+
* The deployed contract's complete address.
|
|
42
41
|
*/
|
|
43
|
-
|
|
42
|
+
completeAddress: CompleteAddress,
|
|
44
43
|
/**
|
|
45
44
|
* The Application Binary Interface for the contract.
|
|
46
45
|
*/
|
|
@@ -49,6 +48,7 @@ export declare abstract class ContractBase {
|
|
|
49
48
|
* The wallet.
|
|
50
49
|
*/
|
|
51
50
|
wallet: Wallet);
|
|
51
|
+
get address(): import("@aztec/circuits.js").AztecAddress;
|
|
52
52
|
/**
|
|
53
53
|
* Attach the current contract instance to a portal contract and optionally add its dependencies.
|
|
54
54
|
* The function will return a promise that resolves when all contracts have been added to the AztecRPCClient.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_base.d.ts","sourceRoot":"","sources":["../../src/contract/contract_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"contract_base.d.ts","sourceRoot":"","sources":["../../src/contract/contract_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,CAAC,GAAG;IAC/E;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,8BAAsB,YAAY;IAO9B;;OAEG;aACa,eAAe,EAAE,eAAe;IAChD;;OAEG;aACa,GAAG,EAAE,WAAW;IAChC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM;IAjB1B;;OAEG;IACI,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAM;IAExD,SAAS;IACP;;OAEG;IACa,eAAe,EAAE,eAAe;IAChD;;OAEG;IACa,GAAG,EAAE,WAAW;IAChC;;OAEG;IACO,MAAM,EAAE,MAAM;IAmB1B,IAAI,OAAO,8CAEV;IAED;;;;;;;;OAQG;IACI,MAAM,CAAC,cAAc,EAAE,UAAU,EAAE,YAAY,GAAE,gBAAgB,EAAO;CAQhF"}
|
|
@@ -6,9 +6,9 @@ import { ContractFunctionInteraction } from './contract_function_interaction.js'
|
|
|
6
6
|
export class ContractBase {
|
|
7
7
|
constructor(
|
|
8
8
|
/**
|
|
9
|
-
* The deployed contract's address.
|
|
9
|
+
* The deployed contract's complete address.
|
|
10
10
|
*/
|
|
11
|
-
|
|
11
|
+
completeAddress,
|
|
12
12
|
/**
|
|
13
13
|
* The Application Binary Interface for the contract.
|
|
14
14
|
*/
|
|
@@ -17,7 +17,7 @@ export class ContractBase {
|
|
|
17
17
|
* The wallet.
|
|
18
18
|
*/
|
|
19
19
|
wallet) {
|
|
20
|
-
this.
|
|
20
|
+
this.completeAddress = completeAddress;
|
|
21
21
|
this.abi = abi;
|
|
22
22
|
this.wallet = wallet;
|
|
23
23
|
/**
|
|
@@ -26,7 +26,7 @@ export class ContractBase {
|
|
|
26
26
|
this.methods = {};
|
|
27
27
|
abi.functions.forEach((f) => {
|
|
28
28
|
const interactionFunction = (...args) => {
|
|
29
|
-
return new ContractFunctionInteraction(this.wallet, this.address, f, args);
|
|
29
|
+
return new ContractFunctionInteraction(this.wallet, this.completeAddress.address, f, args);
|
|
30
30
|
};
|
|
31
31
|
this.methods[f.name] = Object.assign(interactionFunction, {
|
|
32
32
|
/**
|
|
@@ -39,6 +39,9 @@ export class ContractBase {
|
|
|
39
39
|
});
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
|
+
get address() {
|
|
43
|
+
return this.completeAddress.address;
|
|
44
|
+
}
|
|
42
45
|
/**
|
|
43
46
|
* Attach the current contract instance to a portal contract and optionally add its dependencies.
|
|
44
47
|
* The function will return a promise that resolves when all contracts have been added to the AztecRPCClient.
|
|
@@ -51,10 +54,10 @@ export class ContractBase {
|
|
|
51
54
|
attach(portalContract, dependencies = []) {
|
|
52
55
|
const deployedContract = {
|
|
53
56
|
abi: this.abi,
|
|
54
|
-
|
|
57
|
+
completeAddress: this.completeAddress,
|
|
55
58
|
portalContract,
|
|
56
59
|
};
|
|
57
60
|
return this.wallet.addContracts([deployedContract, ...dependencies]);
|
|
58
61
|
}
|
|
59
62
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBNEIsZ0JBQWdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUtuRixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQWFqRjs7R0FFRztBQUNILE1BQU0sT0FBZ0IsWUFBWTtJQU1oQztJQUNFOztPQUVHO0lBQ2EsZUFBZ0M7SUFDaEQ7O09BRUc7SUFDYSxHQUFnQjtJQUNoQzs7T0FFRztJQUNPLE1BQWM7UUFSUixvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFJaEMsUUFBRyxHQUFILEdBQUcsQ0FBYTtRQUl0QixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBakIxQjs7V0FFRztRQUNJLFlBQU8sR0FBdUMsRUFBRSxDQUFDO1FBZ0J0RCxHQUFHLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQWMsRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxHQUFHLElBQVcsRUFBRSxFQUFFO2dCQUM3QyxPQUFPLElBQUksMkJBQTJCLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQVEsRUFBRSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDOUYsQ0FBQyxDQUFDO1lBRUYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRTtnQkFDeEQ7OzttQkFHRztnQkFDSCxJQUFJLFFBQVE7b0JBQ1YsT0FBTyxnQkFBZ0IsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDdEUsQ0FBQzthQUNGLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELElBQUksT0FBTztRQUNULE9BQU8sSUFBSSxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUM7SUFDdEMsQ0FBQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0ksTUFBTSxDQUFDLGNBQTBCLEVBQUUsZUFBbUMsRUFBRTtRQUM3RSxNQUFNLGdCQUFnQixHQUFxQjtZQUN6QyxHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7WUFDYixlQUFlLEVBQUUsSUFBSSxDQUFDLGVBQWU7WUFDckMsY0FBYztTQUNmLENBQUM7UUFDRixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsZ0JBQWdCLEVBQUUsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7Q0FDRiJ9
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CompleteAddress } from '@aztec/circuits.js';
|
|
2
2
|
import { ContractAbi } from '@aztec/foundation/abi';
|
|
3
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
5
|
import { AztecRPC, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
|
|
@@ -30,10 +29,8 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
|
|
|
30
29
|
private arc;
|
|
31
30
|
private abi;
|
|
32
31
|
private args;
|
|
33
|
-
/** The
|
|
34
|
-
|
|
35
|
-
/** The complete contract address. */
|
|
36
|
-
completeContractAddress?: AztecAddress;
|
|
32
|
+
/** The complete address of the contract. */
|
|
33
|
+
completeAddress?: CompleteAddress;
|
|
37
34
|
/** Constructor function to call. */
|
|
38
35
|
private constructorAbi;
|
|
39
36
|
constructor(publicKey: PublicKey, arc: AztecRPC, abi: ContractAbi, args?: any[]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_method.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract_deployer/deploy_method.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAgC,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAmB,SAAS,EAAE,EAAE,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,uBAAuB;IAOtF,OAAO,CAAC,SAAS;IAAa,OAAO,CAAC,GAAG;IAAY,OAAO,CAAC,GAAG;IAAe,OAAO,CAAC,IAAI;IANvG,4CAA4C;IACrC,eAAe,CAAC,EAAE,eAAe,CAAa;IAErD,oCAAoC;IACpC,OAAO,CAAC,cAAc,CAAc;gBAEhB,SAAS,EAAE,SAAS,EAAU,GAAG,EAAE,QAAQ,EAAU,GAAG,EAAE,WAAW,EAAU,IAAI,GAAE,GAAG,EAAO;IAOnH;;;;;;;;OAQG;IACU,MAAM,CAAC,OAAO,GAAE,aAAkB;IA4C/C;;;;;;;OAOG;IACI,IAAI,CAAC,OAAO,GAAE,aAAkB,GAAG,YAAY,CAAC,SAAS,CAAC;IAKjE;;;;OAIG;IACI,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC;CAGrD"}
|
|
@@ -16,10 +16,8 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
16
16
|
this.arc = arc;
|
|
17
17
|
this.abi = abi;
|
|
18
18
|
this.args = args;
|
|
19
|
-
/** The
|
|
20
|
-
this.
|
|
21
|
-
/** The complete contract address. */
|
|
22
|
-
this.completeContractAddress = undefined;
|
|
19
|
+
/** The complete address of the contract. */
|
|
20
|
+
this.completeAddress = undefined;
|
|
23
21
|
const constructorAbi = abi.functions.find(f => f.name === 'constructor');
|
|
24
22
|
if (!constructorAbi)
|
|
25
23
|
throw new Error('Cannot find constructor in the ABI.');
|
|
@@ -53,10 +51,9 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
53
51
|
packedArguments: [packedArguments],
|
|
54
52
|
});
|
|
55
53
|
this.txRequest = txRequest;
|
|
56
|
-
this.
|
|
57
|
-
this.completeContractAddress = completeAddress.address;
|
|
54
|
+
this.completeAddress = completeAddress;
|
|
58
55
|
// TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
|
|
59
|
-
await this.rpc.addContracts([{ abi: this.abi,
|
|
56
|
+
await this.rpc.addContracts([{ abi: this.abi, completeAddress, portalContract }]);
|
|
60
57
|
return this.txRequest;
|
|
61
58
|
}
|
|
62
59
|
/**
|
|
@@ -80,4 +77,4 @@ export class DeployMethod extends BaseContractInteraction {
|
|
|
80
77
|
return super.simulate(options);
|
|
81
78
|
}
|
|
82
79
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdF9kZXBsb3llci9kZXBsb3lfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxzQkFBc0IsRUFDdEIsWUFBWSxFQUNaLFNBQVMsRUFDVCx5QkFBeUIsR0FDMUIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQTRCLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFZLGVBQWUsRUFBaUIsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFNUYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFFbkYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBaUJuRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sWUFBd0QsU0FBUSx1QkFBdUI7SUFPbEcsWUFBb0IsU0FBb0IsRUFBVSxHQUFhLEVBQVUsR0FBZ0IsRUFBVSxPQUFjLEVBQUU7UUFDakgsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRE8sY0FBUyxHQUFULFNBQVMsQ0FBVztRQUFVLFFBQUcsR0FBSCxHQUFHLENBQVU7UUFBVSxRQUFHLEdBQUgsR0FBRyxDQUFhO1FBQVUsU0FBSSxHQUFKLElBQUksQ0FBWTtRQU5uSCw0Q0FBNEM7UUFDckMsb0JBQWUsR0FBcUIsU0FBUyxDQUFDO1FBT25ELE1BQU0sY0FBYyxHQUFHLEdBQUcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxhQUFhLENBQUMsQ0FBQztRQUN6RSxJQUFJLENBQUMsY0FBYztZQUFFLE1BQU0sSUFB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
|
package/dest/index.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export * from './account/index.js';
|
|
|
6
6
|
export * from './contract_deployer/deploy_method.js';
|
|
7
7
|
export * from './sandbox/index.js';
|
|
8
8
|
export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
|
|
9
|
-
export { AztecRPC, ContractData,
|
|
9
|
+
export { AztecRPC, ContractData, ExtendedContractData as ExtendedContractData, DeployedContract, FunctionCall, L2BlockL2Logs, NodeInfo, PackedArguments, PublicKey, PrivateKey, SyncStatus, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, emptyFunctionCall, } from '@aztec/types';
|
|
10
10
|
export { createDebugLogger } from '@aztec/foundation/log';
|
|
11
11
|
export { sleep } from '@aztec/foundation/sleep';
|
|
12
12
|
//# sourceMappingURL=index.d.ts.map
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,IAAI,oBAAoB,EAC5C,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,eAAe,EACf,SAAS,EACT,UAAU,EACV,UAAU,EACV,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,iBAAiB,GAClB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -6,7 +6,7 @@ export * from './account/index.js';
|
|
|
6
6
|
export * from './contract_deployer/deploy_method.js';
|
|
7
7
|
export * from './sandbox/index.js';
|
|
8
8
|
export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
|
|
9
|
-
export { ContractData,
|
|
9
|
+
export { ContractData, ExtendedContractData as ExtendedContractData, L2BlockL2Logs, PackedArguments, PrivateKey, Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, emptyFunctionCall, } from '@aztec/types';
|
|
10
10
|
export { createDebugLogger } from '@aztec/foundation/log';
|
|
11
11
|
export { sleep } from '@aztec/foundation/sleep';
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxvQkFBb0IsQ0FBQztBQUVuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekUsT0FBTyxFQUVMLFlBQVksRUFDWixvQkFBb0IsSUFBSSxvQkFBb0IsRUFHNUMsYUFBYSxFQUViLGVBQWUsRUFFZixVQUFVLEVBRVYsRUFBRSxFQUNGLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxFQUNULFFBQVEsRUFDUixpQkFBaUIsR0FDbEIsTUFBTSxjQUFjLENBQUM7QUFFdEIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDIn0=
|