@aztec/ethereum 0.0.0-test.0 → 0.0.1-commit.023c3e5
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/dest/account.d.ts +2 -0
- package/dest/account.d.ts.map +1 -0
- package/dest/account.js +4 -0
- package/dest/chain.d.ts +1 -1
- package/dest/client.d.ts +6 -4
- package/dest/client.d.ts.map +1 -1
- package/dest/client.js +21 -3
- package/dest/config.d.ts +68 -23
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +145 -32
- package/dest/constants.d.ts +1 -1
- package/dest/contracts/empire_base.d.ts +25 -8
- package/dest/contracts/empire_base.d.ts.map +1 -1
- package/dest/contracts/empire_base.js +75 -2
- package/dest/contracts/empire_slashing_proposer.d.ts +67 -0
- package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -0
- package/dest/contracts/empire_slashing_proposer.js +207 -0
- package/dest/contracts/errors.d.ts +7 -0
- package/dest/contracts/errors.d.ts.map +1 -0
- package/dest/contracts/errors.js +12 -0
- package/dest/contracts/fee_asset_handler.d.ts +20 -0
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -0
- package/dest/contracts/fee_asset_handler.js +59 -0
- package/dest/contracts/fee_juice.d.ts +6 -7
- package/dest/contracts/fee_juice.d.ts.map +1 -1
- package/dest/contracts/fee_juice.js +27 -20
- package/dest/contracts/governance.d.ts +45 -32
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +98 -85
- package/dest/contracts/governance_proposer.d.ts +17 -13
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +432 -26
- package/dest/contracts/gse.d.ts +32 -0
- package/dest/contracts/gse.d.ts.map +1 -0
- package/dest/contracts/gse.js +72 -0
- package/dest/contracts/inbox.d.ts +47 -0
- package/dest/contracts/inbox.d.ts.map +1 -0
- package/dest/contracts/inbox.js +80 -0
- package/dest/contracts/index.d.ts +11 -3
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +10 -2
- package/dest/contracts/log.d.ts +13 -0
- package/dest/contracts/log.d.ts.map +1 -0
- package/dest/contracts/log.js +1 -0
- package/dest/contracts/multicall.d.ts +21 -0
- package/dest/contracts/multicall.d.ts.map +1 -0
- package/dest/contracts/multicall.js +157 -0
- package/dest/contracts/outbox.d.ts +41 -0
- package/dest/contracts/outbox.d.ts.map +1 -0
- package/dest/contracts/outbox.js +86 -0
- package/dest/contracts/registry.d.ts +10 -5
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/registry.js +44 -16
- package/dest/contracts/rollup.d.ts +297 -53
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +1127 -116
- package/dest/contracts/slasher_contract.d.ts +44 -0
- package/dest/contracts/slasher_contract.d.ts.map +1 -0
- package/dest/contracts/slasher_contract.js +75 -0
- package/dest/contracts/tally_slashing_proposer.d.ts +140 -0
- package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -0
- package/dest/contracts/tally_slashing_proposer.js +320 -0
- package/dest/contracts/utils.d.ts +3 -0
- package/dest/contracts/utils.d.ts.map +1 -0
- package/dest/contracts/utils.js +11 -0
- package/dest/deploy_aztec_l1_contracts.d.ts +260 -0
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -0
- package/dest/deploy_aztec_l1_contracts.js +398 -0
- package/dest/deploy_l1_contract.d.ts +68 -0
- package/dest/deploy_l1_contract.d.ts.map +1 -0
- package/dest/deploy_l1_contract.js +312 -0
- package/dest/eth-signer/eth-signer.d.ts +21 -0
- package/dest/eth-signer/eth-signer.d.ts.map +1 -0
- package/dest/eth-signer/eth-signer.js +5 -0
- package/dest/eth-signer/index.d.ts +2 -0
- package/dest/eth-signer/index.d.ts.map +1 -0
- package/dest/eth-signer/index.js +1 -0
- package/dest/forwarder_proxy.d.ts +32 -0
- package/dest/forwarder_proxy.d.ts.map +1 -0
- package/dest/forwarder_proxy.js +93 -0
- package/dest/generated/l1-contracts-defaults.d.ts +30 -0
- package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
- package/dest/generated/l1-contracts-defaults.js +30 -0
- package/dest/l1_artifacts.d.ts +80735 -0
- package/dest/l1_artifacts.d.ts.map +1 -0
- package/dest/l1_artifacts.js +166 -0
- package/dest/l1_contract_addresses.d.ts +24 -4
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +25 -21
- package/dest/l1_reader.d.ts +4 -2
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +14 -8
- package/dest/l1_tx_utils/config.d.ts +59 -0
- package/dest/l1_tx_utils/config.d.ts.map +1 -0
- package/dest/l1_tx_utils/config.js +96 -0
- package/dest/l1_tx_utils/constants.d.ts +12 -0
- package/dest/l1_tx_utils/constants.d.ts.map +1 -0
- package/dest/l1_tx_utils/constants.js +39 -0
- package/dest/l1_tx_utils/factory.d.ts +24 -0
- package/dest/l1_tx_utils/factory.d.ts.map +1 -0
- package/dest/l1_tx_utils/factory.js +12 -0
- package/dest/l1_tx_utils/fee-strategies/index.d.ts +10 -0
- package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/index.js +12 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +8 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +129 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +23 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +191 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts +51 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/types.js +3 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +41 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +48 -0
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -0
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -0
- package/dest/l1_tx_utils/index-blobs.js +2 -0
- package/dest/l1_tx_utils/index.d.ts +12 -0
- package/dest/l1_tx_utils/index.d.ts.map +1 -0
- package/dest/l1_tx_utils/index.js +12 -0
- package/dest/l1_tx_utils/interfaces.d.ts +76 -0
- package/dest/l1_tx_utils/interfaces.d.ts.map +1 -0
- package/dest/l1_tx_utils/interfaces.js +4 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +233 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.js +506 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +94 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_tx_utils.js +623 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +26 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +26 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +83 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +323 -0
- package/dest/l1_tx_utils/signer.d.ts +4 -0
- package/dest/l1_tx_utils/signer.d.ts.map +1 -0
- package/dest/l1_tx_utils/signer.js +16 -0
- package/dest/l1_tx_utils/types.d.ts +67 -0
- package/dest/l1_tx_utils/types.d.ts.map +1 -0
- package/dest/l1_tx_utils/types.js +26 -0
- package/dest/l1_tx_utils/utils.d.ts +4 -0
- package/dest/l1_tx_utils/utils.d.ts.map +1 -0
- package/dest/l1_tx_utils/utils.js +14 -0
- package/dest/l1_types.d.ts +6 -0
- package/dest/l1_types.d.ts.map +1 -0
- package/dest/l1_types.js +1 -0
- package/dest/publisher_manager.d.ts +16 -0
- package/dest/publisher_manager.d.ts.map +1 -0
- package/dest/publisher_manager.js +88 -0
- package/dest/queries.d.ts +5 -3
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +61 -12
- package/dest/test/chain_monitor.d.ts +75 -0
- package/dest/test/chain_monitor.d.ts.map +1 -0
- package/dest/test/chain_monitor.js +213 -0
- package/dest/test/delayed_tx_utils.d.ts +8 -3
- package/dest/test/delayed_tx_utils.d.ts.map +1 -1
- package/dest/test/delayed_tx_utils.js +13 -6
- package/dest/test/eth_cheat_codes.d.ts +229 -0
- package/dest/test/eth_cheat_codes.d.ts.map +1 -0
- package/dest/test/eth_cheat_codes.js +560 -0
- package/dest/test/eth_cheat_codes_with_state.d.ts +2 -2
- package/dest/test/eth_cheat_codes_with_state.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes_with_state.js +1 -1
- package/dest/test/index.d.ts +4 -1
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +3 -0
- package/dest/test/rollup_cheat_codes.d.ts +90 -0
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -0
- package/dest/test/rollup_cheat_codes.js +292 -0
- package/dest/test/start_anvil.d.ts +9 -1
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +16 -7
- package/dest/test/tx_delayer.d.ts +18 -7
- package/dest/test/tx_delayer.d.ts.map +1 -1
- package/dest/test/tx_delayer.js +97 -20
- package/dest/test/upgrade_utils.d.ts +6 -5
- package/dest/test/upgrade_utils.d.ts.map +1 -1
- package/dest/test/upgrade_utils.js +23 -16
- package/dest/types.d.ts +62 -8
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +3 -1
- package/dest/utils.d.ts +17 -3
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +107 -88
- package/dest/zkPassportVerifierAddress.d.ts +15 -0
- package/dest/zkPassportVerifierAddress.d.ts.map +1 -0
- package/dest/zkPassportVerifierAddress.js +11 -0
- package/package.json +51 -23
- package/src/account.ts +5 -0
- package/src/client.ts +43 -5
- package/src/config.ts +207 -41
- package/src/contracts/README.md +157 -0
- package/src/contracts/empire_base.ts +77 -7
- package/src/contracts/empire_slashing_proposer.ts +259 -0
- package/src/contracts/errors.ts +13 -0
- package/src/contracts/fee_asset_handler.ts +66 -0
- package/src/contracts/fee_juice.ts +29 -15
- package/src/contracts/governance.ts +90 -78
- package/src/contracts/governance_proposer.ts +75 -25
- package/src/contracts/gse.ts +88 -0
- package/src/contracts/inbox.ts +115 -0
- package/src/contracts/index.ts +10 -2
- package/src/contracts/log.ts +13 -0
- package/src/contracts/multicall.ts +158 -0
- package/src/contracts/outbox.ts +98 -0
- package/src/contracts/registry.ts +51 -26
- package/src/contracts/rollup.ts +879 -89
- package/src/contracts/slasher_contract.ts +89 -0
- package/src/contracts/tally_slashing_proposer.ts +322 -0
- package/src/contracts/utils.ts +14 -0
- package/src/deploy_aztec_l1_contracts.ts +619 -0
- package/src/deploy_l1_contract.ts +362 -0
- package/src/eth-signer/eth-signer.ts +25 -0
- package/src/eth-signer/index.ts +1 -0
- package/src/forwarder_proxy.ts +108 -0
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_artifacts.ts +254 -0
- package/src/l1_contract_addresses.ts +49 -34
- package/src/l1_reader.ts +17 -9
- package/src/l1_tx_utils/README.md +177 -0
- package/src/l1_tx_utils/config.ts +161 -0
- package/src/l1_tx_utils/constants.ts +29 -0
- package/src/l1_tx_utils/factory.ts +64 -0
- package/src/l1_tx_utils/fee-strategies/index.ts +22 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +163 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +245 -0
- package/src/l1_tx_utils/fee-strategies/types.ts +56 -0
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +119 -0
- package/src/l1_tx_utils/index-blobs.ts +2 -0
- package/src/l1_tx_utils/index.ts +14 -0
- package/src/l1_tx_utils/interfaces.ts +86 -0
- package/src/l1_tx_utils/l1_fee_analyzer.ts +803 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +738 -0
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +77 -0
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +419 -0
- package/src/l1_tx_utils/signer.ts +28 -0
- package/src/l1_tx_utils/types.ts +85 -0
- package/src/l1_tx_utils/utils.ts +16 -0
- package/src/l1_types.ts +6 -0
- package/src/publisher_manager.ts +108 -0
- package/src/queries.ts +82 -16
- package/src/test/chain_monitor.ts +245 -0
- package/src/test/delayed_tx_utils.ts +34 -6
- package/src/test/eth_cheat_codes.ts +588 -0
- package/src/test/eth_cheat_codes_with_state.ts +1 -1
- package/src/test/index.ts +3 -0
- package/src/test/rollup_cheat_codes.ts +330 -0
- package/src/test/start_anvil.ts +24 -5
- package/src/test/tx_delayer.ts +130 -27
- package/src/test/upgrade_utils.ts +30 -21
- package/src/types.ts +71 -7
- package/src/utils.ts +133 -92
- package/src/zkPassportVerifierAddress.ts +15 -0
- package/dest/contracts/forwarder.d.ts +0 -24
- package/dest/contracts/forwarder.d.ts.map +0 -1
- package/dest/contracts/forwarder.js +0 -101
- package/dest/contracts/slashing_proposer.d.ts +0 -21
- package/dest/contracts/slashing_proposer.d.ts.map +0 -1
- package/dest/contracts/slashing_proposer.js +0 -47
- package/dest/deploy_l1_contracts.d.ts +0 -21210
- package/dest/deploy_l1_contracts.d.ts.map +0 -1
- package/dest/deploy_l1_contracts.js +0 -687
- package/dest/eth_cheat_codes.d.ts +0 -147
- package/dest/eth_cheat_codes.d.ts.map +0 -1
- package/dest/eth_cheat_codes.js +0 -303
- package/dest/index.d.ts +0 -14
- package/dest/index.d.ts.map +0 -1
- package/dest/index.js +0 -13
- package/dest/l1_tx_utils.d.ts +0 -192
- package/dest/l1_tx_utils.d.ts.map +0 -1
- package/dest/l1_tx_utils.js +0 -641
- package/dest/l1_tx_utils_with_blobs.d.ts +0 -12
- package/dest/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils_with_blobs.js +0 -64
- package/src/contracts/forwarder.ts +0 -132
- package/src/contracts/slashing_proposer.ts +0 -51
- package/src/deploy_l1_contracts.ts +0 -948
- package/src/eth_cheat_codes.ts +0 -314
- package/src/index.ts +0 -13
- package/src/l1_tx_utils.ts +0 -847
- package/src/l1_tx_utils_with_blobs.ts +0 -86
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
2
|
import { sleep } from '@aztec/foundation/sleep';
|
|
3
|
-
import { GovernanceAbi } from '@aztec/l1-artifacts';
|
|
4
|
-
import { encodeFunctionData, getContract } from 'viem';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
3
|
+
import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
|
|
4
|
+
import { encodeFunctionData, getContract, parseEventLogs } from 'viem';
|
|
5
|
+
import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
|
|
6
|
+
import { isExtendedClient } from '../types.js';
|
|
7
7
|
// NOTE: Must be kept in sync with DataStructures.ProposalState in l1-contracts
|
|
8
8
|
export var ProposalState = /*#__PURE__*/ function(ProposalState) {
|
|
9
9
|
ProposalState[ProposalState["Pending"] = 0] = "Pending";
|
|
@@ -16,90 +16,52 @@ export var ProposalState = /*#__PURE__*/ function(ProposalState) {
|
|
|
16
16
|
ProposalState[ProposalState["Expired"] = 7] = "Expired";
|
|
17
17
|
return ProposalState;
|
|
18
18
|
}({});
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
export function extractProposalIdFromLogs(logs) {
|
|
20
|
+
const parsedLogs = parseEventLogs({
|
|
21
|
+
abi: GovernanceAbi,
|
|
22
|
+
logs: logs,
|
|
23
|
+
eventName: 'Proposed'
|
|
24
|
+
});
|
|
25
|
+
if (parsedLogs.length === 0) {
|
|
26
|
+
throw new Error('Proposal log not found');
|
|
27
|
+
}
|
|
28
|
+
return parsedLogs[0].args.proposalId;
|
|
29
|
+
}
|
|
30
|
+
export class ReadOnlyGovernanceContract {
|
|
31
|
+
client;
|
|
32
|
+
governanceContract;
|
|
33
|
+
constructor(address, client){
|
|
34
|
+
this.client = client;
|
|
35
|
+
this.governanceContract = getContract({
|
|
28
36
|
address,
|
|
29
37
|
abi: GovernanceAbi,
|
|
30
|
-
client:
|
|
38
|
+
client: client
|
|
31
39
|
});
|
|
32
|
-
this.walletGovernance = walletClient ? getContract({
|
|
33
|
-
address,
|
|
34
|
-
abi: GovernanceAbi,
|
|
35
|
-
client: walletClient
|
|
36
|
-
}) : undefined;
|
|
37
40
|
}
|
|
38
41
|
get address() {
|
|
39
|
-
return EthAddress.fromString(this.
|
|
42
|
+
return EthAddress.fromString(this.governanceContract.address);
|
|
40
43
|
}
|
|
41
|
-
async
|
|
42
|
-
|
|
43
|
-
return new GovernanceProposerContract(this.publicClient, governanceProposerAddress.toString());
|
|
44
|
+
async getGovernanceProposerAddress() {
|
|
45
|
+
return EthAddress.fromString(await this.governanceContract.read.governanceProposer());
|
|
44
46
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const [rollupAddress, registryAddress] = await Promise.all([
|
|
48
|
-
governanceProposer.getRollupAddress(),
|
|
49
|
-
governanceProposer.getRegistryAddress()
|
|
50
|
-
]);
|
|
51
|
-
return {
|
|
52
|
-
governanceAddress: this.address,
|
|
53
|
-
rollupAddress,
|
|
54
|
-
registryAddress,
|
|
55
|
-
governanceProposerAddress: governanceProposer.address
|
|
56
|
-
};
|
|
47
|
+
getConfiguration() {
|
|
48
|
+
return this.governanceContract.read.getConfiguration();
|
|
57
49
|
}
|
|
58
50
|
getProposal(proposalId) {
|
|
59
|
-
return this.
|
|
51
|
+
return this.governanceContract.read.getProposal([
|
|
60
52
|
proposalId
|
|
61
53
|
]);
|
|
62
54
|
}
|
|
63
55
|
async getProposalState(proposalId) {
|
|
64
|
-
const state = await this.
|
|
56
|
+
const state = await this.governanceContract.read.getProposalState([
|
|
65
57
|
proposalId
|
|
66
58
|
]);
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
|
|
67
60
|
if (state < 0 || state > 7) {
|
|
68
61
|
throw new Error(`Invalid proposal state: ${state}`);
|
|
69
62
|
}
|
|
70
63
|
return state;
|
|
71
64
|
}
|
|
72
|
-
assertWalletGovernance() {
|
|
73
|
-
if (!this.walletGovernance) {
|
|
74
|
-
throw new Error('Wallet client is required for this operation');
|
|
75
|
-
}
|
|
76
|
-
return this.walletGovernance;
|
|
77
|
-
}
|
|
78
|
-
async deposit(onBehalfOf, amount) {
|
|
79
|
-
const walletGovernance = this.assertWalletGovernance();
|
|
80
|
-
const depositTx = await walletGovernance.write.deposit([
|
|
81
|
-
onBehalfOf,
|
|
82
|
-
amount
|
|
83
|
-
]);
|
|
84
|
-
await this.publicClient.waitForTransactionReceipt({
|
|
85
|
-
hash: depositTx
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
async proposeWithLock({ payloadAddress, withdrawAddress }) {
|
|
89
|
-
const walletGovernance = this.assertWalletGovernance();
|
|
90
|
-
const proposeTx = await walletGovernance.write.proposeWithLock([
|
|
91
|
-
payloadAddress,
|
|
92
|
-
withdrawAddress
|
|
93
|
-
]);
|
|
94
|
-
const receipt = await this.publicClient.waitForTransactionReceipt({
|
|
95
|
-
hash: proposeTx
|
|
96
|
-
});
|
|
97
|
-
if (receipt.status !== 'success') {
|
|
98
|
-
throw new Error(`Proposal failed: ${receipt.status}`);
|
|
99
|
-
}
|
|
100
|
-
const proposalId = Number(receipt.logs[1].topics[1]);
|
|
101
|
-
return proposalId;
|
|
102
|
-
}
|
|
103
65
|
async awaitProposalActive({ proposalId, logger }) {
|
|
104
66
|
const state = await this.getProposalState(proposalId);
|
|
105
67
|
if (state === 1) {
|
|
@@ -109,7 +71,7 @@ export class GovernanceContract {
|
|
|
109
71
|
} else {
|
|
110
72
|
const proposal = await this.getProposal(proposalId);
|
|
111
73
|
const startOfActive = proposal.creation + proposal.config.votingDelay;
|
|
112
|
-
const block = await this.
|
|
74
|
+
const block = await this.client.getBlock();
|
|
113
75
|
// Add 12 seconds to the time to make sure we don't vote too early
|
|
114
76
|
const secondsToActive = Number(startOfActive - block.timestamp) + 12;
|
|
115
77
|
const now = new Date();
|
|
@@ -135,7 +97,7 @@ export class GovernanceContract {
|
|
|
135
97
|
} else {
|
|
136
98
|
const proposal = await this.getProposal(proposalId);
|
|
137
99
|
const startOfExecutable = proposal.creation + proposal.config.votingDelay + proposal.config.votingDuration + proposal.config.executionDelay;
|
|
138
|
-
const block = await this.
|
|
100
|
+
const block = await this.client.getBlock();
|
|
139
101
|
const secondsToExecutable = Number(startOfExecutable - block.timestamp) + 12;
|
|
140
102
|
const now = new Date();
|
|
141
103
|
logger.info(`
|
|
@@ -146,19 +108,67 @@ export class GovernanceContract {
|
|
|
146
108
|
await sleep(secondsToExecutable * 1000);
|
|
147
109
|
}
|
|
148
110
|
}
|
|
111
|
+
}
|
|
112
|
+
export class GovernanceContract extends ReadOnlyGovernanceContract {
|
|
113
|
+
client;
|
|
114
|
+
governanceContract;
|
|
115
|
+
constructor(address, client){
|
|
116
|
+
if (address instanceof EthAddress) {
|
|
117
|
+
address = address.toString();
|
|
118
|
+
}
|
|
119
|
+
super(address, client), this.client = client;
|
|
120
|
+
if (!isExtendedClient(client)) {
|
|
121
|
+
throw new Error('GovernanceContract has to be instantiated with a wallet client.');
|
|
122
|
+
}
|
|
123
|
+
this.governanceContract = getContract({
|
|
124
|
+
address,
|
|
125
|
+
abi: GovernanceAbi,
|
|
126
|
+
client
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
async deposit(onBehalfOf, amount) {
|
|
130
|
+
const depositTx = await this.governanceContract.write.deposit([
|
|
131
|
+
onBehalfOf,
|
|
132
|
+
amount
|
|
133
|
+
]);
|
|
134
|
+
await this.client.waitForTransactionReceipt({
|
|
135
|
+
hash: depositTx
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
async proposeWithLock({ payloadAddress, withdrawAddress }) {
|
|
139
|
+
const proposeTx = await this.governanceContract.write.proposeWithLock([
|
|
140
|
+
payloadAddress,
|
|
141
|
+
withdrawAddress
|
|
142
|
+
]);
|
|
143
|
+
const receipt = await this.client.waitForTransactionReceipt({
|
|
144
|
+
hash: proposeTx
|
|
145
|
+
});
|
|
146
|
+
if (receipt.status !== 'success') {
|
|
147
|
+
throw new Error(`Proposal failed: ${receipt.status}`);
|
|
148
|
+
}
|
|
149
|
+
return extractProposalIdFromLogs(receipt.logs);
|
|
150
|
+
}
|
|
149
151
|
async getPower() {
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
this.walletClient.account.address,
|
|
152
|
+
const now = await this.client.getBlock();
|
|
153
|
+
return this.governanceContract.read.powerAt([
|
|
154
|
+
this.client.account.address,
|
|
154
155
|
now.timestamp
|
|
155
156
|
]);
|
|
156
157
|
}
|
|
158
|
+
/** Returns the user's voting power for a specific proposal, checked at pendingThrough timestamp. */ async getPowerForProposal(proposalId) {
|
|
159
|
+
const proposal = await this.getProposal(proposalId);
|
|
160
|
+
const pendingThrough = proposal.creation + proposal.config.votingDelay;
|
|
161
|
+
return this.governanceContract.read.powerAt([
|
|
162
|
+
this.client.account.address,
|
|
163
|
+
pendingThrough
|
|
164
|
+
]);
|
|
165
|
+
}
|
|
157
166
|
async vote({ proposalId, voteAmount, inFavor, retries = 10, logger }) {
|
|
158
|
-
const
|
|
159
|
-
|
|
167
|
+
const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
|
|
168
|
+
logger
|
|
169
|
+
});
|
|
160
170
|
const retryDelaySeconds = 12;
|
|
161
|
-
voteAmount = voteAmount ?? await this.
|
|
171
|
+
voteAmount = voteAmount ?? await this.getPowerForProposal(proposalId);
|
|
162
172
|
let success = false;
|
|
163
173
|
for(let i = 0; i < retries; i++){
|
|
164
174
|
try {
|
|
@@ -173,7 +183,8 @@ export class GovernanceContract {
|
|
|
173
183
|
};
|
|
174
184
|
const encodedVoteData = encodeFunctionData(voteFunctionData);
|
|
175
185
|
const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
|
|
176
|
-
to:
|
|
186
|
+
to: this.governanceContract.address,
|
|
187
|
+
abi: GovernanceAbi,
|
|
177
188
|
data: encodedVoteData
|
|
178
189
|
});
|
|
179
190
|
if (receipt.status === 'success') {
|
|
@@ -182,7 +193,7 @@ export class GovernanceContract {
|
|
|
182
193
|
} else {
|
|
183
194
|
const args = {
|
|
184
195
|
...voteFunctionData,
|
|
185
|
-
address:
|
|
196
|
+
address: this.governanceContract.address
|
|
186
197
|
};
|
|
187
198
|
const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedVoteData, args, undefined, []);
|
|
188
199
|
logger.error(`Error voting on proposal ${proposalId}: ${errorMsg}`);
|
|
@@ -198,13 +209,14 @@ export class GovernanceContract {
|
|
|
198
209
|
}
|
|
199
210
|
logger.info(`Voted [${inFavor ? 'yea' : 'nay'}] on proposal [${proposalId}]`);
|
|
200
211
|
const proposal = await this.getProposal(proposalId);
|
|
201
|
-
logger.info(`Proposal [${proposalId}] has state [${proposal.
|
|
212
|
+
logger.info(`Proposal [${proposalId}] has cached state [${proposal.cachedState}]`);
|
|
202
213
|
logger.info(`Proposal [${proposalId}] has summedBallot yea [${proposal.summedBallot.yea}]`);
|
|
203
|
-
logger.info(`Proposal [${proposalId}] has summedBallot
|
|
214
|
+
logger.info(`Proposal [${proposalId}] has summedBallot nay [${proposal.summedBallot.nay}]`);
|
|
204
215
|
}
|
|
205
216
|
async executeProposal({ proposalId, retries = 10, logger }) {
|
|
206
|
-
const
|
|
207
|
-
|
|
217
|
+
const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
|
|
218
|
+
logger
|
|
219
|
+
});
|
|
208
220
|
const retryDelaySeconds = 12;
|
|
209
221
|
let success = false;
|
|
210
222
|
for(let i = 0; i < retries; i++){
|
|
@@ -218,7 +230,8 @@ export class GovernanceContract {
|
|
|
218
230
|
};
|
|
219
231
|
const encodedExecuteData = encodeFunctionData(executeFunctionData);
|
|
220
232
|
const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
|
|
221
|
-
to:
|
|
233
|
+
to: this.governanceContract.address,
|
|
234
|
+
abi: GovernanceAbi,
|
|
222
235
|
data: encodedExecuteData
|
|
223
236
|
});
|
|
224
237
|
if (receipt.status === 'success') {
|
|
@@ -227,7 +240,7 @@ export class GovernanceContract {
|
|
|
227
240
|
} else {
|
|
228
241
|
const args = {
|
|
229
242
|
...executeFunctionData,
|
|
230
|
-
address:
|
|
243
|
+
address: this.governanceContract.address
|
|
231
244
|
};
|
|
232
245
|
const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedExecuteData, args, undefined, []);
|
|
233
246
|
logger.error(`Error executing proposal ${proposalId}: ${errorMsg}`);
|
|
@@ -1,28 +1,32 @@
|
|
|
1
|
+
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
-
import { type Hex, type TransactionReceipt } from 'viem';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
3
|
+
import { type Hex, type TransactionReceipt, type TypedDataDefinition } from 'viem';
|
|
4
|
+
import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
|
|
5
|
+
import type { ViemClient } from '../types.js';
|
|
5
6
|
import { type IEmpireBase } from './empire_base.js';
|
|
6
7
|
export declare class GovernanceProposerContract implements IEmpireBase {
|
|
7
|
-
readonly client:
|
|
8
|
+
readonly client: ViemClient;
|
|
8
9
|
private readonly proposer;
|
|
9
|
-
constructor(client:
|
|
10
|
+
constructor(client: ViemClient, address: Hex | EthAddress);
|
|
10
11
|
get address(): EthAddress;
|
|
11
12
|
getRollupAddress(): Promise<EthAddress>;
|
|
12
13
|
getRegistryAddress(): Promise<EthAddress>;
|
|
13
14
|
getQuorumSize(): Promise<bigint>;
|
|
14
15
|
getRoundSize(): Promise<bigint>;
|
|
15
|
-
|
|
16
|
+
getInstance(): Promise<`0x${string}`>;
|
|
17
|
+
computeRound(slot: SlotNumber): Promise<bigint>;
|
|
16
18
|
getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
lastSignalSlot: SlotNumber;
|
|
20
|
+
payloadWithMostSignals: Hex;
|
|
21
|
+
quorumReached: boolean;
|
|
19
22
|
executed: boolean;
|
|
20
23
|
}>;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint>;
|
|
25
|
+
createSignalRequest(payload: Hex): L1TxRequest;
|
|
26
|
+
createSignalRequestWithSignature(payload: Hex, slot: SlotNumber, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
|
|
27
|
+
submitRoundWinner(round: bigint, l1TxUtils: L1TxUtils): Promise<{
|
|
24
28
|
receipt: TransactionReceipt;
|
|
25
|
-
|
|
29
|
+
proposalId: bigint;
|
|
26
30
|
}>;
|
|
27
31
|
}
|
|
28
|
-
//# sourceMappingURL=
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292ZXJuYW5jZV9wcm9wb3Nlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9nb3Zlcm5hbmNlX3Byb3Bvc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUVMLEtBQUssR0FBRyxFQUNSLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM5QyxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQThELE1BQU0sa0JBQWtCLENBQUM7QUFHaEgscUJBQWEsMEJBQTJCLFlBQVcsV0FBVzthQUkxQyxNQUFNLEVBQUUsVUFBVTtJQUhwQyxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBa0U7SUFFM0YsWUFDa0IsTUFBTSxFQUFFLFVBQVUsRUFDbEMsT0FBTyxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBTTFCO0lBRUQsSUFBVyxPQUFPLGVBRWpCO0lBRVksZ0JBQWdCLHdCQUU1QjtJQUdZLGtCQUFrQix3QkFFOUI7SUFFTSxhQUFhLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUV0QztJQUVNLFlBQVksSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJDO0lBRU0sV0FBVywyQkFFakI7SUFFTSxZQUFZLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJEO0lBRVksWUFBWSxDQUN2QixhQUFhLEVBQUUsR0FBRyxFQUNsQixLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQztRQUFFLGNBQWMsRUFBRSxVQUFVLENBQUM7UUFBQyxzQkFBc0IsRUFBRSxHQUFHLENBQUM7UUFBQyxhQUFhLEVBQUUsT0FBTyxDQUFDO1FBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQTtLQUFFLENBQUMsQ0FZakg7SUFFTSxpQkFBaUIsQ0FBQyxhQUFhLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXpGO0lBRU0sbUJBQW1CLENBQUMsT0FBTyxFQUFFLEdBQUcsR0FBRyxXQUFXLENBTXBEO0lBRVksZ0NBQWdDLENBQzNDLE9BQU8sRUFBRSxHQUFHLEVBQ1osSUFBSSxFQUFFLFVBQVUsRUFDaEIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsR0FBRyxFQUNsQixNQUFNLEVBQUUsQ0FBQyxHQUFHLEVBQUUsbUJBQW1CLEtBQUssT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUNqRCxPQUFPLENBQUMsV0FBVyxDQUFDLENBY3RCO0lBRVksaUJBQWlCLENBQzVCLEtBQUssRUFBRSxNQUFNLEVBQ2IsU0FBUyxFQUFFLFNBQVMsR0FDbkIsT0FBTyxDQUFDO1FBQ1QsT0FBTyxFQUFFLGtCQUFrQixDQUFDO1FBQzVCLFVBQVUsRUFBRSxNQUFNLENBQUM7S0FDcEIsQ0FBQyxDQVlEO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAGhH,qBAAa,0BAA2B,YAAW,WAAW;aAI1C,MAAM,EAAE,UAAU;IAHpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkE;IAE3F,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAED,IAAW,OAAO,eAEjB;IAEY,gBAAgB,wBAE5B;IAGY,kBAAkB,wBAE9B;IAEM,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAEtC;IAEM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAErC;IAEM,WAAW,2BAEjB;IAEM,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErD;IAEY,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,UAAU,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,aAAa,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAYjH;IAEM,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzF;IAEM,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAMpD;IAEY,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CActB;IAEY,iBAAiB,CAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAYD;CACF"}
|