From 90859f534af57ab5ae19b8dc81b8ad64a5380641 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Fri, 10 May 2024 13:26:41 +0200 Subject: [PATCH 1/6] cmd/prague: started work on prague tests --- cmd/cancun/helper.go | 153 +++++++++++++++++++++++++++++++++++++++++++ cmd/cancun/main.go | 146 ----------------------------------------- cmd/prague/helper.go | 153 +++++++++++++++++++++++++++++++++++++++++++ cmd/prague/main.go | 61 +++++++++++++++++ 4 files changed, 367 insertions(+), 146 deletions(-) create mode 100644 cmd/cancun/helper.go create mode 100644 cmd/prague/helper.go create mode 100644 cmd/prague/main.go diff --git a/cmd/cancun/helper.go b/cmd/cancun/helper.go new file mode 100644 index 0000000..f51bb01 --- /dev/null +++ b/cmd/cancun/helper.go @@ -0,0 +1,153 @@ +package main + +import ( + "context" + "crypto/ecdsa" + "crypto/rand" + "fmt" + "math/big" + + txfuzz "github.com/MariusVanDerWijden/tx-fuzz" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethereum/go-ethereum/rpc" +) + +const ( + maxDataPerBlob = 1 << 17 // 128Kb +) + +func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + panic(err) + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + panic(err) + } + fmt.Printf("Nonce: %v\n", nonce) + gp, err := backend.SuggestGasPrice(context.Background()) + if err != nil { + panic(err) + } + tip, err := backend.SuggestGasTipCap(context.Background()) + if err != nil { + tip = big.NewInt(100000000) + //panic(err) + } + var rlpData []byte + var _tx *types.Transaction + if blobs { + blob, err := randomBlobData() + if err != nil { + panic(err) + } + //nonce = nonce - 2 + tx := txfuzz.New4844Tx(nonce, &addr, 500000, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) + signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) + rlpData, err = signedTx.MarshalBinary() + if err != nil { + panic(err) + } + _tx = signedTx + } else { + tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: 500000, To: &addr, Data: data}) + signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) + rlpData, err = signedTx.MarshalBinary() + if err != nil { + panic(err) + } + _tx = signedTx + } + + if err := cl.CallContext(context.Background(), nil, "eth_sendRawTransaction", hexutil.Encode(rlpData)); err != nil { + panic(err) + } + return _tx +} + +func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { + // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) + + sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) + if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { + panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) + } + cl, err := rpc.Dial(address) + if err != nil { + panic(err) + } + return cl, sk +} + +func wait(tx *types.Transaction) { + client, _ := getRealBackend() + backend := ethclient.NewClient(client) + bind.WaitMined(context.Background(), backend, tx) +} + +func deploy(bytecode string) (common.Address, error) { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + return common.Address{}, err + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + return common.Address{}, err + } + fmt.Printf("Nonce: %v\n", nonce) + gp, _ := backend.SuggestGasPrice(context.Background()) + tx := types.NewContractCreation(nonce, common.Big0, 500000, gp.Mul(gp, common.Big2), common.Hex2Bytes(bytecode)) + signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) + if err := backend.SendTransaction(context.Background(), signedTx); err != nil { + return common.Address{}, err + } + return bind.WaitDeployed(context.Background(), backend, signedTx) +} + +func execute(data []byte, gaslimit uint64) { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + panic(err) + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + panic(err) + } + fmt.Printf("Nonce: %v\n", nonce) + gp, _ := backend.SuggestGasPrice(context.Background()) + tx := types.NewContractCreation(nonce, common.Big1, gaslimit, gp.Mul(gp, common.Big2), data) + signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) + backend.SendTransaction(context.Background(), signedTx) +} + +func randomBlobData() ([]byte, error) { + val, err := rand.Int(rand.Reader, big.NewInt(maxDataPerBlob)) + if err != nil { + return nil, err + } + size := int(val.Int64() * 3) + data := make([]byte, size) + n, err := rand.Read(data) + if err != nil { + return nil, err + } + if n != size { + return nil, fmt.Errorf("could not create random blob data with size %d: %v", size, err) + } + return data, nil +} diff --git a/cmd/cancun/main.go b/cmd/cancun/main.go index 9c47bac..8940cba 100644 --- a/cmd/cancun/main.go +++ b/cmd/cancun/main.go @@ -1,29 +1,15 @@ package main import ( - "context" - "crypto/ecdsa" "crypto/rand" "crypto/sha256" "encoding/binary" "fmt" - "math/big" "time" - txfuzz "github.com/MariusVanDerWijden/tx-fuzz" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" -) - -const ( - maxDataPerBlob = 1 << 17 // 128Kb ) var ( @@ -185,7 +171,6 @@ func test4788() { } func test4844() { - // deployProxy addr, err := deployBlobProxy() if err != nil { panic(err) @@ -247,12 +232,6 @@ func test4844_precompile() { } } -func wait(tx *types.Transaction) { - client, _ := getRealBackend() - backend := ethclient.NewClient(client) - bind.WaitMined(context.Background(), backend, tx) -} - func precompileParamsToBytes(commitment kzg4844.Commitment, claim kzg4844.Claim, proof kzg4844.Proof, point kzg4844.Point) []byte { bytes := make([]byte, 192) versionedHash := kZGToVersionedHash(commitment) @@ -310,90 +289,6 @@ func kZGToVersionedHash(kzg kzg4844.Commitment) common.Hash { return h } -func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - panic(err) - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - panic(err) - } - fmt.Printf("Nonce: %v\n", nonce) - gp, err := backend.SuggestGasPrice(context.Background()) - if err != nil { - panic(err) - } - tip, err := backend.SuggestGasTipCap(context.Background()) - if err != nil { - tip = big.NewInt(100000000) - //panic(err) - } - var rlpData []byte - var _tx *types.Transaction - if blobs { - blob, err := randomBlobData() - if err != nil { - panic(err) - } - //nonce = nonce - 2 - tx := txfuzz.New4844Tx(nonce, &addr, 500000, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) - signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) - rlpData, err = signedTx.MarshalBinary() - if err != nil { - panic(err) - } - _tx = signedTx - } else { - tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: 500000, To: &addr, Data: data}) - signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) - rlpData, err = signedTx.MarshalBinary() - if err != nil { - panic(err) - } - _tx = signedTx - } - - if err := cl.CallContext(context.Background(), nil, "eth_sendRawTransaction", hexutil.Encode(rlpData)); err != nil { - panic(err) - } - return _tx -} - -func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { - // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) - - sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) - if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { - panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) - } - cl, err := rpc.Dial(address) - if err != nil { - panic(err) - } - return cl, sk -} - -func randomBlobData() ([]byte, error) { - val, err := rand.Int(rand.Reader, big.NewInt(maxDataPerBlob)) - if err != nil { - return nil, err - } - size := int(val.Int64() * 3) - data := make([]byte, size) - n, err := rand.Read(data) - if err != nil { - return nil, err - } - if n != size { - return nil, fmt.Errorf("could not create random blob data with size %d: %v", size, err) - } - return data, nil -} - /* pragma solidity >=0.7.0 <0.9.0; contract BlobProxy { @@ -456,47 +351,6 @@ func deploy4788Proxy() (common.Address, error) { return deploy(bytecode) } -func deploy(bytecode string) (common.Address, error) { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - return common.Address{}, err - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - return common.Address{}, err - } - fmt.Printf("Nonce: %v\n", nonce) - gp, _ := backend.SuggestGasPrice(context.Background()) - tx := types.NewContractCreation(nonce, common.Big0, 500000, gp.Mul(gp, common.Big2), common.Hex2Bytes(bytecode)) - signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) - if err := backend.SendTransaction(context.Background(), signedTx); err != nil { - return common.Address{}, err - } - return bind.WaitDeployed(context.Background(), backend, signedTx) -} - -func execute(data []byte, gaslimit uint64) { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - panic(err) - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - panic(err) - } - fmt.Printf("Nonce: %v\n", nonce) - gp, _ := backend.SuggestGasPrice(context.Background()) - tx := types.NewContractCreation(nonce, common.Big1, gaslimit, gp.Mul(gp, common.Big2), data) - signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) - backend.SendTransaction(context.Background(), signedTx) -} - func Uint64ToHash(u uint64) common.Hash { var h common.Hash binary.BigEndian.PutUint64(h[24:], u) diff --git a/cmd/prague/helper.go b/cmd/prague/helper.go new file mode 100644 index 0000000..f51bb01 --- /dev/null +++ b/cmd/prague/helper.go @@ -0,0 +1,153 @@ +package main + +import ( + "context" + "crypto/ecdsa" + "crypto/rand" + "fmt" + "math/big" + + txfuzz "github.com/MariusVanDerWijden/tx-fuzz" + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethereum/go-ethereum/rpc" +) + +const ( + maxDataPerBlob = 1 << 17 // 128Kb +) + +func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + panic(err) + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + panic(err) + } + fmt.Printf("Nonce: %v\n", nonce) + gp, err := backend.SuggestGasPrice(context.Background()) + if err != nil { + panic(err) + } + tip, err := backend.SuggestGasTipCap(context.Background()) + if err != nil { + tip = big.NewInt(100000000) + //panic(err) + } + var rlpData []byte + var _tx *types.Transaction + if blobs { + blob, err := randomBlobData() + if err != nil { + panic(err) + } + //nonce = nonce - 2 + tx := txfuzz.New4844Tx(nonce, &addr, 500000, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) + signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) + rlpData, err = signedTx.MarshalBinary() + if err != nil { + panic(err) + } + _tx = signedTx + } else { + tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: 500000, To: &addr, Data: data}) + signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) + rlpData, err = signedTx.MarshalBinary() + if err != nil { + panic(err) + } + _tx = signedTx + } + + if err := cl.CallContext(context.Background(), nil, "eth_sendRawTransaction", hexutil.Encode(rlpData)); err != nil { + panic(err) + } + return _tx +} + +func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { + // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) + + sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) + if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { + panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) + } + cl, err := rpc.Dial(address) + if err != nil { + panic(err) + } + return cl, sk +} + +func wait(tx *types.Transaction) { + client, _ := getRealBackend() + backend := ethclient.NewClient(client) + bind.WaitMined(context.Background(), backend, tx) +} + +func deploy(bytecode string) (common.Address, error) { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + return common.Address{}, err + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + return common.Address{}, err + } + fmt.Printf("Nonce: %v\n", nonce) + gp, _ := backend.SuggestGasPrice(context.Background()) + tx := types.NewContractCreation(nonce, common.Big0, 500000, gp.Mul(gp, common.Big2), common.Hex2Bytes(bytecode)) + signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) + if err := backend.SendTransaction(context.Background(), signedTx); err != nil { + return common.Address{}, err + } + return bind.WaitDeployed(context.Background(), backend, signedTx) +} + +func execute(data []byte, gaslimit uint64) { + cl, sk := getRealBackend() + backend := ethclient.NewClient(cl) + sender := common.HexToAddress(txfuzz.ADDR) + nonce, err := backend.PendingNonceAt(context.Background(), sender) + if err != nil { + panic(err) + } + chainid, err := backend.ChainID(context.Background()) + if err != nil { + panic(err) + } + fmt.Printf("Nonce: %v\n", nonce) + gp, _ := backend.SuggestGasPrice(context.Background()) + tx := types.NewContractCreation(nonce, common.Big1, gaslimit, gp.Mul(gp, common.Big2), data) + signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) + backend.SendTransaction(context.Background(), signedTx) +} + +func randomBlobData() ([]byte, error) { + val, err := rand.Int(rand.Reader, big.NewInt(maxDataPerBlob)) + if err != nil { + return nil, err + } + size := int(val.Int64() * 3) + data := make([]byte, size) + n, err := rand.Read(data) + if err != nil { + return nil, err + } + if n != size { + return nil, fmt.Errorf("could not create random blob data with size %d: %v", size, err) + } + return data, nil +} diff --git a/cmd/prague/main.go b/cmd/prague/main.go new file mode 100644 index 0000000..3f18602 --- /dev/null +++ b/cmd/prague/main.go @@ -0,0 +1,61 @@ +package main + +import ( + "fmt" + + "github.com/ethereum/go-ethereum/common" +) + +var ( + address = "http://127.0.0.1:8545" +) + +func main() { + test2537() +} + +func test2537() { + testBLSAdd() +} + +func testBLSAdd() { + addr, err := deployPrecompileCaller("0b") + if err != nil { + panic(err) + } + // Small input + exec(addr, []byte{0x5f}, true) + // Big input + var input []byte + for i := 0; i < 1000; i++ { + input = append(input, 0xff) + } + exec(addr, input, true) + // Correct input + input = common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d280000000000000000000000000000000009ece308f9d1f0131765212deca99697b112d61f9be9a5f1f3780a51335b3ff981747a0b2ca2179b96d2c0c9024e522400000000000000000000000000000000032b80d3a6f5b09f8a84623389c5f80ca69a0cddabc3097f9d9c27310fd43be6e745256c634af45ca3473b0590ae30d1") + exec(addr, input, true) +} + +/* +pragma solidity >=0.7.0 <0.9.0; + + contract BlobCaller { + bool _ok; + bytes out; + + fallback (bytes calldata _input) external returns (bytes memory _output) { + address precompile = address(0x0A); + (bool ok, bytes memory output) = precompile.call{gas: 500000}(_input); + _output = output; + // Store return values to trigger sstore + _ok = ok; + out = output; + } + } +*/ +func deployPrecompileCaller(precompile string) (common.Address, error) { + bytecode1 := "6080604052348015600e575f80fd5b506104568061001c5f395ff3fe608060405234801561000f575f80fd5b505f3660605f60" + bytecode2 := "90505f808273ffffffffffffffffffffffffffffffffffffffff1661c35087876040516100459291906100fe565b5f604051808303815f8787f1925050503d805f811461007f576040519150601f19603f3d011682016040523d82523d5f602084013e610084565b606091505b5091509150809350815f806101000a81548160ff02191690831515021790555080600190816100b39190610350565b50505050915050805190602001f35b5f81905092915050565b828183375f83830152505050565b5f6100e583856100c2565b93506100f28385846100cc565b82840190509392505050565b5f61010a8284866100da565b91508190509392505050565b5f81519050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f600282049050600182168061019157607f821691505b6020821081036101a4576101a361014d565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f600883026102067fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826101cb565b61021086836101cb565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f61025461024f61024a84610228565b610231565b610228565b9050919050565b5f819050919050565b61026d8361023a565b6102816102798261025b565b8484546101d7565b825550505050565b5f90565b610295610289565b6102a0818484610264565b505050565b5b818110156102c3576102b85f8261028d565b6001810190506102a6565b5050565b601f821115610308576102d9816101aa565b6102e2846101bc565b810160208510156102f1578190505b6103056102fd856101bc565b8301826102a5565b50505b505050565b5f82821c905092915050565b5f6103285f198460080261030d565b1980831691505092915050565b5f6103408383610319565b9150826002028217905092915050565b61035982610116565b67ffffffffffffffff81111561037257610371610120565b5b61037c825461017a565b6103878282856102c7565b5f60209050601f8311600181146103b8575f84156103a6578287015190505b6103b08582610335565b865550610417565b601f1984166103c6866101aa565b5f5b828110156103ed578489015182556001820191506020850194506020810190506103c8565b8683101561040a5784890151610406601f891682610319565b8355505b6001600288020188555050505b50505050505056fea2646970667358221220bc28435cfa3208db8cae33e216a1ff54a6e5dce073695cad36274cc363055c5564736f6c63430008190033" + // The byte in between bytecode1 and bytecode2 denotes the precompile which we want to call + return deploy(fmt.Sprintf("%v%v%v", bytecode1, precompile, bytecode2)) +} From cb8c5998cd8bb03400788b8ec436ecd151bc2ec8 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 15 May 2024 12:00:41 +0200 Subject: [PATCH 2/6] cmd/prague: added touch addresses test --- cmd/prague/main.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/cmd/prague/main.go b/cmd/prague/main.go index 3f18602..714b8e7 100644 --- a/cmd/prague/main.go +++ b/cmd/prague/main.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" ) var ( @@ -14,6 +15,26 @@ func main() { test2537() } +func testTouchContracts() { + // touch beacon root addr + addresses := []common.Address{ + common.HexToAddress("0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"), // beacon roots + common.HexToAddress("0x00A3ca265EBcb825B45F985A16CEFB49958cE017"), // withdrawal requests + common.HexToAddress("0xfffffffffffffffffffffffffffffffffffffffe"), // system address + common.HexToAddress("0x25a219378dad9b3503c8268c9ca836a52427a4fb"), // history storage address + common.HexToAddress("0x00000000219ab540356cbb839cbe05303d7705fa"), // mainnet deposit contract + common.HexToAddress("0x4242424242424242424242424242424242424242"), // testnet deposit address + } + + for _, addr := range addresses { + exec(addr, []byte{}, false) // no data + exec(addr, []byte{1}, false) // 1 byte of data + exec(addr, crypto.Keccak256([]byte{1})[:], false) // 32 bytes of data + exec(addr, make([]byte, 2048), false) // 2048 bytes of data + } + +} + func test2537() { testBLSAdd() } From d93d076ec10810bfb5d11aacfb0d657fd416445b Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 15 May 2024 15:32:42 +0200 Subject: [PATCH 3/6] cmd/prague: added touch addresses test --- cmd/prague/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/prague/main.go b/cmd/prague/main.go index 714b8e7..8c772fe 100644 --- a/cmd/prague/main.go +++ b/cmd/prague/main.go @@ -12,6 +12,7 @@ var ( ) func main() { + testTouchContracts() test2537() } @@ -32,7 +33,6 @@ func testTouchContracts() { exec(addr, crypto.Keccak256([]byte{1})[:], false) // 32 bytes of data exec(addr, make([]byte, 2048), false) // 2048 bytes of data } - } func test2537() { From 0fed43aaf971ff0e7cd621c68b696b4ff306aa1f Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Thu, 16 May 2024 09:55:15 +0200 Subject: [PATCH 4/6] go.mod updated FuzzyVM --- go.mod | 33 ++++++++++++----------- go.sum | 83 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index 02baa1f..854f658 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,21 @@ go 1.21 toolchain go1.21.5 require ( - github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 - github.com/ethereum/go-ethereum v1.13.5 - github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c - github.com/urfave/cli/v2 v2.26.0 + github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d + github.com/ethereum/go-ethereum v1.14.3 + github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 + github.com/urfave/cli/v2 v2.27.1 ) require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect + github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/tools v0.16.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/tools v0.20.0 // indirect ) require ( @@ -29,22 +31,21 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.12.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect - github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect + github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect github.com/deckarep/golang-set/v2 v2.5.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect - github.com/ethereum/c-kzg-4844 v0.4.0 // indirect + github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/getsentry/sentry-go v0.25.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect + github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect github.com/google/uuid v1.3.0 // indirect github.com/gorilla/websocket v1.5.1 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect @@ -72,11 +73,11 @@ require ( github.com/tklauser/numcpus v0.7.0 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/go.sum b/go.sum index b8785ba..a63863e 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8/go.mod h1:L1QpLBqXlboJMOC2hndG95d1eiElzKsBhjzcuy8pxeM= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d/go.mod h1:gWTykV/ZinShgltWofTEJY4TsletuvGhB6l4+Ai2F+E= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= @@ -27,8 +27,8 @@ github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZ github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= +github.com/cockroachdb/pebble v1.1.0 h1:pcFh8CdCIt2kmEpK0OIatq67Ln9uGDYY3d5XnE0LJG4= +github.com/cockroachdb/pebble v1.1.0/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -39,8 +39,10 @@ github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJ github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= -github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= +github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= +github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -51,18 +53,20 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= -github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= -github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= +github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.14.3 h1:5zvnAqLtnCZrU9uod1JCvHWJbPMURzYFHfc2eHz4PHA= +github.com/ethereum/go-ethereum v1.14.3/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8= +github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= +github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= @@ -70,8 +74,6 @@ github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3Bop github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -85,16 +87,16 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -102,12 +104,12 @@ github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/ github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c/go.mod h1:K6KFgcQq1U9ksldcRyLYcwtj4nUTPn4rEaZtX4Gjofc= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4/go.mod h1:3JURK6FtzpaEjCVxopnYN37phjHNI5gW9fhsKFF51Us= github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -198,8 +200,8 @@ github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= -github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= -github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= +github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -209,14 +211,14 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -224,15 +226,15 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -247,21 +249,21 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= -golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -272,9 +274,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From a8ec6c3b98f1d87972a618efa71ccc6c07879a71 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Sun, 19 May 2024 19:51:25 +0200 Subject: [PATCH 5/6] prague: added more prague tests --- cmd/cancun/main.go | 18 ++++----- cmd/prague/helper.go | 5 ++- cmd/prague/main.go | 95 +++++++++++++++++++++++++++++++++++++------- transactions.go | 4 +- 4 files changed, 94 insertions(+), 28 deletions(-) diff --git a/cmd/cancun/main.go b/cmd/cancun/main.go index 8940cba..2d67664 100644 --- a/cmd/cancun/main.go +++ b/cmd/cancun/main.go @@ -13,7 +13,7 @@ import ( ) var ( - address = "http://127.0.0.1:8545" + address = "https://rpc.pectra-devnet-0.ethpandaops.io/" ) func main() { @@ -232,7 +232,7 @@ func test4844_precompile() { } } -func precompileParamsToBytes(commitment kzg4844.Commitment, claim kzg4844.Claim, proof kzg4844.Proof, point kzg4844.Point) []byte { +func precompileParamsToBytes(commitment *kzg4844.Commitment, claim *kzg4844.Claim, proof *kzg4844.Proof, point *kzg4844.Point) []byte { bytes := make([]byte, 192) versionedHash := kZGToVersionedHash(commitment) copy(bytes[0:32], versionedHash[:]) @@ -243,22 +243,22 @@ func precompileParamsToBytes(commitment kzg4844.Commitment, claim kzg4844.Claim, return bytes } -func createPrecompileRandParams() (kzg4844.Commitment, kzg4844.Claim, kzg4844.Proof, kzg4844.Point, error) { +func createPrecompileRandParams() (*kzg4844.Commitment, *kzg4844.Claim, *kzg4844.Proof, *kzg4844.Point, error) { random := make([]byte, 131072) rand.Read(random[:]) blob := encodeBlobs(random)[0] - commitment, err := kzg4844.BlobToCommitment(blob) + commitment, err := kzg4844.BlobToCommitment(&blob) if err != nil { - return kzg4844.Commitment{}, kzg4844.Claim{}, kzg4844.Proof{}, kzg4844.Point{}, err + return nil, nil, nil, nil, err } var point kzg4844.Point rand.Read(point[:]) point[0] = 0 // point needs to be < modulus - proof, claim, err := kzg4844.ComputeProof(blob, point) + proof, claim, err := kzg4844.ComputeProof(&blob, point) if err != nil { - return kzg4844.Commitment{}, kzg4844.Claim{}, kzg4844.Proof{}, kzg4844.Point{}, err + return nil, nil, nil, nil, err } - return commitment, claim, proof, point, nil + return &commitment, &claim, &proof, &point, nil } func encodeBlobs(data []byte) []kzg4844.Blob { @@ -282,7 +282,7 @@ func encodeBlobs(data []byte) []kzg4844.Blob { } // kZGToVersionedHash implements kzg_to_versioned_hash from EIP-4844 -func kZGToVersionedHash(kzg kzg4844.Commitment) common.Hash { +func kZGToVersionedHash(kzg *kzg4844.Commitment) common.Hash { h := sha256.Sum256(kzg[:]) h[0] = 0x01 diff --git a/cmd/prague/helper.go b/cmd/prague/helper.go index f51bb01..9a307d7 100644 --- a/cmd/prague/helper.go +++ b/cmd/prague/helper.go @@ -45,13 +45,14 @@ func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { } var rlpData []byte var _tx *types.Transaction + gasLimit := uint64(30_000_000) if blobs { blob, err := randomBlobData() if err != nil { panic(err) } //nonce = nonce - 2 - tx := txfuzz.New4844Tx(nonce, &addr, 500000, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) + tx := txfuzz.New4844Tx(nonce, &addr, gasLimit, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) rlpData, err = signedTx.MarshalBinary() if err != nil { @@ -59,7 +60,7 @@ func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { } _tx = signedTx } else { - tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: 500000, To: &addr, Data: data}) + tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: gasLimit, To: &addr, Data: data}) signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) rlpData, err = signedTx.MarshalBinary() if err != nil { diff --git a/cmd/prague/main.go b/cmd/prague/main.go index 8c772fe..f597504 100644 --- a/cmd/prague/main.go +++ b/cmd/prague/main.go @@ -2,18 +2,21 @@ package main import ( "fmt" + "time" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) var ( - address = "http://127.0.0.1:8545" + address = "https://rpc.pectra-devnet-0.ethpandaops.io/" ) func main() { testTouchContracts() test2537() + test2537Long() + test3074() } func testTouchContracts() { @@ -31,30 +34,92 @@ func testTouchContracts() { exec(addr, []byte{}, false) // no data exec(addr, []byte{1}, false) // 1 byte of data exec(addr, crypto.Keccak256([]byte{1})[:], false) // 32 bytes of data - exec(addr, make([]byte, 2048), false) // 2048 bytes of data + exec(addr, make([]byte, 20), false) + exec(addr, make([]byte, 2048), false) // 2048 bytes of data + } +} + +func test3074() { + // auth + execute([]byte{0x5f, 0x5f, 0x5f, 0xf6, 0x80, 0x55}, 200000) + execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x80, 0x55}, 200000) + // authcall + execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x80, 0x55}, 200000) + execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) + execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) + time.Sleep(time.Minute) + fmt.Println("Execution tests") + vectors := [][]byte{ + common.FromHex("000f6617e03f2800b69a0b018d3062535ec761c6648a4c73be71f97885e28505f67f0d4ee582093960a99757587fe74e6ec173477c4ca05310e25158152ff99d4f0000000000000000000000000000000000000000000000000000000000000001"), + common.FromHex("0x6001615dc06000f615600155"), + common.FromHex("0x366000600037366000738a0a19589531694250d570040a0c4b74576919b8f6156001555a738a0a19589531694250d570040a0c4b74576919b83b505a03600003600255"), + common.FromHex("0x0068bd8d0735aebb7ee746c81daaa23146eedc17e5882268d2be5b29f422bad1e67aa576acbef01fb78a701db206aa9d7de224f4cc5f5a3b4d0b9a9bb60f9aa5b60000000000000000000000000000000000000000000000000000000000000000"), + common.FromHex("0x01f2f89f718c81bfdac9f08fc1cd6b91de657519f87ba41bcd6393a95833a55ef2616a0a70c31ec6801a9ab304dda6d14a67d0897f588b15bf73d99371b9db44fa0000000000000000000000000000000000000000000000000000000000000001aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), + } + for _, vec := range vectors { + execute(vec, 300000) } } func test2537() { - testBLSAdd() + vectors := [][]byte{ + {}, + {0x5f}, // small input + make([]byte, 4096), // big input + common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d280000000000000000000000000000000009ece308f9d1f0131765212deca99697b112d61f9be9a5f1f3780a51335b3ff981747a0b2ca2179b96d2c0c9024e522400000000000000000000000000000000032b80d3a6f5b09f8a84623389c5f80ca69a0cddabc3097f9d9c27310fd43be6e745256c634af45ca3473b0590ae30d1"), + common.FromHex("0000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb0000000000000000000000000000000008b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e10000000000000000000000000000000000000000000000000000000000000000"), + common.FromHex("0000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb0000000000000000000000000000000008b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e10000000000000000000000000000000000000000000000000000000000000011"), + common.FromHex("00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be"), + common.FromHex("00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be0000000000000000000000000000000000000000000000000000000000000000"), + common.FromHex("00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be0000000000000000000000000000000000000000000000000000000000000011"), + common.FromHex("0000000000000000000000000000000014406e5bfb9209256a3820879a29ac2f62d6aca82324bf3ae2aa7d3c54792043bd8c791fccdb080c1a52dc68b8b69350"), + common.FromHex("0000000000000000000000000000000014406e5bfb9209256a3820879a29ac2f62d6aca82324bf3ae2aa7d3c54792043bd8c791fccdb080c1a52dc68b8b69350000000000000000000000000000000000e885bb33996e12f07da69073e2c0cc880bc8eff26d2a724299eb12d54f4bcf26f4748bb020e80a7e3794a7b0e47a641"), + common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d2800000000000000000000000000000000122915c824a0857e2ee414a3dccb23ae691ae54329781315a0c75df1c04d6d7a50a030fc866f09d516020ef82324afae0000000000000000000000000000000009380275bbc8e5dcea7dc4dd7e0550ff2ac480905396eda55062650f8d251c96eb480673937cc6d9d6a44aaa56ca66dc000000000000000000000000000000000b21da7955969e61010c7a1abc1a6f0136961d1e3b20b1a7326ac738fef5c721479dfd948b52fdf2455e44813ecfd8920000000000000000000000000000000008f239ba329b3967fe48d718a36cfe5f62a7e42e0bf1c1ed714150a166bfbd6bcf6b3b58b975b9edea56d53f23a0e8490000000000000000000000000000000006e82f6da4520f85c5d27d8f329eccfa05944fd1096b20734c894966d12a9e2a9a9744529d7212d33883113a0cadb9090000000000000000000000000000000017d81038f7d60bee9110d9c0d6d1102fe2d998c957f28e31ec284cc04134df8e47e8f82ff3af2e60a6d9688a4563477c00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000d1b3cc2c7027888be51d9ef691d77bcb679afda66c73f17f9ee3837a55024f78c71363275a75d75d86bab79f74782aa0000000000000000000000000000000013fa4d4a0ad8b1ce186ed5061789213d993923066dddaf1040bc3ff59f825c78df74f2d75467e25e0f55f8a00fa030ed"), + common.FromHex("0000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb00000000000000000000000000000000186b28d92356c4dfec4b5201ad099dbdede3781f8998ddf929b4cd7756192185ca7b8f4ef7088f813270ac3d48868a2100000000000000000000000000000000112b98340eee2777cc3c14163dea3ec97977ac3dc5c70da32e6e87578f44912e902ccef9efe28d4a78b8999dfbca942600000000000000000000000000000000186b28d92356c4dfec4b5201ad099dbdede3781f8998ddf929b4cd7756192185ca7b8f4ef7088f813270ac3d48868a21"), + common.FromHex("10000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be00000000000000000000000000000000103121a2ceaae586d240843a398967325f8eb5a93e8fea99b62b9f88d8556c80dd726a4b30e84a36eeabaf3592937f2700000000000000000000000000000000086b990f3da2aeac0a36143b7d7c824428215140db1bb859338764cb58458f081d92664f9053b50b3fbd2e4723121b68000000000000000000000000000000000f9e7ba9a86a8f7624aa2b42dcc8772e1af4ae115685e60abc2c9b90242167acef3d0be4050bf935eed7c3b6fc7ba77e000000000000000000000000000000000d22c3652d0dc6f0fc9316e14268477c2049ef772e852108d269d9c38dba1d4802e8dae479818184c08f9a569d878451"), + common.FromHex("000000000000000000000000000000000123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef00000000000000000000000000000000193fb7cedb32b2c3adc06ec11a96bc0d661869316f5e4a577a9f7c179593987beb4fb2ee424dbb2f5dd891e228b46c4a0000000000000000000000000000000000000000000000000000000000000002"), + common.FromHex("00000000000000000000000000000000197bfd0342bbc8bee2beced2f173e1a87be576379b343e93232d6cef98d84b1d696e5612ff283ce2cfdccb2cfb65fa0c00000000000000000000000000000000184e811f55e6f9d84d77d2f79102fd7ea7422f4759df5bf7f6331d550245e3f1bcf6a30e3b29110d85e0ca16f9f6ae7a000000000000000000000000000000000f10e1eb3c1e53d2ad9cf2d398b2dc22c5842fab0a74b174f691a7e914975da3564d835cd7d2982815b8ac57f507348f000000000000000000000000000000000767d1c453890f1b9110fda82f5815c27281aba3f026ee868e4176a0654feea41a96575e0c4d58a14dbfbcc05b5010b10000000000000000000000000000000000000000000000000000000000000002"), + common.FromHex("000000000000000000000000000000000123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef00000000000000000000000000000000193fb7cedb32b2c3adc06ec11a96bc0d661869316f5e4a577a9f7c179593987beb4fb2ee424dbb2f5dd891e228b46c4a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000112b98340eee2777cc3c14163dea3ec97977ac3dc5c70da32e6e87578f44912e902ccef9efe28d4a78b8999dfbca942600000000000000000000000000000000186b28d92356c4dfec4b5201ad099dbdede3781f8998ddf929b4cd7756192185ca7b8f4ef7088f813270ac3d48868a210000000000000000000000000000000000000000000000000000000000000002"), + common.FromHex("00000000000000000000000000000000197bfd0342bbc8bee2beced2f173e1a87be576379b343e93232d6cef98d84b1d696e5612ff283ce2cfdccb2cfb65fa0c00000000000000000000000000000000184e811f55e6f9d84d77d2f79102fd7ea7422f4759df5bf7f6331d550245e3f1bcf6a30e3b29110d85e0ca16f9f6ae7a000000000000000000000000000000000f10e1eb3c1e53d2ad9cf2d398b2dc22c5842fab0a74b174f691a7e914975da3564d835cd7d2982815b8ac57f507348f000000000000000000000000000000000767d1c453890f1b9110fda82f5815c27281aba3f026ee868e4176a0654feea41a96575e0c4d58a14dbfbcc05b5010b1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000103121a2ceaae586d240843a398967325f8eb5a93e8fea99b62b9f88d8556c80dd726a4b30e84a36eeabaf3592937f2700000000000000000000000000000000086b990f3da2aeac0a36143b7d7c824428215140db1bb859338764cb58458f081d92664f9053b50b3fbd2e4723121b68000000000000000000000000000000000f9e7ba9a86a8f7624aa2b42dcc8772e1af4ae115685e60abc2c9b90242167acef3d0be4050bf935eed7c3b6fc7ba77e000000000000000000000000000000000d22c3652d0dc6f0fc9316e14268477c2049ef772e852108d269d9c38dba1d4802e8dae479818184c08f9a569d8784510000000000000000000000000000000000000000000000000000000000000002"), + common.FromHex("000000000000000000000000000000000123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef00000000000000000000000000000000193fb7cedb32b2c3adc06ec11a96bc0d661869316f5e4a577a9f7c179593987beb4fb2ee424dbb2f5dd891e228b46c4a00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be0000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb0000000000000000000000000000000008b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e100000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000d1b3cc2c7027888be51d9ef691d77bcb679afda66c73f17f9ee3837a55024f78c71363275a75d75d86bab79f74782aa0000000000000000000000000000000013fa4d4a0ad8b1ce186ed5061789213d993923066dddaf1040bc3ff59f825c78df74f2d75467e25e0f55f8a00fa030ed"), + common.FromHex("0000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb0000000000000000000000000000000008b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e100000000000000000000000000000000197bfd0342bbc8bee2beced2f173e1a87be576379b343e93232d6cef98d84b1d696e5612ff283ce2cfdccb2cfb65fa0c00000000000000000000000000000000184e811f55e6f9d84d77d2f79102fd7ea7422f4759df5bf7f6331d550245e3f1bcf6a30e3b29110d85e0ca16f9f6ae7a000000000000000000000000000000000f10e1eb3c1e53d2ad9cf2d398b2dc22c5842fab0a74b174f691a7e914975da3564d835cd7d2982815b8ac57f507348f000000000000000000000000000000000767d1c453890f1b9110fda82f5815c27281aba3f026ee868e4176a0654feea41a96575e0c4d58a14dbfbcc05b5010b10000000000000000000000000000000017f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb0000000000000000000000000000000008b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e100000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000d1b3cc2c7027888be51d9ef691d77bcb679afda66c73f17f9ee3837a55024f78c71363275a75d75d86bab79f74782aa0000000000000000000000000000000013fa4d4a0ad8b1ce186ed5061789213d993923066dddaf1040bc3ff59f825c78df74f2d75467e25e0f55f8a00fa030ed"), + } + for i := 0xa; i < 0x14; i++ { + for _, vec := range vectors { + testBLS(i, vec) + } + } + } -func testBLSAdd() { - addr, err := deployPrecompileCaller("0b") +func test2537Long() { + multiexpG1 := common.FromHex("00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801000000000000000000000000000000000606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be") + testLongBLS(0x0d, multiexpG1) + multiexpG2 := common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d2800000000000000000000000000000000122915c824a0857e2ee414a3dccb23ae691ae54329781315a0c75df1c04d6d7a50a030fc866f09d516020ef82324afae0000000000000000000000000000000009380275bbc8e5dcea7dc4dd7e0550ff2ac480905396eda55062650f8d251c96eb480673937cc6d9d6a44aaa56ca66dc000000000000000000000000000000000b21da7955969e61010c7a1abc1a6f0136961d1e3b20b1a7326ac738fef5c721479dfd948b52fdf2455e44813ecfd8920000000000000000000000000000000008f239ba329b3967fe48d718a36cfe5f62a7e42e0bf1c1ed714150a166bfbd6bcf6b3b58b975b9edea56d53f23a0e8490000000000000000000000000000000006e82f6da4520f85c5d27d8f329eccfa05944fd1096b20734c894966d12a9e2a9a9744529d7212d33883113a0cadb9090000000000000000000000000000000017d81038f7d60bee9110d9c0d6d1102fe2d998c957f28e31ec284cc04134df8e47e8f82ff3af2e60a6d9688a4563477c00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000d1b3cc2c7027888be51d9ef691d77bcb679afda66c73f17f9ee3837a55024f78c71363275a75d75d86bab79f74782aa0000000000000000000000000000000013fa4d4a0ad8b1ce186ed5061789213d993923066dddaf1040bc3ff59f825c78df74f2d75467e25e0f55f8a00fa030ed") + testLongBLS(0x10, multiexpG2) + pairing := common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d2800000000000000000000000000000000122915c824a0857e2ee414a3dccb23ae691ae54329781315a0c75df1c04d6d7a50a030fc866f09d516020ef82324afae0000000000000000000000000000000009380275bbc8e5dcea7dc4dd7e0550ff2ac480905396eda55062650f8d251c96eb480673937cc6d9d6a44aaa56ca66dc000000000000000000000000000000000b21da7955969e61010c7a1abc1a6f0136961d1e3b20b1a7326ac738fef5c721479dfd948b52fdf2455e44813ecfd8920000000000000000000000000000000008f239ba329b3967fe48d718a36cfe5f62a7e42e0bf1c1ed714150a166bfbd6bcf6b3b58b975b9edea56d53f23a0e8490000000000000000000000000000000006e82f6da4520f85c5d27d8f329eccfa05944fd1096b20734c894966d12a9e2a9a9744529d7212d33883113a0cadb9090000000000000000000000000000000017d81038f7d60bee9110d9c0d6d1102fe2d998c957f28e31ec284cc04134df8e47e8f82ff3af2e60a6d9688a4563477c00000000000000000000000000000000024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb80000000000000000000000000000000013e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e000000000000000000000000000000000d1b3cc2c7027888be51d9ef691d77bcb679afda66c73f17f9ee3837a55024f78c71363275a75d75d86bab79f74782aa0000000000000000000000000000000013fa4d4a0ad8b1ce186ed5061789213d993923066dddaf1040bc3ff59f825c78df74f2d75467e25e0f55f8a00fa030ed") + testLongBLS(0x11, pairing) +} + +func testLongBLS(prec int, input []byte) { + fmt.Printf("Testing 0x%02x\n", prec) + addr, err := deployPrecompileCaller(fmt.Sprintf("%02x", prec)) if err != nil { panic(err) } - // Small input - exec(addr, []byte{0x5f}, true) - // Big input - var input []byte - for i := 0; i < 1000; i++ { - input = append(input, 0xff) + base := input + for i := 0; i < 20; i++ { + exec(addr, base, false) + base = append(base, base...) + } +} + +func testBLS(prec int, input []byte) { + addr, err := deployPrecompileCaller(fmt.Sprintf("%02x", prec)) + if err != nil { + panic(err) } - exec(addr, input, true) - // Correct input - input = common.FromHex("000000000000000000000000000000000572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e00000000000000000000000000000000166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d280000000000000000000000000000000009ece308f9d1f0131765212deca99697b112d61f9be9a5f1f3780a51335b3ff981747a0b2ca2179b96d2c0c9024e522400000000000000000000000000000000032b80d3a6f5b09f8a84623389c5f80ca69a0cddabc3097f9d9c27310fd43be6e745256c634af45ca3473b0590ae30d1") - exec(addr, input, true) + exec(addr, input, false) } /* diff --git a/transactions.go b/transactions.go index c54aac8..dea01d1 100644 --- a/transactions.go +++ b/transactions.go @@ -353,13 +353,13 @@ func EncodeBlobs(data []byte) ([]kzg4844.Blob, []kzg4844.Commitment, []kzg4844.P versionedHashes []common.Hash ) for _, blob := range blobs { - commit, err := kzg4844.BlobToCommitment(blob) + commit, err := kzg4844.BlobToCommitment(&blob) if err != nil { return nil, nil, nil, nil, err } commits = append(commits, commit) - proof, err := kzg4844.ComputeBlobProof(blob, commit) + proof, err := kzg4844.ComputeBlobProof(&blob, commit) if err != nil { return nil, nil, nil, nil, err } From 86d4d6ec4d9834f77c1d7205690ad43f24a6a0d3 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Tue, 21 May 2024 08:00:46 +0200 Subject: [PATCH 6/6] helper: moved helper functions to package, cleanup --- cmd/cancun/helper.go | 153 ------------------------------- cmd/cancun/main.go | 73 +++++++-------- cmd/eip4399/main.go | 24 +---- cmd/prague/main.go | 35 ++++--- cmd/shanghai/main.go | 73 ++++----------- {cmd/prague => helper}/helper.go | 26 +++--- main.go | 1 + 7 files changed, 83 insertions(+), 302 deletions(-) delete mode 100644 cmd/cancun/helper.go rename {cmd/prague => helper}/helper.go (89%) diff --git a/cmd/cancun/helper.go b/cmd/cancun/helper.go deleted file mode 100644 index f51bb01..0000000 --- a/cmd/cancun/helper.go +++ /dev/null @@ -1,153 +0,0 @@ -package main - -import ( - "context" - "crypto/ecdsa" - "crypto/rand" - "fmt" - "math/big" - - txfuzz "github.com/MariusVanDerWijden/tx-fuzz" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/rpc" -) - -const ( - maxDataPerBlob = 1 << 17 // 128Kb -) - -func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - panic(err) - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - panic(err) - } - fmt.Printf("Nonce: %v\n", nonce) - gp, err := backend.SuggestGasPrice(context.Background()) - if err != nil { - panic(err) - } - tip, err := backend.SuggestGasTipCap(context.Background()) - if err != nil { - tip = big.NewInt(100000000) - //panic(err) - } - var rlpData []byte - var _tx *types.Transaction - if blobs { - blob, err := randomBlobData() - if err != nil { - panic(err) - } - //nonce = nonce - 2 - tx := txfuzz.New4844Tx(nonce, &addr, 500000, chainid, tip.Mul(tip, common.Big1), gp.Mul(gp, common.Big1), common.Big0, data, big.NewInt(1_000_000), blob, make(types.AccessList, 0)) - signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) - rlpData, err = signedTx.MarshalBinary() - if err != nil { - panic(err) - } - _tx = signedTx - } else { - tx := types.NewTx(&types.DynamicFeeTx{ChainID: chainid, Nonce: nonce, GasTipCap: tip, GasFeeCap: gp, Gas: 500000, To: &addr, Data: data}) - signedTx, _ := types.SignTx(tx, types.NewCancunSigner(chainid), sk) - rlpData, err = signedTx.MarshalBinary() - if err != nil { - panic(err) - } - _tx = signedTx - } - - if err := cl.CallContext(context.Background(), nil, "eth_sendRawTransaction", hexutil.Encode(rlpData)); err != nil { - panic(err) - } - return _tx -} - -func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { - // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) - - sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) - if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { - panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) - } - cl, err := rpc.Dial(address) - if err != nil { - panic(err) - } - return cl, sk -} - -func wait(tx *types.Transaction) { - client, _ := getRealBackend() - backend := ethclient.NewClient(client) - bind.WaitMined(context.Background(), backend, tx) -} - -func deploy(bytecode string) (common.Address, error) { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - return common.Address{}, err - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - return common.Address{}, err - } - fmt.Printf("Nonce: %v\n", nonce) - gp, _ := backend.SuggestGasPrice(context.Background()) - tx := types.NewContractCreation(nonce, common.Big0, 500000, gp.Mul(gp, common.Big2), common.Hex2Bytes(bytecode)) - signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) - if err := backend.SendTransaction(context.Background(), signedTx); err != nil { - return common.Address{}, err - } - return bind.WaitDeployed(context.Background(), backend, signedTx) -} - -func execute(data []byte, gaslimit uint64) { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - panic(err) - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - panic(err) - } - fmt.Printf("Nonce: %v\n", nonce) - gp, _ := backend.SuggestGasPrice(context.Background()) - tx := types.NewContractCreation(nonce, common.Big1, gaslimit, gp.Mul(gp, common.Big2), data) - signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) - backend.SendTransaction(context.Background(), signedTx) -} - -func randomBlobData() ([]byte, error) { - val, err := rand.Int(rand.Reader, big.NewInt(maxDataPerBlob)) - if err != nil { - return nil, err - } - size := int(val.Int64() * 3) - data := make([]byte, size) - n, err := rand.Read(data) - if err != nil { - return nil, err - } - if n != size { - return nil, fmt.Errorf("could not create random blob data with size %d: %v", size, err) - } - return data, nil -} diff --git a/cmd/cancun/main.go b/cmd/cancun/main.go index 2d67664..b445308 100644 --- a/cmd/cancun/main.go +++ b/cmd/cancun/main.go @@ -7,15 +7,12 @@ import ( "fmt" "time" + "github.com/MariusVanDerWijden/tx-fuzz/helper" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/ethereum/go-ethereum/params" ) -var ( - address = "https://rpc.pectra-devnet-0.ethpandaops.io/" -) - func main() { fmt.Println("4788") test4788() @@ -33,15 +30,15 @@ func main() { func test7516() { // JUMPDEST, BLOBBASEFEE, POP, PUSH0, JUMP - execute([]byte{0x5b, 0x4a, 0x50, 0x5f, 0x56}, 30_000_000) + helper.Execute([]byte{0x5b, 0x4a, 0x50, 0x5f, 0x56}, 30_000_000) // BLOBBASEFEE, BLOBBASEFEE, SSTORE - execute([]byte{0x4a, 0x4a, 0x50, 0x55}, 500_000) + helper.Execute([]byte{0x4a, 0x4a, 0x50, 0x55}, 500_000) } func test5656() { // PUSH1, 0x20, PUSH0, PUSH0, MCOPY - execute([]byte{0x60, 0x20, 0x5f, 0x5f, 0x5e}, 30_000_000) + helper.Execute([]byte{0x60, 0x20, 0x5f, 0x5f, 0x5e}, 30_000_000) pushMaxVal := func() []byte { return []byte{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} @@ -52,24 +49,24 @@ func test5656() { } // PUSH32, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, PUSH0, PUSH0, MCOPY - execute(append(pushMaxVal(), 0x5f, 0x5f, 0x5e), 30_000_000) + helper.Execute(append(pushMaxVal(), 0x5f, 0x5f, 0x5e), 30_000_000) // PUSH0, PUSH32, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, PUSH0, MCOPY code := []byte{0x5f} code = append(code, pushMaxVal()...) code = append(code, []byte{0x5f, 0x5e}...) code = append(code, sstore()...) - execute(code, 30_000_000) + helper.Execute(code, 30_000_000) // PUSH0, PUSH0, PUSH32, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, MCOPY code = []byte{0x5f, 0x5f} code = append(code, pushMaxVal()...) code = append(code, []byte{0x5e}...) code = append(code, sstore()...) - execute(code, 30_000_000) + helper.Execute(code, 30_000_000) // PUSH0, PUSH1, 0xff, MSTORE, JUMPDEST, PUSH1, 0x20, PUSH0, PUSH0, MCOPY, PUSH1, 0x04 JUMP - execute([]byte{0x5f, 0x60, 0xff, 0x52, 0x5b, 0x60, 0x20, 0x5f, 0x5f, 0x5e, 0x60, 0x04, 0x56}, 30_000_000) + helper.Execute([]byte{0x5f, 0x60, 0xff, 0x52, 0x5b, 0x60, 0x20, 0x5f, 0x5f, 0x5e, 0x60, 0x04, 0x56}, 30_000_000) test5656_memBuster() } @@ -109,7 +106,7 @@ func test5656_memBuster() { code = append(code, 0x56) // PUSH0, PUSH1, 0xff, MSTORE, JUMPDEST, PUSH1, 0x20, PUSH0, PUSH0, MCOPY, PUSH1, 0x04 JUMP - execute(code, 30_000_000) + helper.Execute(code, 30_000_000) } func pushSize(size int) []byte { @@ -122,26 +119,26 @@ func pushSize(size int) []byte { func test1153() { // JUMPDEST, GAS, GAS, TSTORE, PUSH0, JUMP - execute([]byte{0x5b, 0x5a, 0x5a, 0x5d, 0x5f, 0x56}, 30_000_000) + helper.Execute([]byte{0x5b, 0x5a, 0x5a, 0x5d, 0x5f, 0x56}, 30_000_000) // JUMPDEST, GAS, DUP1, DUP1, TSTORE, TLOAD, POP, PUSH0, JUMP - execute([]byte{0x5b, 0x5a, 0x80, 0x80, 0x5d, 0x5c, 0x50, 0x5f, 0x56}, 30_000_000) + helper.Execute([]byte{0x5b, 0x5a, 0x80, 0x80, 0x5d, 0x5c, 0x50, 0x5f, 0x56}, 30_000_000) // PUSH0, TLOAD, GAS, TLOAD, SSTORE - execute([]byte{0x5f, 0x5c, 0x5a, 0x55}, 500_000) + helper.Execute([]byte{0x5f, 0x5c, 0x5a, 0x55}, 500_000) // PUSH32, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff TLOAD DUP1, SSTORE - execute([]byte{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5c, 0x80, 0x55}, 500_000) + helper.Execute([]byte{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5c, 0x80, 0x55}, 500_000) } func test4788() { // Call addr contractAddr4788 := common.HexToAddress("0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02") - exec(contractAddr4788, Uint64ToHash(0).Bytes(), false) + helper.Exec(contractAddr4788, Uint64ToHash(0).Bytes(), false) t := time.Now().Unix() for i := 0; i < 15; i++ { - exec(contractAddr4788, Uint64ToHash(uint64(t)-uint64(i)).Bytes(), false) + helper.Exec(contractAddr4788, Uint64ToHash(uint64(t)-uint64(i)).Bytes(), false) } // deploy4788Proxy @@ -153,20 +150,20 @@ func test4788() { // Call to 4788 contract t = time.Now().Unix() for i := 0; i < 15; i++ { - exec(addr, Uint64ToHash(uint64(t)-uint64(i)).Bytes(), false) + helper.Exec(addr, Uint64ToHash(uint64(t)-uint64(i)).Bytes(), false) } // short or long calls for i := 0; i < 64; i++ { arr := make([]byte, i) - exec(addr, arr, false) + helper.Exec(addr, arr, false) } // random calls for i := 0; i < 10; i++ { arr := make([]byte, 32) rand.Read(arr) - exec(addr, arr, false) + helper.Exec(addr, arr, false) } } @@ -179,22 +176,22 @@ func test4844() { // 4844 Tests // PUSH0, DATAHASH, PUSH0, DATAHASH, SSTORE - exec(addr, []byte{0x5f, 0x49, 0x5f, 0x49, 0x55}, true) + helper.Exec(addr, []byte{0x5f, 0x49, 0x5f, 0x49, 0x55}, true) var dataHashByteCode []byte for i := 0; i < 10; i++ { // PUSH1 i, DATAHASH, PUSH0, SSTORE dataHashByteCode = append(dataHashByteCode, []byte{0x60, byte(i), 0x49, 0x5f, 0x55}...) } - exec(addr, dataHashByteCode, true) + helper.Exec(addr, dataHashByteCode, true) // PUSH1 0x01, NOT, DATAHASH, PUSH0, NOT, DATAHASH, SSTORE - exec(addr, []byte{0x60, 0x01, 0x19, 0x49, 0x5f, 0x19, 0x49, 0x55}, true) + helper.Exec(addr, []byte{0x60, 0x01, 0x19, 0x49, 0x5f, 0x19, 0x49, 0x55}, true) // PUSH1 0x255, PUSH1 0x01, SHL, DATAHASH, PUSH0, SSTORE - tx := exec(addr, []byte{0x60, 0xff, 0x1b, 0x49, 0x5f, 0x55}, true) + tx := helper.Exec(addr, []byte{0x60, 0xff, 0x1b, 0x49, 0x5f, 0x55}, true) - wait(tx) + helper.Wait(tx) } func test4844_precompile() { @@ -205,30 +202,30 @@ func test4844_precompile() { // Test precompile without blobs staticTestInput := common.FromHex("01d18459b334ffe8e2226eef1db874fda6db2bdd9357268b39220af2d59464fb564c0a11a0f704f4fc3e8acfe0f8245f0ad1347b378fbf96e206da11a5d3630624d25032e67a7e6a4910df5834b8fe70e6bcfeeac0352434196bdf4b2485d5a1978a0d595c823c05947b1156175e72634a377808384256e9921ebf72181890be2d6b58d4a73a880541d1656875654806942307f266e636553e94006d11423f2688945ff3bdf515859eba1005c1a7708d620a94d91a1c0c285f9584e75ec2f82a") - exec(addr, staticTestInput, false) + helper.Exec(addr, staticTestInput, false) invalidInput := make([]byte, len(staticTestInput)) - exec(addr, invalidInput, false) + helper.Exec(addr, invalidInput, false) co, cl, pr, po, err := createPrecompileRandParams() if err != nil { panic(err) } validRandomInput := precompileParamsToBytes(co, cl, pr, po) - tx := exec(addr, validRandomInput, false) + tx := helper.Exec(addr, validRandomInput, false) - wait(tx) + helper.Wait(tx) // Test precompile with blobs - exec(addr, staticTestInput, true) - exec(addr, invalidInput, true) - tx = exec(addr, validRandomInput, true) + helper.Exec(addr, staticTestInput, true) + helper.Exec(addr, invalidInput, true) + tx = helper.Exec(addr, validRandomInput, true) - wait(tx) + helper.Wait(tx) // Full block of verification for i := 0; i < 30_000_000/100_000; i++ { - exec(addr, validRandomInput, false) + helper.Exec(addr, validRandomInput, false) } } @@ -304,7 +301,7 @@ contract BlobProxy { func deployBlobProxy() (common.Address, error) { bytecode := "6080604052348015600f57600080fd5b5060ae80601d6000396000f3fe6080604052348015600f57600080fd5b506000366060600083838080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060008151602083016000f090505050915050805190602001f3fea2646970667358221220c23b98a79e6709c832ef1c90f5a3a7583ba88f759611d74a4d775dd22a02296364736f6c63430008120033" - return deploy(bytecode) + return helper.Deploy(bytecode) } /* @@ -326,7 +323,7 @@ pragma solidity >=0.7.0 <0.9.0; */ func deployBlobCaller() (common.Address, error) { bytecode := "608060405234801561001057600080fd5b5061047b806100206000396000f3fe608060405234801561001057600080fd5b5060003660606000600a90506000808273ffffffffffffffffffffffffffffffffffffffff1661c350878760405161004992919061010a565b60006040518083038160008787f1925050503d8060008114610087576040519150601f19603f3d011682016040523d82523d6000602084013e61008c565b606091505b5091509150809350816000806101000a81548160ff02191690831515021790555080600190816100bc9190610373565b50505050915050805190602001f35b600081905092915050565b82818337600083830152505050565b60006100f183856100cb565b93506100fe8385846100d6565b82840190509392505050565b60006101178284866100e5565b91508190509392505050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806101a457607f821691505b6020821081036101b7576101b661015d565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261021f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826101e2565b61022986836101e2565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b600061027061026b61026684610241565b61024b565b610241565b9050919050565b6000819050919050565b61028a83610255565b61029e61029682610277565b8484546101ef565b825550505050565b600090565b6102b36102a6565b6102be818484610281565b505050565b5b818110156102e2576102d76000826102ab565b6001810190506102c4565b5050565b601f821115610327576102f8816101bd565b610301846101d2565b81016020851015610310578190505b61032461031c856101d2565b8301826102c3565b50505b505050565b600082821c905092915050565b600061034a6000198460080261032c565b1980831691505092915050565b60006103638383610339565b9150826002028217905092915050565b61037c82610123565b67ffffffffffffffff8111156103955761039461012e565b5b61039f825461018c565b6103aa8282856102e6565b600060209050601f8311600181146103dd57600084156103cb578287015190505b6103d58582610357565b86555061043d565b601f1984166103eb866101bd565b60005b82811015610413578489015182556001820191506020850194506020810190506103ee565b86831015610430578489015161042c601f891682610339565b8355505b6001600288020188555050505b50505050505056fea264697066735822122089d7332a134ee7e7d76876ef5f4e74d939f9d9d9f3344e6afb518c96fff0b63164736f6c63430008120033" - return deploy(bytecode) + return helper.Deploy(bytecode) } /* @@ -348,7 +345,7 @@ contract Call4788 { func deploy4788Proxy() (common.Address, error) { bytecode := "608060405234801561001057600080fd5b5061048a806100206000396000f3fe608060405234801561001057600080fd5b5060003660606000720f3df6d732807ef1319fb7b8bb8522d0beac0290506000808273ffffffffffffffffffffffffffffffffffffffff168686604051610058929190610119565b6000604051808303816000865af19150503d8060008114610095576040519150601f19603f3d011682016040523d82523d6000602084013e61009a565b606091505b509150915080600090816100ae9190610382565b5081600160006101000a81548160ff021916908315150217905550809350505050915050805190602001f35b600081905092915050565b82818337600083830152505050565b600061010083856100da565b935061010d8385846100e5565b82840190509392505050565b60006101268284866100f4565b91508190509392505050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806101b357607f821691505b6020821081036101c6576101c561016c565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261022e7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826101f1565b61023886836101f1565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b600061027f61027a61027584610250565b61025a565b610250565b9050919050565b6000819050919050565b61029983610264565b6102ad6102a582610286565b8484546101fe565b825550505050565b600090565b6102c26102b5565b6102cd818484610290565b505050565b5b818110156102f1576102e66000826102ba565b6001810190506102d3565b5050565b601f82111561033657610307816101cc565b610310846101e1565b8101602085101561031f578190505b61033361032b856101e1565b8301826102d2565b50505b505050565b600082821c905092915050565b60006103596000198460080261033b565b1980831691505092915050565b60006103728383610348565b9150826002028217905092915050565b61038b82610132565b67ffffffffffffffff8111156103a4576103a361013d565b5b6103ae825461019b565b6103b98282856102f5565b600060209050601f8311600181146103ec57600084156103da578287015190505b6103e48582610366565b86555061044c565b601f1984166103fa866101cc565b60005b82811015610422578489015182556001820191506020850194506020810190506103fd565b8683101561043f578489015161043b601f891682610348565b8355505b6001600288020188555050505b50505050505056fea2646970667358221220d3505d93c72ff246e512c416145e275fe92925a05a9953337b1add26b509ec7764736f6c63430008120033" - return deploy(bytecode) + return helper.Deploy(bytecode) } func Uint64ToHash(u uint64) common.Hash { diff --git a/cmd/eip4399/main.go b/cmd/eip4399/main.go index cea1602..6106839 100644 --- a/cmd/eip4399/main.go +++ b/cmd/eip4399/main.go @@ -2,23 +2,17 @@ package main import ( "context" - "crypto/ecdsa" "fmt" txfuzz "github.com/MariusVanDerWijden/tx-fuzz" + "github.com/MariusVanDerWijden/tx-fuzz/helper" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/rpc" -) - -var ( - address = "http://127.0.0.1:8545" ) func main() { - cl, sk := getRealBackend() + cl, sk := helper.GetRealBackend() backend := ethclient.NewClient(cl) sender := common.HexToAddress(txfuzz.ADDR) nonce, err := backend.PendingNonceAt(context.Background(), sender) @@ -35,17 +29,3 @@ func main() { signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) backend.SendTransaction(context.Background(), signedTx) } - -func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { - // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) - - sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) - if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { - panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) - } - cl, err := rpc.Dial(address) - if err != nil { - panic(err) - } - return cl, sk -} diff --git a/cmd/prague/main.go b/cmd/prague/main.go index f597504..0b6b5fd 100644 --- a/cmd/prague/main.go +++ b/cmd/prague/main.go @@ -4,14 +4,12 @@ import ( "fmt" "time" + "github.com/MariusVanDerWijden/tx-fuzz/helper" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) -var ( - address = "https://rpc.pectra-devnet-0.ethpandaops.io/" -) - func main() { testTouchContracts() test2537() @@ -31,22 +29,22 @@ func testTouchContracts() { } for _, addr := range addresses { - exec(addr, []byte{}, false) // no data - exec(addr, []byte{1}, false) // 1 byte of data - exec(addr, crypto.Keccak256([]byte{1})[:], false) // 32 bytes of data - exec(addr, make([]byte, 20), false) - exec(addr, make([]byte, 2048), false) // 2048 bytes of data + helper.Exec(addr, []byte{}, false) // no data + helper.Exec(addr, []byte{1}, false) // 1 byte of data + helper.Exec(addr, crypto.Keccak256([]byte{1})[:], false) // 32 bytes of data + helper.Exec(addr, make([]byte, 20), false) + helper.Exec(addr, make([]byte, 2048), false) // 2048 bytes of data } } func test3074() { // auth - execute([]byte{0x5f, 0x5f, 0x5f, 0xf6, 0x80, 0x55}, 200000) - execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x80, 0x55}, 200000) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0xf6, 0x80, 0x55}, 200000) + helper.Execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0x64, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x80, 0x55}, 200000) // authcall - execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x80, 0x55}, 200000) - execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) - execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x80, 0x55}, 200000) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) + helper.Execute([]byte{0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x64, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x5f, 0x5f, 0x5a, 0xf7, 0x80, 0x55}, 200000) time.Sleep(time.Minute) fmt.Println("Execution tests") vectors := [][]byte{ @@ -57,7 +55,7 @@ func test3074() { common.FromHex("0x01f2f89f718c81bfdac9f08fc1cd6b91de657519f87ba41bcd6393a95833a55ef2616a0a70c31ec6801a9ab304dda6d14a67d0897f588b15bf73d99371b9db44fa0000000000000000000000000000000000000000000000000000000000000001aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), } for _, vec := range vectors { - execute(vec, 300000) + helper.Execute(vec, 300000) } } @@ -89,7 +87,6 @@ func test2537() { testBLS(i, vec) } } - } func test2537Long() { @@ -109,7 +106,7 @@ func testLongBLS(prec int, input []byte) { } base := input for i := 0; i < 20; i++ { - exec(addr, base, false) + helper.Exec(addr, base, false) base = append(base, base...) } } @@ -119,7 +116,7 @@ func testBLS(prec int, input []byte) { if err != nil { panic(err) } - exec(addr, input, false) + helper.Exec(addr, input, false) } /* @@ -143,5 +140,5 @@ func deployPrecompileCaller(precompile string) (common.Address, error) { bytecode1 := "6080604052348015600e575f80fd5b506104568061001c5f395ff3fe608060405234801561000f575f80fd5b505f3660605f60" bytecode2 := "90505f808273ffffffffffffffffffffffffffffffffffffffff1661c35087876040516100459291906100fe565b5f604051808303815f8787f1925050503d805f811461007f576040519150601f19603f3d011682016040523d82523d5f602084013e610084565b606091505b5091509150809350815f806101000a81548160ff02191690831515021790555080600190816100b39190610350565b50505050915050805190602001f35b5f81905092915050565b828183375f83830152505050565b5f6100e583856100c2565b93506100f28385846100cc565b82840190509392505050565b5f61010a8284866100da565b91508190509392505050565b5f81519050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f600282049050600182168061019157607f821691505b6020821081036101a4576101a361014d565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f600883026102067fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826101cb565b61021086836101cb565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f61025461024f61024a84610228565b610231565b610228565b9050919050565b5f819050919050565b61026d8361023a565b6102816102798261025b565b8484546101d7565b825550505050565b5f90565b610295610289565b6102a0818484610264565b505050565b5b818110156102c3576102b85f8261028d565b6001810190506102a6565b5050565b601f821115610308576102d9816101aa565b6102e2846101bc565b810160208510156102f1578190505b6103056102fd856101bc565b8301826102a5565b50505b505050565b5f82821c905092915050565b5f6103285f198460080261030d565b1980831691505092915050565b5f6103408383610319565b9150826002028217905092915050565b61035982610116565b67ffffffffffffffff81111561037257610371610120565b5b61037c825461017a565b6103878282856102c7565b5f60209050601f8311600181146103b8575f84156103a6578287015190505b6103b08582610335565b865550610417565b601f1984166103c6866101aa565b5f5b828110156103ed578489015182556001820191506020850194506020810190506103c8565b8683101561040a5784890151610406601f891682610319565b8355505b6001600288020188555050505b50505050505056fea2646970667358221220bc28435cfa3208db8cae33e216a1ff54a6e5dce073695cad36274cc363055c5564736f6c63430008190033" // The byte in between bytecode1 and bytecode2 denotes the precompile which we want to call - return deploy(fmt.Sprintf("%v%v%v", bytecode1, precompile, bytecode2)) + return helper.Deploy(fmt.Sprintf("%v%v%v", bytecode1, precompile, bytecode2)) } diff --git a/cmd/shanghai/main.go b/cmd/shanghai/main.go index 5b8a17c..92b1d8d 100644 --- a/cmd/shanghai/main.go +++ b/cmd/shanghai/main.go @@ -1,50 +1,42 @@ package main import ( - "context" - "crypto/ecdsa" "encoding/binary" "fmt" - txfuzz "github.com/MariusVanDerWijden/tx-fuzz" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/rpc" + "github.com/MariusVanDerWijden/tx-fuzz/helper" ) var ( - address = "http://127.0.0.1:8545" maxCodeSize = 24576 maxInitCodeSize = 2 * maxCodeSize ) func main() { // Store coinbase - exec([]byte{0x41, 0x41, 0x55}) + helper.Execute([]byte{0x41, 0x41, 0x55}, 50000) // Call coinbase // 5x PUSH0, COINBASE, GAS, CALL - exec([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf1}) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf1}, 50000) // 5x PUSH0, COINBASE, GAS, CALLCODE - exec([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf2}) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf2}, 50000) // 5x PUSH0, COINBASE, GAS, DELEGATECALL - exec([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf4}) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xf4}, 50000) // 5x PUSH0, COINBASE, GAS, STATICCALL - exec([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xfA}) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x41, 0x5A, 0xfA}, 50000) // COINBASE, SELFDESTRUCT - exec([]byte{0x41, 0xff}) + helper.Execute([]byte{0x41, 0xff}, 50000) // COINBASE, EXTCODESIZE - exec([]byte{0x41, 0x3b}) + helper.Execute([]byte{0x41, 0x3b}, 50000) // 3x PUSH0, COINBASE, EXTCODECOPY - exec([]byte{0x5f, 0x5f, 0x5f, 0x41, 0x3C}) + helper.Execute([]byte{0x5f, 0x5f, 0x5f, 0x41, 0x3C}, 50000) // COINBASE, EXTCODEHASH - exec([]byte{0x41, 0x3F}) + helper.Execute([]byte{0x41, 0x3F}, 50000) // COINBASE, BALANCE - exec([]byte{0x41, 0x31}) + helper.Execute([]byte{0x41, 0x31}, 50000) // loop push0 // JUMPDEST, PUSH0, JUMP - exec([]byte{0x58, 0x5f, 0x56}) + helper.Execute([]byte{0x58, 0x5f, 0x56}, 50000) fmt.Println("Limit&MeterInitcode") // limit & meter initcode sizes := []int{ @@ -58,43 +50,24 @@ func main() { // size x JUMPDEST STOP for _, size := range sizes { initcode := repeatOpcode(size, 0x58) - exec(append(initcode, 0x00)) + helper.Execute(append(initcode, 0x00), 50000) } // size x STOP STOP for _, size := range sizes { - exec(repeatOpcode(size, 0x00)) + helper.Execute(repeatOpcode(size, 0x00), 50000) } // PUSH4 size, PUSH0, PUSH0, CREATE for _, size := range sizes { initcode := pushSize(size) - exec(append(initcode, []byte{0x57, 0x57, 0xF0}...)) + helper.Execute(append(initcode, []byte{0x57, 0x57, 0xF0}...), 50000) } // PUSH4 size, PUSH0, PUSH0, CREATE2 for _, size := range sizes { initcode := pushSize(size) - exec(append(initcode, []byte{0x57, 0x57, 0xF5}...)) + helper.Execute(append(initcode, []byte{0x57, 0x57, 0xF5}...), 50000) } } -func exec(data []byte) { - cl, sk := getRealBackend() - backend := ethclient.NewClient(cl) - sender := common.HexToAddress(txfuzz.ADDR) - nonce, err := backend.PendingNonceAt(context.Background(), sender) - if err != nil { - panic(err) - } - chainid, err := backend.ChainID(context.Background()) - if err != nil { - panic(err) - } - fmt.Printf("Nonce: %v\n", nonce) - gp, _ := backend.SuggestGasPrice(context.Background()) - tx := types.NewContractCreation(nonce, common.Big1, 500000, gp.Mul(gp, common.Big2), data) - signedTx, _ := types.SignTx(tx, types.NewLondonSigner(chainid), sk) - backend.SendTransaction(context.Background(), signedTx) -} - // PUSH4 size func pushSize(size int) []byte { code := []byte{63} @@ -111,17 +84,3 @@ func repeatOpcode(size int, opcode byte) []byte { } return initcode } - -func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { - // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) - - sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) - if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { - panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) - } - cl, err := rpc.Dial(address) - if err != nil { - panic(err) - } - return cl, sk -} diff --git a/cmd/prague/helper.go b/helper/helper.go similarity index 89% rename from cmd/prague/helper.go rename to helper/helper.go index 9a307d7..bd89dba 100644 --- a/cmd/prague/helper.go +++ b/helper/helper.go @@ -1,4 +1,4 @@ -package main +package helper import ( "context" @@ -21,8 +21,8 @@ const ( maxDataPerBlob = 1 << 17 // 128Kb ) -func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { - cl, sk := getRealBackend() +func Exec(addr common.Address, data []byte, blobs bool) *types.Transaction { + cl, sk := GetRealBackend() backend := ethclient.NewClient(cl) sender := common.HexToAddress(txfuzz.ADDR) nonce, err := backend.PendingNonceAt(context.Background(), sender) @@ -47,7 +47,7 @@ func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { var _tx *types.Transaction gasLimit := uint64(30_000_000) if blobs { - blob, err := randomBlobData() + blob, err := RandomBlobData() if err != nil { panic(err) } @@ -75,28 +75,28 @@ func exec(addr common.Address, data []byte, blobs bool) *types.Transaction { return _tx } -func getRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { +func GetRealBackend() (*rpc.Client, *ecdsa.PrivateKey) { // eth.sendTransaction({from:personal.listAccounts[0], to:"0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D", value: "100000000000000"}) sk := crypto.ToECDSAUnsafe(common.FromHex(txfuzz.SK)) if crypto.PubkeyToAddress(sk.PublicKey).Hex() != txfuzz.ADDR { panic(fmt.Sprintf("wrong address want %s got %s", crypto.PubkeyToAddress(sk.PublicKey).Hex(), txfuzz.ADDR)) } - cl, err := rpc.Dial(address) + cl, err := rpc.Dial(txfuzz.RPC) if err != nil { panic(err) } return cl, sk } -func wait(tx *types.Transaction) { - client, _ := getRealBackend() +func Wait(tx *types.Transaction) { + client, _ := GetRealBackend() backend := ethclient.NewClient(client) bind.WaitMined(context.Background(), backend, tx) } -func deploy(bytecode string) (common.Address, error) { - cl, sk := getRealBackend() +func Deploy(bytecode string) (common.Address, error) { + cl, sk := GetRealBackend() backend := ethclient.NewClient(cl) sender := common.HexToAddress(txfuzz.ADDR) nonce, err := backend.PendingNonceAt(context.Background(), sender) @@ -117,8 +117,8 @@ func deploy(bytecode string) (common.Address, error) { return bind.WaitDeployed(context.Background(), backend, signedTx) } -func execute(data []byte, gaslimit uint64) { - cl, sk := getRealBackend() +func Execute(data []byte, gaslimit uint64) { + cl, sk := GetRealBackend() backend := ethclient.NewClient(cl) sender := common.HexToAddress(txfuzz.ADDR) nonce, err := backend.PendingNonceAt(context.Background(), sender) @@ -136,7 +136,7 @@ func execute(data []byte, gaslimit uint64) { backend.SendTransaction(context.Background(), signedTx) } -func randomBlobData() ([]byte, error) { +func RandomBlobData() ([]byte, error) { val, err := rand.Int(rand.Reader, big.NewInt(maxDataPerBlob)) if err != nil { return nil, err diff --git a/main.go b/main.go index 42f7e93..5a69c4b 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package txfuzz var ( + RPC = "http://127.0.0.1:8545" SK = "0xcdfbe6f7602f67a97602e3e9fc24cde1cdffa88acd47745c0b84c5ff55891e1b" ADDR = "0xb02A2EdA1b317FBd16760128836B0Ac59B560e9D" SK2 = "0x8c04e41e317a7cf0cf4c2f7431d0a890a950f352df41ff6d053698df61a73bba"