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
40 changes: 4 additions & 36 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ services:
- --conf.file=/config/sequencer_config.json
- --node.feed.output.enable
- --node.feed.output.port=9642
- --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer
- --http.api=net,web3,eth,txpool,debug
- --node.seq-coordinator.my-url=http://sequencer:8547
- --graphql.enable
- --graphql.vhosts=*
Expand All @@ -192,7 +192,7 @@ services:
command:
- --conf.file=/config/sequencer_config.json
- --node.seq-coordinator.my-url=http://sequencer_b:8547
- --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer
- --http.api=net,web3,eth,txpool,debug
depends_on:
- geth
- redis
Expand All @@ -210,7 +210,7 @@ services:
command:
- --conf.file=/config/sequencer_config.json
- --node.seq-coordinator.my-url=http://sequencer_c:8547
- --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer
- --http.api=net,web3,eth,txpool,debug
depends_on:
- geth
- redis
Expand All @@ -228,7 +228,7 @@ services:
command:
- --conf.file=/config/sequencer_config.json
- --node.seq-coordinator.my-url=http://sequencer_d:8547
- --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer
- --http.api=net,web3,eth,txpool,debug
depends_on:
- geth
- redis
Expand Down Expand Up @@ -449,37 +449,6 @@ services:
command:
- --conf.file=/config/referenceda_provider.json

timeboost-auctioneer:
pid: host # allow debugging
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/autonomous-auctioneer
volumes:
- "config:/config"
- "timeboost-auctioneer-data:/data"
- "l1keystore:/home/user/l1keystore"
command:
- --conf.file=/config/autonomous_auctioneer_config.json
depends_on:
- redis

timeboost-bid-validator:
pid: host # allow debugging
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/autonomous-auctioneer
ports:
- "127.0.0.1:9372:8547"
volumes:
- "config:/config"
command:
- --conf.file=/config/bid_validator_config.json
- --http.addr=0.0.0.0
- --http.vhosts=*
- --http.corsdomain=*
- --http.api=auctioneer
- --log-level=INFO
depends_on:
- redis

