@aztec/ethereum 0.0.1-commit.03f7ef2 → 0.0.1-commit.0b941701
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/config.d.ts +17 -27
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +50 -53
- package/dest/contracts/fee_asset_handler.d.ts +6 -5
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.js +9 -9
- package/dest/contracts/governance.d.ts +3 -1
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +9 -1
- package/dest/contracts/governance_proposer.js +382 -8
- package/dest/contracts/inbox.d.ts +22 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +36 -1
- package/dest/contracts/index.d.ts +3 -1
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +2 -0
- 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/outbox.d.ts +41 -0
- package/dest/contracts/outbox.d.ts.map +1 -0
- package/dest/contracts/outbox.js +86 -0
- package/dest/contracts/rollup.d.ts +160 -96
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +668 -129
- package/dest/deploy_aztec_l1_contracts.d.ts +17 -2
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +75 -12
- 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 +4904 -1533
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_tx_utils/fee-strategies/index.d.ts +3 -2
- package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/fee-strategies/index.js +2 -1
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +2 -12
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -1
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +35 -17
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +2 -11
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -1
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +36 -18
- package/dest/l1_tx_utils/fee-strategies/types.d.ts +14 -27
- package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -1
- package/dest/l1_tx_utils/fee-strategies/types.js +0 -21
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +2 -2
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_fee_analyzer.js +3 -3
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -5
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +14 -51
- package/dest/queries.d.ts +2 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +12 -4
- package/dest/test/chain_monitor.js +1 -2
- package/dest/test/eth_cheat_codes.d.ts +13 -1
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.d.ts +3 -2
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +10 -2
- package/package.json +8 -7
- package/src/config.ts +61 -52
- package/src/contracts/README.md +157 -0
- package/src/contracts/fee_asset_handler.ts +8 -7
- package/src/contracts/governance.ts +8 -1
- package/src/contracts/inbox.ts +53 -1
- package/src/contracts/index.ts +2 -0
- package/src/contracts/log.ts +13 -0
- package/src/contracts/outbox.ts +98 -0
- package/src/contracts/rollup.ts +333 -93
- package/src/deploy_aztec_l1_contracts.ts +77 -14
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_tx_utils/fee-strategies/index.ts +1 -1
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +45 -41
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +48 -44
- package/src/l1_tx_utils/fee-strategies/types.ts +14 -46
- package/src/l1_tx_utils/l1_fee_analyzer.ts +2 -3
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +20 -59
- package/src/queries.ts +11 -3
- package/src/test/chain_monitor.ts +1 -1
- package/src/test/rollup_cheat_codes.ts +12 -3
package/dest/config.d.ts
CHANGED
|
@@ -20,6 +20,8 @@ export type L1ContractsConfig = {
|
|
|
20
20
|
lagInEpochsForValidatorSet: number;
|
|
21
21
|
/** The number of epochs to lag behind the current epoch for randao selection. */
|
|
22
22
|
lagInEpochsForRandao: number;
|
|
23
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
|
|
24
|
+
inboxLag: number;
|
|
23
25
|
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
24
26
|
aztecProofSubmissionEpochs: number;
|
|
25
27
|
/** The deposit amount for a validator */
|
|
@@ -54,41 +56,29 @@ export type L1ContractsConfig = {
|
|
|
54
56
|
governanceProposerQuorum?: number;
|
|
55
57
|
/** Governance proposing round size */
|
|
56
58
|
governanceProposerRoundSize: number;
|
|
59
|
+
/** Governance voting duration in seconds (only for local/devnet/next-net, default 3600) */
|
|
60
|
+
governanceVotingDuration?: number;
|
|
57
61
|
/** The mana target for the rollup */
|
|
58
62
|
manaTarget: bigint;
|
|
59
63
|
/** The proving cost per mana */
|
|
60
64
|
provingCostPerMana: bigint;
|
|
65
|
+
/** The initial ETH per fee asset price (with 1e12 precision) */
|
|
66
|
+
initialEthPerFeeAsset: bigint;
|
|
61
67
|
/** The number of seconds to wait for an exit */
|
|
62
68
|
exitDelaySeconds: number;
|
|
63
69
|
} & L1TxUtilsConfig;
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
lagInEpochsForValidatorSet: number;
|
|
70
|
-
lagInEpochsForRandao: number;
|
|
71
|
-
aztecProofSubmissionEpochs: number;
|
|
72
|
-
activationThreshold: bigint;
|
|
73
|
-
ejectionThreshold: bigint;
|
|
74
|
-
localEjectionThreshold: bigint;
|
|
75
|
-
slashAmountSmall: bigint;
|
|
76
|
-
slashAmountMedium: bigint;
|
|
77
|
-
slashAmountLarge: bigint;
|
|
78
|
-
slashingRoundSizeInEpochs: number;
|
|
79
|
-
slashingLifetimeInRounds: number;
|
|
80
|
-
slashingExecutionDelayInRounds: number;
|
|
81
|
-
slashingVetoer: EthAddress;
|
|
82
|
-
governanceProposerRoundSize: number;
|
|
83
|
-
manaTarget: bigint;
|
|
84
|
-
provingCostPerMana: bigint;
|
|
85
|
-
exitDelaySeconds: number;
|
|
86
|
-
slasherFlavor: "tally";
|
|
87
|
-
slashingOffsetInRounds: number;
|
|
88
|
-
slashingDisableDuration: number;
|
|
89
|
-
};
|
|
70
|
+
/**
|
|
71
|
+
* Config mappings for L1ContractsConfig.
|
|
72
|
+
* Default values come from generated l1-contracts-defaults.json (source: defaults.yml).
|
|
73
|
+
* Real deployments use forge scripts which require explicit env vars (vm.envUint).
|
|
74
|
+
*/
|
|
90
75
|
export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig>;
|
|
76
|
+
/**
|
|
77
|
+
* Default L1 contracts configuration derived from l1ContractsConfigMappings.
|
|
78
|
+
* Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
|
|
79
|
+
*/
|
|
80
|
+
export declare const DefaultL1ContractsConfig: L1ContractsConfig;
|
|
91
81
|
export declare const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig>;
|
|
92
82
|
export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
|
|
93
83
|
export declare function getGenesisStateConfigEnvVars(): GenesisStateConfig;
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQVF4QixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTJCLE1BQU0seUJBQXlCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRixNQUFNLE1BQU0saUJBQWlCLEdBQUc7SUFDOUIseUNBQXlDO0lBQ3pDLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3Qix1RkFBdUY7SUFDdkYsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLHdDQUF3QztJQUN4QyxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0IsMkNBQTJDO0lBQzNDLHdCQUF3QixFQUFFLE1BQU0sQ0FBQztJQUNqQyxvRkFBb0Y7SUFDcEYsMEJBQTBCLEVBQUUsTUFBTSxDQUFDO0lBQ25DLGlGQUFpRjtJQUNqRixvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0Isc0ZBQXNGO0lBQ3RGLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIsK0VBQStFO0lBQy9FLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyx5Q0FBeUM7SUFDekMsbUJBQW1CLEVBQUUsTUFBTSxDQUFDO0lBQzVCLHlDQUF5QztJQUN6QyxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsbUhBQW1IO0lBQ25ILHNCQUFzQixFQUFFLE1BQU0sQ0FBQztJQUMvQix3S0FBd0s7SUFDeEssY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLDRFQUE0RTtJQUM1RSx5QkFBeUIsRUFBRSxNQUFNLENBQUM7SUFDbEMsZ0dBQWdHO0lBQ2hHLHdCQUF3QixFQUFFLE1BQU0sQ0FBQztJQUNqQyx5R0FBeUc7SUFDekcsOEJBQThCLEVBQUUsTUFBTSxDQUFDO0lBQ3ZDLHlFQUF5RTtJQUN6RSxjQUFjLEVBQUUsVUFBVSxDQUFDO0lBQzNCLDRJQUE0STtJQUM1SSxzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IsK0VBQStFO0lBQy9FLHVCQUF1QixFQUFFLE1BQU0sQ0FBQztJQUNoQywrQkFBK0I7SUFDL0IsYUFBYSxFQUFFLFFBQVEsR0FBRyxPQUFPLEdBQUcsTUFBTSxDQUFDO0lBQzNDLDJEQUEyRDtJQUMzRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsK0NBQStDO0lBQy9DLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixxRUFBcUU7SUFDckUsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLGdFQUFnRTtJQUNoRSx3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQyxzQ0FBc0M7SUFDdEMsMkJBQTJCLEVBQUUsTUFBTSxDQUFDO0lBQ3BDLDJGQUEyRjtJQUMzRix3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQyxxQ0FBcUM7SUFDckMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixnQ0FBZ0M7SUFDaEMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLGdFQUFnRTtJQUNoRSxxQkFBcUIsRUFBRSxNQUFNLENBQUM7SUFDOUIsZ0RBQWdEO0lBQ2hELGdCQUFnQixFQUFFLE1BQU0sQ0FBQztDQUMxQixHQUFHLGVBQWUsQ0FBQztBQUVwQjs7OztHQUlHO0FBQ0gsZUFBTyxNQUFNLHlCQUF5QixFQUFFLGtCQUFrQixDQUFDLGlCQUFpQixDQXlKM0UsQ0FBQztBQUVGOzs7R0FHRztBQUNILGVBQU8sTUFBTSx3QkFBd0IsbUJBQThDLENBQUM7QUFFcEYsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGtCQUFrQixDQUFDLGtCQUFrQixDQVc3RSxDQUFDO0FBRUYsd0JBQWdCLDJCQUEyQixJQUFJLGlCQUFpQixDQUUvRDtBQUVELHdCQUFnQiw0QkFBNEIsSUFBSSxrQkFBa0IsQ0FFakUifQ==
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAQxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAQxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,yBAAyB,CAAC;AAExF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,oFAAoF;IACpF,0BAA0B,EAAE,MAAM,CAAC;IACnC,iFAAiF;IACjF,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,2FAA2F;IAC3F,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAyJ3E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,mBAA8C,CAAC;AAEpF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE"}
|
package/dest/config.js
CHANGED
|
@@ -1,88 +1,71 @@
|
|
|
1
|
-
import {
|
|
2
|
-
bigintConfigHelper, booleanConfigHelper, enumConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
1
|
+
import { bigintConfigHelper, booleanConfigHelper, enumConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
3
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { l1ContractsDefaultEnv } from './generated/l1-contracts-defaults.js';
|
|
4
4
|
import { l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
lagInEpochsForValidatorSet: 2,
|
|
11
|
-
lagInEpochsForRandao: 2,
|
|
12
|
-
aztecProofSubmissionEpochs: 1,
|
|
13
|
-
activationThreshold: 100n * 10n ** 18n,
|
|
14
|
-
ejectionThreshold: 50n * 10n ** 18n,
|
|
15
|
-
localEjectionThreshold: 98n * 10n ** 18n,
|
|
16
|
-
slashAmountSmall: 10n * 10n ** 18n,
|
|
17
|
-
slashAmountMedium: 20n * 10n ** 18n,
|
|
18
|
-
slashAmountLarge: 50n * 10n ** 18n,
|
|
19
|
-
slashingRoundSizeInEpochs: 4,
|
|
20
|
-
slashingLifetimeInRounds: 5,
|
|
21
|
-
slashingExecutionDelayInRounds: 0,
|
|
22
|
-
slashingVetoer: EthAddress.ZERO,
|
|
23
|
-
governanceProposerRoundSize: 300,
|
|
24
|
-
manaTarget: BigInt(100e6),
|
|
25
|
-
provingCostPerMana: BigInt(100),
|
|
26
|
-
exitDelaySeconds: 2 * 24 * 60 * 60,
|
|
27
|
-
slasherFlavor: 'tally',
|
|
28
|
-
slashingOffsetInRounds: 2,
|
|
29
|
-
slashingDisableDuration: 5 * 24 * 60 * 60
|
|
30
|
-
};
|
|
31
|
-
export const l1ContractsConfigMappings = {
|
|
5
|
+
/**
|
|
6
|
+
* Config mappings for L1ContractsConfig.
|
|
7
|
+
* Default values come from generated l1-contracts-defaults.json (source: defaults.yml).
|
|
8
|
+
* Real deployments use forge scripts which require explicit env vars (vm.envUint).
|
|
9
|
+
*/ export const l1ContractsConfigMappings = {
|
|
32
10
|
ethereumSlotDuration: {
|
|
33
11
|
env: 'ETHEREUM_SLOT_DURATION',
|
|
34
12
|
description: 'How many seconds an L1 slot lasts.',
|
|
35
|
-
...numberConfigHelper(
|
|
13
|
+
...numberConfigHelper(l1ContractsDefaultEnv.ETHEREUM_SLOT_DURATION)
|
|
36
14
|
},
|
|
37
15
|
aztecSlotDuration: {
|
|
38
16
|
env: 'AZTEC_SLOT_DURATION',
|
|
39
17
|
description: 'How many seconds an L2 slots lasts (must be multiple of ethereum slot duration).',
|
|
40
|
-
...numberConfigHelper(
|
|
18
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLOT_DURATION)
|
|
41
19
|
},
|
|
42
20
|
aztecEpochDuration: {
|
|
43
21
|
env: 'AZTEC_EPOCH_DURATION',
|
|
44
22
|
description: `How many L2 slots an epoch lasts (maximum AZTEC_MAX_EPOCH_DURATION).`,
|
|
45
|
-
...numberConfigHelper(
|
|
23
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EPOCH_DURATION)
|
|
46
24
|
},
|
|
47
25
|
aztecTargetCommitteeSize: {
|
|
48
26
|
env: 'AZTEC_TARGET_COMMITTEE_SIZE',
|
|
49
27
|
description: 'The target validator committee size.',
|
|
50
|
-
...numberConfigHelper(
|
|
28
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_TARGET_COMMITTEE_SIZE)
|
|
51
29
|
},
|
|
52
30
|
lagInEpochsForValidatorSet: {
|
|
53
31
|
env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
|
|
54
32
|
description: 'The number of epochs to lag behind the current epoch for validator selection.',
|
|
55
|
-
...numberConfigHelper(
|
|
33
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET)
|
|
56
34
|
},
|
|
57
35
|
lagInEpochsForRandao: {
|
|
58
36
|
env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
|
|
59
37
|
description: 'The number of epochs to lag behind the current epoch for randao selection.',
|
|
60
|
-
...numberConfigHelper(
|
|
38
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_RANDAO)
|
|
39
|
+
},
|
|
40
|
+
inboxLag: {
|
|
41
|
+
env: 'AZTEC_INBOX_LAG',
|
|
42
|
+
description: 'The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks).',
|
|
43
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_INBOX_LAG)
|
|
61
44
|
},
|
|
62
45
|
aztecProofSubmissionEpochs: {
|
|
63
46
|
env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
|
|
64
47
|
description: 'The number of epochs after an epoch ends that proofs are still accepted.',
|
|
65
|
-
...numberConfigHelper(
|
|
48
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_PROOF_SUBMISSION_EPOCHS)
|
|
66
49
|
},
|
|
67
50
|
activationThreshold: {
|
|
68
51
|
env: 'AZTEC_ACTIVATION_THRESHOLD',
|
|
69
52
|
description: 'The deposit amount for a validator',
|
|
70
|
-
...bigintConfigHelper(
|
|
53
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_ACTIVATION_THRESHOLD))
|
|
71
54
|
},
|
|
72
55
|
ejectionThreshold: {
|
|
73
56
|
env: 'AZTEC_EJECTION_THRESHOLD',
|
|
74
57
|
description: 'The minimum stake for a validator.',
|
|
75
|
-
...bigintConfigHelper(
|
|
58
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_EJECTION_THRESHOLD))
|
|
76
59
|
},
|
|
77
60
|
localEjectionThreshold: {
|
|
78
61
|
env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
|
|
79
62
|
description: 'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
|
|
80
|
-
...bigintConfigHelper(
|
|
63
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_LOCAL_EJECTION_THRESHOLD))
|
|
81
64
|
},
|
|
82
65
|
slashingOffsetInRounds: {
|
|
83
66
|
env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
|
|
84
67
|
description: 'How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset)',
|
|
85
|
-
...numberConfigHelper(
|
|
68
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_OFFSET_IN_ROUNDS)
|
|
86
69
|
},
|
|
87
70
|
slasherFlavor: {
|
|
88
71
|
env: 'AZTEC_SLASHER_FLAVOR',
|
|
@@ -91,22 +74,22 @@ export const l1ContractsConfigMappings = {
|
|
|
91
74
|
'empire',
|
|
92
75
|
'tally',
|
|
93
76
|
'none'
|
|
94
|
-
],
|
|
77
|
+
], l1ContractsDefaultEnv.AZTEC_SLASHER_FLAVOR)
|
|
95
78
|
},
|
|
96
79
|
slashAmountSmall: {
|
|
97
80
|
env: 'AZTEC_SLASH_AMOUNT_SMALL',
|
|
98
81
|
description: 'Small slashing amount for light offenses',
|
|
99
|
-
...bigintConfigHelper(
|
|
82
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_SMALL))
|
|
100
83
|
},
|
|
101
84
|
slashAmountMedium: {
|
|
102
85
|
env: 'AZTEC_SLASH_AMOUNT_MEDIUM',
|
|
103
86
|
description: 'Medium slashing amount for moderate offenses',
|
|
104
|
-
...bigintConfigHelper(
|
|
87
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_MEDIUM))
|
|
105
88
|
},
|
|
106
89
|
slashAmountLarge: {
|
|
107
90
|
env: 'AZTEC_SLASH_AMOUNT_LARGE',
|
|
108
91
|
description: 'Large slashing amount for severe offenses',
|
|
109
|
-
...bigintConfigHelper(
|
|
92
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_LARGE))
|
|
110
93
|
},
|
|
111
94
|
slashingQuorum: {
|
|
112
95
|
env: 'AZTEC_SLASHING_QUORUM',
|
|
@@ -116,28 +99,28 @@ export const l1ContractsConfigMappings = {
|
|
|
116
99
|
slashingRoundSizeInEpochs: {
|
|
117
100
|
env: 'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS',
|
|
118
101
|
description: 'The slashing round size',
|
|
119
|
-
...numberConfigHelper(
|
|
102
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS)
|
|
120
103
|
},
|
|
121
104
|
slashingLifetimeInRounds: {
|
|
122
105
|
env: 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS',
|
|
123
106
|
description: 'The slashing lifetime in rounds',
|
|
124
|
-
...numberConfigHelper(
|
|
107
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_LIFETIME_IN_ROUNDS)
|
|
125
108
|
},
|
|
126
109
|
slashingExecutionDelayInRounds: {
|
|
127
110
|
env: 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS',
|
|
128
111
|
description: 'The slashing execution delay in rounds',
|
|
129
|
-
...numberConfigHelper(
|
|
112
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS)
|
|
130
113
|
},
|
|
131
114
|
slashingVetoer: {
|
|
132
115
|
env: 'AZTEC_SLASHING_VETOER',
|
|
133
116
|
description: 'The slashing vetoer',
|
|
134
117
|
parseEnv: (val)=>EthAddress.fromString(val),
|
|
135
|
-
defaultValue:
|
|
118
|
+
defaultValue: EthAddress.fromString(l1ContractsDefaultEnv.AZTEC_SLASHING_VETOER)
|
|
136
119
|
},
|
|
137
120
|
slashingDisableDuration: {
|
|
138
121
|
env: 'AZTEC_SLASHING_DISABLE_DURATION',
|
|
139
122
|
description: 'How long slashing can be disabled for in seconds when vetoer disables it',
|
|
140
|
-
...numberConfigHelper(
|
|
123
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_DISABLE_DURATION)
|
|
141
124
|
},
|
|
142
125
|
governanceProposerQuorum: {
|
|
143
126
|
env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
|
|
@@ -147,25 +130,39 @@ export const l1ContractsConfigMappings = {
|
|
|
147
130
|
governanceProposerRoundSize: {
|
|
148
131
|
env: 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
|
|
149
132
|
description: 'The governance proposing round size',
|
|
150
|
-
...numberConfigHelper(
|
|
133
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE)
|
|
134
|
+
},
|
|
135
|
+
governanceVotingDuration: {
|
|
136
|
+
env: 'AZTEC_GOVERNANCE_VOTING_DURATION',
|
|
137
|
+
description: 'Governance voting duration in seconds (only for local/devnet/next-net)',
|
|
138
|
+
...numberConfigHelper(3600)
|
|
151
139
|
},
|
|
152
140
|
manaTarget: {
|
|
153
141
|
env: 'AZTEC_MANA_TARGET',
|
|
154
142
|
description: 'The mana target for the rollup',
|
|
155
|
-
...bigintConfigHelper(
|
|
143
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_MANA_TARGET))
|
|
156
144
|
},
|
|
157
145
|
provingCostPerMana: {
|
|
158
146
|
env: 'AZTEC_PROVING_COST_PER_MANA',
|
|
159
147
|
description: 'The proving cost per mana',
|
|
160
|
-
...bigintConfigHelper(
|
|
148
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_PROVING_COST_PER_MANA))
|
|
149
|
+
},
|
|
150
|
+
initialEthPerFeeAsset: {
|
|
151
|
+
env: 'AZTEC_INITIAL_ETH_PER_FEE_ASSET',
|
|
152
|
+
description: 'The initial ETH per fee asset price (with 1e12 precision)',
|
|
153
|
+
...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_INITIAL_ETH_PER_FEE_ASSET))
|
|
161
154
|
},
|
|
162
155
|
exitDelaySeconds: {
|
|
163
156
|
env: 'AZTEC_EXIT_DELAY_SECONDS',
|
|
164
157
|
description: 'The delay before a validator can exit the set',
|
|
165
|
-
...numberConfigHelper(
|
|
158
|
+
...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EXIT_DELAY_SECONDS)
|
|
166
159
|
},
|
|
167
160
|
...l1TxUtilsConfigMappings
|
|
168
161
|
};
|
|
162
|
+
/**
|
|
163
|
+
* Default L1 contracts configuration derived from l1ContractsConfigMappings.
|
|
164
|
+
* Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
|
|
165
|
+
*/ export const DefaultL1ContractsConfig = getDefaultConfig(l1ContractsConfigMappings);
|
|
169
166
|
export const genesisStateConfigMappings = {
|
|
170
167
|
testAccounts: {
|
|
171
168
|
env: 'TEST_ACCOUNTS',
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
2
|
import { type Hex } from 'viem';
|
|
3
3
|
import type { L1TxUtils } from '../l1_tx_utils/index.js';
|
|
4
|
+
import type { ViemClient } from '../types.js';
|
|
4
5
|
export declare class FeeAssetHandlerContract {
|
|
5
|
-
readonly
|
|
6
|
+
readonly client: ViemClient;
|
|
6
7
|
address: EthAddress;
|
|
7
|
-
constructor(address: Hex | EthAddress
|
|
8
|
+
constructor(client: ViemClient, address: Hex | EthAddress);
|
|
8
9
|
getOwner(): Promise<EthAddress>;
|
|
9
10
|
getMintAmount(): Promise<bigint>;
|
|
10
|
-
mint(recipient: Hex | EthAddress): Promise<{
|
|
11
|
+
mint(txUtils: L1TxUtils, recipient: Hex | EthAddress): Promise<{
|
|
11
12
|
receipt: import("viem").TransactionReceipt;
|
|
12
13
|
state: import("../l1_tx_utils/types.js").L1TxState;
|
|
13
14
|
}>;
|
|
14
|
-
setMintAmount(amount: bigint): Promise<{
|
|
15
|
+
setMintAmount(txUtils: L1TxUtils, amount: bigint): Promise<{
|
|
15
16
|
receipt: import("viem").TransactionReceipt;
|
|
16
17
|
state: import("../l1_tx_utils/types.js").L1TxState;
|
|
17
18
|
}>;
|
|
18
19
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2Fzc2V0X2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvZmVlX2Fzc2V0X2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBbUMsTUFBTSxNQUFNLENBQUM7QUFFakUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTlDLHFCQUFhLHVCQUF1QjthQUloQixNQUFNLEVBQUUsVUFBVTtJQUg3QixPQUFPLEVBQUUsVUFBVSxDQUFDO0lBRTNCLFlBQ2tCLE1BQU0sRUFBRSxVQUFVLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQU0xQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBTzNDO0lBRU0sYUFBYSxvQkFPbkI7SUFFTSxJQUFJLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsR0FBRyxHQUFHLFVBQVU7OztPQVkxRDtJQUVNLGFBQWEsQ0FBQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNOzs7T0FTdEQ7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fee_asset_handler.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"fee_asset_handler.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,uBAAuB;aAIhB,MAAM,EAAE,UAAU;IAH7B,OAAO,EAAE,UAAU,CAAC;IAE3B,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAO3C;IAEM,aAAa,oBAOnB;IAEM,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,GAAG,UAAU;;;OAY1D;IAEM,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;OAStD;CACF"}
|
|
@@ -2,10 +2,10 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
2
2
|
import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts/FeeAssetHandlerAbi';
|
|
3
3
|
import { encodeFunctionData, getContract } from 'viem';
|
|
4
4
|
export class FeeAssetHandlerContract {
|
|
5
|
-
|
|
5
|
+
client;
|
|
6
6
|
address;
|
|
7
|
-
constructor(
|
|
8
|
-
this.
|
|
7
|
+
constructor(client, address){
|
|
8
|
+
this.client = client;
|
|
9
9
|
if (address instanceof EthAddress) {
|
|
10
10
|
address = address.toString();
|
|
11
11
|
}
|
|
@@ -15,7 +15,7 @@ export class FeeAssetHandlerContract {
|
|
|
15
15
|
const contract = getContract({
|
|
16
16
|
abi: FeeAssetHandlerAbi,
|
|
17
17
|
address: this.address.toString(),
|
|
18
|
-
client: this.
|
|
18
|
+
client: this.client
|
|
19
19
|
});
|
|
20
20
|
return EthAddress.fromString(await contract.read.owner());
|
|
21
21
|
}
|
|
@@ -23,15 +23,15 @@ export class FeeAssetHandlerContract {
|
|
|
23
23
|
const contract = getContract({
|
|
24
24
|
abi: FeeAssetHandlerAbi,
|
|
25
25
|
address: this.address.toString(),
|
|
26
|
-
client: this.
|
|
26
|
+
client: this.client
|
|
27
27
|
});
|
|
28
28
|
return contract.read.mintAmount();
|
|
29
29
|
}
|
|
30
|
-
mint(recipient) {
|
|
30
|
+
mint(txUtils, recipient) {
|
|
31
31
|
if (recipient instanceof EthAddress) {
|
|
32
32
|
recipient = recipient.toString();
|
|
33
33
|
}
|
|
34
|
-
return
|
|
34
|
+
return txUtils.sendAndMonitorTransaction({
|
|
35
35
|
to: this.address.toString(),
|
|
36
36
|
data: encodeFunctionData({
|
|
37
37
|
abi: FeeAssetHandlerAbi,
|
|
@@ -42,8 +42,8 @@ export class FeeAssetHandlerContract {
|
|
|
42
42
|
})
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
|
-
setMintAmount(amount) {
|
|
46
|
-
return
|
|
45
|
+
setMintAmount(txUtils, amount) {
|
|
46
|
+
return txUtils.sendAndMonitorTransaction({
|
|
47
47
|
to: this.address.toString(),
|
|
48
48
|
data: encodeFunctionData({
|
|
49
49
|
abi: FeeAssetHandlerAbi,
|
|
@@ -74,6 +74,8 @@ export declare class GovernanceContract extends ReadOnlyGovernanceContract {
|
|
|
74
74
|
withdrawAddress: Hex;
|
|
75
75
|
}): Promise<bigint>;
|
|
76
76
|
getPower(): Promise<bigint>;
|
|
77
|
+
/** Returns the user's voting power for a specific proposal, checked at pendingThrough timestamp. */
|
|
78
|
+
getPowerForProposal(proposalId: bigint): Promise<bigint>;
|
|
77
79
|
vote({ proposalId, voteAmount, inFavor, retries, logger }: {
|
|
78
80
|
proposalId: bigint;
|
|
79
81
|
voteAmount: bigint | undefined;
|
|
@@ -87,4 +89,4 @@ export declare class GovernanceContract extends ReadOnlyGovernanceContract {
|
|
|
87
89
|
logger: Logger;
|
|
88
90
|
}): Promise<void>;
|
|
89
91
|
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292ZXJuYW5jZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9nb3Zlcm5hbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbEUsT0FBTyxFQUVMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssR0FBRyxFQUNSLEtBQUssR0FBRyxFQUlULE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV2RSxPQUFPLEVBQUUsS0FBSyx3QkFBd0IsRUFBRSxLQUFLLFVBQVUsRUFBb0IsTUFBTSxhQUFhLENBQUM7QUFFL0YsTUFBTSxNQUFNLDZCQUE2QixHQUFHLElBQUksQ0FDOUMsbUJBQW1CLEVBQ25CLG1CQUFtQixHQUFHLGVBQWUsR0FBRyxpQkFBaUIsR0FBRywyQkFBMkIsQ0FDeEYsQ0FBQztBQUdGLG9CQUFZLGFBQWE7SUFDdkIsT0FBTyxJQUFBO0lBQ1AsTUFBTSxJQUFBO0lBQ04sTUFBTSxJQUFBO0lBQ04sVUFBVSxJQUFBO0lBQ1YsUUFBUSxJQUFBO0lBQ1IsUUFBUSxJQUFBO0lBQ1IsT0FBTyxJQUFBO0lBQ1AsT0FBTyxJQUFBO0NBQ1I7QUFFRCx3QkFBZ0IseUJBQXlCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FXN0Q7QUFFRCxxQkFBYSwwQkFBMEI7YUFLbkIsTUFBTSxFQUFFLFVBQVU7SUFKcEMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxPQUFPLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUUvRixZQUNFLE9BQU8sRUFBRSxHQUFHLEVBQ0ksTUFBTSxFQUFFLFVBQVUsRUFHbkM7SUFFRCxJQUFXLE9BQU8sZUFFakI7SUFFWSw0QkFBNEIsd0JBRXhDO0lBRU0sZ0JBQWdCOzs7Ozs7Ozs7Ozs7T0FFdEI7SUFFTSxXQUFXLENBQUMsVUFBVSxFQUFFLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7OztPQUVwQztJQUVZLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQU94RTtJQUVZLG1CQUFtQixDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQUUsVUFBVSxFQUFFLE1BQU0sQ0FBQztRQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7S0FBRSxpQkFvQjlGO0lBRVksdUJBQXVCLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDO1FBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQTtLQUFFLGlCQXlCbEc7Q0FDRjtBQUVELHFCQUFhLGtCQUFtQixTQUFRLDBCQUEwQjthQUtyQyxNQUFNLEVBQUUsd0JBQXdCO0lBSjNELG1CQUE0QixrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxPQUFPLGFBQWEsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO0lBRXRILFlBQ0UsT0FBTyxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBQ0EsTUFBTSxFQUFFLHdCQUF3QixFQVUxRDtJQUVZLE9BQU8sQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUduRDtJQUVZLGVBQWUsQ0FBQyxFQUMzQixjQUFjLEVBQ2QsZUFBZSxFQUNoQixFQUFFO1FBQ0QsY0FBYyxFQUFFLEdBQUcsQ0FBQztRQUNwQixlQUFlLEVBQUUsR0FBRyxDQUFDO0tBQ3RCLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU9sQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBR3ZDO0lBRUQsb0dBQW9HO0lBQ3ZGLG1CQUFtQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUlwRTtJQUVZLElBQUksQ0FBQyxFQUNoQixVQUFVLEVBQ1YsVUFBVSxFQUNWLE9BQU8sRUFDUCxPQUFZLEVBQ1osTUFBTSxFQUNQLEVBQUU7UUFDRCxVQUFVLEVBQUUsTUFBTSxDQUFDO1FBQ25CLFVBQVUsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO1FBQy9CLE9BQU8sRUFBRSxPQUFPLENBQUM7UUFDakIsT0FBTyxFQUFFLE1BQU0sQ0FBQztRQUNoQixNQUFNLEVBQUUsTUFBTSxDQUFDO0tBQ2hCLGlCQStDQTtJQUVZLGVBQWUsQ0FBQyxFQUMzQixVQUFVLEVBQ1YsT0FBWSxFQUNaLE1BQU0sRUFDUCxFQUFFO1FBQ0QsVUFBVSxFQUFFLE1BQU0sQ0FBQztRQUNuQixPQUFPLEVBQUUsTUFBTSxDQUFDO1FBQ2hCLE1BQU0sRUFBRSxNQUFNLENBQUM7S0FDaEIsaUJBeUNBO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"governance.d.ts","sourceRoot":"","sources":["../../src/contracts/governance.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"governance.d.ts","sourceRoot":"","sources":["../../src/contracts/governance.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,12 +155,20 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
|
|
|
155
155
|
now.timestamp
|
|
156
156
|
]);
|
|
157
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
|
+
}
|
|
158
166
|
async vote({ proposalId, voteAmount, inFavor, retries = 10, logger }) {
|
|
159
167
|
const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
|
|
160
168
|
logger
|
|
161
169
|
});
|
|
162
170
|
const retryDelaySeconds = 12;
|
|
163
|
-
voteAmount = voteAmount ?? await this.
|
|
171
|
+
voteAmount = voteAmount ?? await this.getPowerForProposal(proposalId);
|
|
164
172
|
let success = false;
|
|
165
173
|
for(let i = 0; i < retries; i++){
|
|
166
174
|
try {
|