Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion yarn-project/ethereum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
"start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
"start": "node ./dest/index.js",
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
"proposer-address": "node ./dest/cli/forwarder_address.js"
},
"inherits": [
"../package.common.json"
Expand Down
12 changes: 12 additions & 0 deletions yarn-project/ethereum/src/cli/forwarder_address.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ForwarderContract } from '../contracts/index.js';

const ownerAddress = process.argv[2];
if (!ownerAddress) {
process.stderr.write('Please provide an owner address as an argument\n');
process.exit(1);
}

// Ensure the address starts with 0x
const formattedAddress = ownerAddress.startsWith('0x') ? ownerAddress : `0x${ownerAddress}`;
const address = ForwarderContract.expectedAddress(formattedAddress as `0x${string}`);
process.stdout.write(`${address}\n`);
5 changes: 5 additions & 0 deletions yarn-project/ethereum/src/contracts/forwarder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,9 @@ describe('Forwarder', () => {
expect(err).toBeInstanceOf(FormattedViemError);
expect(err.message).toMatch(/GovernanceProposer__OnlyProposerCanVote/);
});

it('gets expected address', () => {
const expected = ForwarderContract.expectedAddress('0x8048539a57619864fdcAE35282731809CD1f5E8D');
expect(expected).toBe('0xEB416A0f18CEf8Ce5C9dd4BceF4BeFfb771703c6');
});
});
7 changes: 6 additions & 1 deletion yarn-project/ethereum/src/contracts/forwarder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
getContract,
} from 'viem';

import { deployL1Contract } from '../deploy_l1_contracts.js';
import { deployL1Contract, getExpectedAddress } from '../deploy_l1_contracts.js';
import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
import type { L1Clients, ViemPublicClient, ViemWalletClient } from '../types.js';
import { RollupContract } from './rollup.js';
Expand All @@ -23,6 +23,11 @@ export class ForwarderContract {
this.forwarder = getContract({ address, abi: ForwarderAbi, client });
}

static expectedAddress(owner: Hex) {
const { address } = getExpectedAddress(ForwarderAbi, ForwarderBytecode, [owner], owner);
return address;
}

static async create(
owner: Hex,
walletClient: ViemWalletClient,
Expand Down