minio:
image: minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1
ports:
Expand Down Expand Up @@ -565,7 +534,6 @@ volumes:
das-committee-b-data:
das-mirror-data:
referenceda-provider-data:
timeboost-auctioneer-data:
contracts:
contracts-local:
minio-data:
5 changes: 1 addition & 4 deletions scripts/accounts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ export function namedAccount(
if (name == "l2owner") {
return specialAccount(5);
}
if (name == "auctioneer") {
return specialAccount(6);
}
if (name == "filterer") {
return specialAccount(7);
}
Expand Down Expand Up @@ -92,7 +89,7 @@ export function namedAddress(
export const namedAccountHelpString =
"Valid account names:\n" +
" funnel | sequencer | validator | l2owner\n" +
" | auctioneer | filterer - known keys used by l2\n" +
" | filterer - known keys used by l2\n" +
" l3owner | l3sequencer - known keys used by l3\n" +
" user_[Alphanumeric] - key will be generated from username\n" +
" threaduser_[Alphanumeric] - same as user_[Alphanumeric]_thread_[thread-id]\n" +
Expand Down
64 changes: 0 additions & 64 deletions scripts/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,6 @@ function writeConfigs(argv: any) {
sequencerConfig.node["seq-coordinator"].enable = true
sequencerConfig.execution["sequencer"].enable = true
sequencerConfig.node["delayed-sequencer"].enable = true
if (argv.timeboost) {
sequencerConfig.execution.sequencer.timeboost = {
"enable": false, // Create it false initially, turn it on with sed in test-node.bash after contract setup.
"redis-url": argv.redisUrl
};
}
if (argv.txfiltering) {
applyTxFilteringConfig(sequencerConfig);
}
Expand Down Expand Up @@ -655,59 +649,6 @@ function dasBackendsJsonConfig(argv: any) {
return backends
}

export const writeTimeboostConfigsCommand = {
command: "write-timeboost-configs",
describe: "writes configs for the timeboost autonomous auctioneer and bid validator",
builder: {
"auction-contract": {
string: true,
describe: "auction contract address",
demandOption: true
},
},
handler: (argv: any) => {
writeAutonomousAuctioneerConfig(argv)
writeBidValidatorConfig(argv)
}
}

function writeAutonomousAuctioneerConfig(argv: any) {
const autonomousAuctioneerConfig = {
"auctioneer-server": {
"auction-contract-address": argv.auctionContract,
"db-directory": "/data",
"redis-url": "redis://redis:6379",
"use-redis-coordinator": true,
"redis-coordinator-url": "redis://redis:6379",
"wallet": {
"account": namedAddress("auctioneer"),
"password": consts.l1passphrase,
"pathname": consts.l1keystore
},
},
"bid-validator": {
"enable": false
}
}
const autonomousAuctioneerConfigJSON = JSON.stringify(autonomousAuctioneerConfig)
fs.writeFileSync(path.join(consts.configpath, "autonomous_auctioneer_config.json"), autonomousAuctioneerConfigJSON)
}

function writeBidValidatorConfig(argv: any) {
const bidValidatorConfig = {
"auctioneer-server": {
"enable": false
},
"bid-validator": {
"auction-contract-address": argv.auctionContract,
"redis-url": "redis://redis:6379",
"sequencer-endpoint": "http://sequencer:8547"
}
}
const bidValidatorConfigJSON = JSON.stringify(bidValidatorConfig)
fs.writeFileSync(path.join(consts.configpath, "bid_validator_config.json"), bidValidatorConfigJSON)
}

export const writeConfigCommand = {
command: "write-config",
describe: "writes config files",
Expand Down Expand Up @@ -737,11 +678,6 @@ export const writeConfigCommand = {
describe: "run nodes in reference DA mode",
default: false
},
timeboost: {
boolean: true,
describe: "run sequencer in timeboost mode",
default: false
},
txfiltering: {
boolean: true,
describe: "enable transaction filtering mode",
Expand Down
58 changes: 0 additions & 58 deletions scripts/ethcommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import * as ERC20 from "@openzeppelin/contracts/build/contracts/ERC20.json";
import * as TestWETH9 from "@arbitrum/token-bridge-contracts/build/contracts/contracts/tokenbridge/test/TestWETH9.sol/TestWETH9.json";
import * as fs from "fs";
import { ARB_OWNER } from "./consts";
import * as TransparentUpgradeableProxy from "@openzeppelin/contracts/build/contracts/TransparentUpgradeableProxy.json"
import * as ExpressLaneAuctionContract from "@arbitrum/nitro-contracts/build/contracts/src/express-lane-auction/ExpressLaneAuction.sol/ExpressLaneAuction.json"
import * as StylusDeployerContract from "@arbitrum/nitro-contracts/build/contracts/src/stylus/StylusDeployer.sol/StylusDeployer.json"

const path = require("path");
Expand Down Expand Up @@ -476,62 +474,6 @@ export const createFeeTokenPricerCommand = {
},
};

export const deployExpressLaneAuctionContractCommand = {
command: "deploy-express-lane-auction",
describe: "Deploy the ExpressLaneAuction contract",
builder: {
"bidding-token": {
string: true,
describe: "bidding token address",
demandOption: true
},
"auctioneer": {
string: true,
describe: "account name to set as auctioneer and admin on contract (default auctioneer)",
default: "auctioneer"
}
},
handler: async (argv: any) => {
console.log("deploy ExpressLaneAuction contract");
argv.provider = new ethers.providers.WebSocketProvider(argv.l2url);
const l2OwnerWallet = namedAccount("l2owner").connect(argv.provider)
const contractFactory = new ContractFactory(ExpressLaneAuctionContract.abi, ExpressLaneAuctionContract.bytecode, l2OwnerWallet)

const contract = await contractFactory.deploy();
await contract.deployTransaction.wait();
console.log("ExpressLaneAuction contract deployed at address:", contract.address);

const auctioneerAddr = namedAddress(argv.auctioneer)
const initIface = new ethers.utils.Interface(["function initialize((address,address,address,(int64,uint64,uint64,uint64),uint256,address,address,address,address,address,address,address))"])
const initData = initIface.encodeFunctionData("initialize", [[
auctioneerAddr, //_auctioneer
argv.biddingToken, //_biddingToken
auctioneerAddr, //_beneficiary
[
Math.round(Date.now() / 60000) * 60, // offsetTimestamp - most recent minute
60, // roundDurationSeconds
15, // auctionClosingSeconds
15 // reserveSubmissionSeconds
],// RoundTiminginfo
1, // _minReservePrice
auctioneerAddr, //_auctioneerAdmin
auctioneerAddr, //_minReservePriceSetter,
auctioneerAddr, //_reservePriceSetter,
auctioneerAddr, //_reservePriceSetterAdmin,
auctioneerAddr, //_beneficiarySetter,
auctioneerAddr, //_roundTimingSetter,
auctioneerAddr //_masterAdmin
]]);

const proxyFactory = new ethers.ContractFactory(TransparentUpgradeableProxy.abi, TransparentUpgradeableProxy.bytecode, l2OwnerWallet)
const proxy = await proxyFactory.deploy(contract.address, namedAddress("l2owner"), initData)
await proxy.deployed()
console.log("Proxy(ExpressLaneAuction) contract deployed at address:", proxy.address);

argv.provider.destroy();
}
};

// Will revert if the keyset is already valid.
async function setValidKeyset(argv: any, upgradeExecutorAddr: string, sequencerInboxAddr: string, keyset: string){
const innerIface = new ethers.utils.Interface(["function setValidKeyset(bytes)"])
Expand Down
4 changes: 0 additions & 4 deletions scripts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
writeL2DASMirrorConfigCommand,
writeL2DASKeysetConfigCommand,
writeL2ReferenceDAConfigCommand,
writeTimeboostConfigsCommand,
writeTransactionFiltererConfigCommand,
initTxFilteringMinioCommand,
hashAddressCommand,
Expand All @@ -34,7 +33,6 @@ import {
bridgeNativeTokenToL3Command,
bridgeToL3Command,
createERC20Command,
deployExpressLaneAuctionContractCommand,
createWETHCommand,
createStylusDeployerCommand,
transferERC20Command,
Expand Down Expand Up @@ -66,7 +64,6 @@ async function main() {
.command(bridgeNativeTokenToL3Command)
.command(createERC20Command)
.command(createFeeTokenPricerCommand)
.command(deployExpressLaneAuctionContractCommand)
.command(createWETHCommand)
.command(createStylusDeployerCommand)
.command(transferERC20Command)
Expand All @@ -86,7 +83,6 @@ async function main() {
.command(writeL2ReferenceDAConfigCommand)
.command(writePrysmCommand)
.command(writeAccountsCommand)
.command(writeTimeboostConfigsCommand)
.command(writeTransactionFiltererConfigCommand)
.command(initTxFilteringMinioCommand)
.command(hashAddressCommand)
Expand Down
44 changes: 3 additions & 41 deletions test-node.bash
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ l1chainid=1337
simple=true
l2anytrust=false
l2referenceda=false
l2timeboost=false
l2txfiltering=false
l2filteringreport=false

Expand Down Expand Up @@ -273,10 +272,6 @@ while [[ $# -gt 0 ]]; do
l2referenceda=true
shift
;;
--l2-timeboost)
l2timeboost=true
shift
;;
--l2-tx-filtering)
l2txfiltering=true
shift
Expand Down Expand Up @@ -330,7 +325,6 @@ while [[ $# -gt 0 ]]; do
echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided
echo --l2-anytrust run the L2 as an AnyTrust chain
echo --l2-referenceda run the L2 with reference external data availability provider
echo --l2-timeboost run the L2 with Timeboost enabled, including auctioneer and bid validator
echo --l2-tx-filtering run the L2 with transaction filtering enabled
echo --l2-filtering-report run the L2 with filtering report framework enabled \(implies --l2-tx-filtering\)
echo --batchposters batch posters [0-3]
Expand Down Expand Up @@ -401,10 +395,6 @@ if $blockscout; then
NODES="$NODES blockscout"
fi

if $l2timeboost; then
NODES="$NODES timeboost-auctioneer timeboost-bid-validator"
fi

if $l2txfiltering; then
NODES="$NODES minio transaction-filterer"
fi
Expand Down Expand Up @@ -559,11 +549,7 @@ if $force_init; then

echo "== Deploying L2 chain"
docker compose run --rm -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=$wasmroot -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode
if $l2timeboost; then
docker compose run --rm --entrypoint sh rollupcreator -c 'jq ".[] | .\"track-block-metadata-from\"=1 | [.]" /config/deployed_chain_info.json > /config/l2_chain_info.json'
else
docker compose run --rm --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json"
fi
docker compose run --rm --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json"

if $l2referenceda; then
docker compose run --rm --entrypoint sh referenceda-provider -c "true" # Noop to mount shared volumes with contracts for manual build and deployment
Expand All @@ -585,7 +571,6 @@ fi # $force_init

anytrustNodeConfigLine=""
referenceDaNodeConfigLine=""
timeboostNodeConfigLine=""
txFilteringNodeConfigLine=""
filteringReportNodeConfigLine=""

Expand Down Expand Up @@ -622,9 +607,6 @@ if $l2referenceda && $run; then
fi

if $force_init; then
if $l2timeboost; then
timeboostNodeConfigLine="--timeboost"
fi
if $l2referenceda; then
referenceDaNodeConfigLine="--referenceDA"
fi
Expand All @@ -637,9 +619,9 @@ if $force_init; then

echo "== Writing configs"
if $simple; then
run_script write-config --simple $anytrustNodeConfigLine $referenceDaNodeConfigLine $timeboostNodeConfigLine $txFilteringNodeConfigLine $filteringReportNodeConfigLine
run_script write-config --simple $anytrustNodeConfigLine $referenceDaNodeConfigLine $txFilteringNodeConfigLine $filteringReportNodeConfigLine
else
run_script write-config $anytrustNodeConfigLine $referenceDaNodeConfigLine $timeboostNodeConfigLine $txFilteringNodeConfigLine $filteringReportNodeConfigLine
run_script write-config $anytrustNodeConfigLine $referenceDaNodeConfigLine $txFilteringNodeConfigLine $filteringReportNodeConfigLine

echo == Initializing redis
docker compose up --wait redis
Expand All @@ -653,26 +635,6 @@ if $force_init; then
run_script send-l2 --ethamount 100 --to l2owner --wait
rollupAddress=`docker compose run --rm --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"`

if $l2timeboost; then
run_script send-l2 --ethamount 100 --to auctioneer --wait
biddingTokenAddress=`run_script create-erc20 --deployer auctioneer | tail -n 1 | awk '{ print $NF }'`
auctionContractAddress=`run_script deploy-express-lane-auction --bidding-token $biddingTokenAddress | tail -n 1 | awk '{ print $NF }'`
auctioneerAddress=`run_script print-address --account auctioneer | tail -n1 | tr -d '\r\n'`
echo == Starting up Timeboost auctioneer and bid validator.
echo == Bidding token: $biddingTokenAddress, auction contract $auctionContractAddress
run_script write-timeboost-configs --auction-contract $auctionContractAddress
docker compose run --rm --user root --entrypoint sh timeboost-auctioneer -c "chown -R 1000:1000 /data"

echo == Funding alice and bob user accounts for timeboost testing
run_script send-l2 --ethamount 10 --to user_alice --wait
run_script send-l2 --ethamount 10 --to user_bob --wait
run_script transfer-erc20 --token $biddingTokenAddress --amount 10000 --from auctioneer --to user_alice
run_script transfer-erc20 --token $biddingTokenAddress --amount 10000 --from auctioneer --to user_bob

docker compose run --rm --entrypoint sh scripts -c "sed -i 's/\(\"execution\":{\"sequencer\":{\"enable\":true,\"timeboost\":{\"enable\":\)false/\1true,\"auction-contract-address\":\"$auctionContractAddress\",\"auctioneer-address\":\"$auctioneerAddress\"/' /config/sequencer_config.json" --wait
docker compose restart $INITIAL_SEQ_NODES
fi

if $l2txfiltering; then
echo == Funding transaction filterer account
run_script send-l2 --ethamount 100 --to filterer --wait
Expand Down
Loading