From fe680dc4c31257cfbaa0598893e2b3803ebec8c4 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 16 Dec 2024 15:58:01 -0500 Subject: [PATCH] fix GetEVM sigsev, update genesis.json --- genesis.json | 9 +++++++-- grpc/execution/validation.go | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/genesis.json b/genesis.json index d4ed69eac..bc1203fbb 100644 --- a/genesis.json +++ b/genesis.json @@ -45,11 +45,16 @@ }, "astriaEIP1559Params": { "1": { "minBaseFee": 0, "elasticityMultiplier": 2, "BaseFeeChangeDenominator": 8 } - } + }, + "astriaOracleCallerAddress": "0x0000000000000000000000000000000000000088" }, "difficulty": "10000000", "gasLimit": "8000000", "alloc": { - "0x46B77EFDFB20979E1C29ec98DcE73e3eCbF64102": { "balance": "300000000000000000000" } + "0x46B77EFDFB20979E1C29ec98DcE73e3eCbF64102": { "balance": "300000000000000000000" }, + "0x0000000000000000000000000000000000000089": { + "balance": "0", + "code": "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80633595f6911461006757806338013f021461007c5780634599c788146100c057806348832f3c146100d7578063859bd5b5146100ea578063dad84e9d1461012f575b600080fd5b61007a610075366004610597565b610189565b005b6100a37f000000000000000000000000000000000000000000000000000000000000008881565b6040516001600160a01b0390911681526020015b60405180910390f35b6100c960025481565b6040519081526020016100b7565b61007a6100e5366004610650565b6103de565b6101166100f8366004610686565b60006020819052908152604090205460ff8082169161010090041682565b60408051921515835260ff9091166020830152016100b7565b61016a61013d36600461069f565b6001602081815260009384526040808520909152918352912080549101546001600160801b039091169082565b604080516001600160801b0390931683526020830191909152016100b7565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146101da5760405162461bcd60e51b81526004016101d1906106c1565b60405180910390fd5b805182511461023b5760405162461bcd60e51b815260206004820152602760248201527f63757272656e6379207061697220616e64207072696365206c656e677468206d6044820152660d2e6dac2e8c6d60cb1b60648201526084016101d1565b4360025560005b82518110156103d95760008084838151811061026057610260610705565b60209081029190910181015182528101919091526040016000205460ff1661029e5760405163183c4ba760e01b8152600481018290526024016101d1565b60405180604001604052808383815181106102bb576102bb610705565b60200260200101516001600160801b031681526020014281525060016000600254815260200190815260200160002060008584815181106102fe576102fe610705565b602090810291909101810151825281810192909252604001600020825181546fffffffffffffffffffffffffffffffff19166001600160801b0390911617815591015160019091015582517fd616ae5f8d378c1264fdbbbc72af91e16e3645564d7eae37e267ef1c67bf5cee9084908390811061037d5761037d610705565b602002602001015183838151811061039757610397610705565b60200260200101516040516103bf9291909182526001600160801b0316602082015260400190565b60405180910390a1806103d18161071b565b915050610242565b505050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146104265760405162461bcd60e51b81526004016101d1906106c1565b6040805180820182526001815260ff8381166020808401828152600088815280835286902094518554915161ffff1990921690151561ff001916176101009190941602929092179092558251858152908101919091527f675b5c62c7826a107baf315a10339c41c59f32f58ac6431f359e9ac89c64a01b910160405180910390a15050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156104ea576104ea6104ab565b604052919050565b600067ffffffffffffffff82111561050c5761050c6104ab565b5060051b60200190565b600082601f83011261052757600080fd5b8135602061053c610537836104f2565b6104c1565b82815260059290921b8401810191818101908684111561055b57600080fd5b8286015b8481101561058c5780356001600160801b038116811461057f5760008081fd5b835291830191830161055f565b509695505050505050565b600080604083850312156105aa57600080fd5b823567ffffffffffffffff808211156105c257600080fd5b818501915085601f8301126105d657600080fd5b813560206105e6610537836104f2565b82815260059290921b8401810191818101908984111561060557600080fd5b948201945b838610156106235785358252948201949082019061060a565b9650508601359250508082111561063957600080fd5b5061064685828601610516565b9150509250929050565b6000806040838503121561066357600080fd5b82359150602083013560ff8116811461067b57600080fd5b809150509250929050565b60006020828403121561069857600080fd5b5035919050565b600080604083850312156106b257600080fd5b50508035926020909101359150565b60208082526024908201527f4173747269614f7261636c653a206f6e6c79206f7261636c652063616e2075706040820152636461746560e01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b60006001820161073b57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220954daeeb3d6446ed3eab09836d7e88f4deb3f3294e39a86c34bbf6ab94e89e2e64736f6c63430008150033" + } } } diff --git a/grpc/execution/validation.go b/grpc/execution/validation.go index 8e20d755e..9463e8fcf 100644 --- a/grpc/execution/validation.go +++ b/grpc/execution/validation.go @@ -57,7 +57,7 @@ func validateAndConvertOracleDataTx( // to check if it was initialized, we call `currencyPairInfo()` on the parent state; since oracle data is always top of block, // if the currency pair is not initialized in the parent state, then we need to initialize it here // as it has never been initialized before. - evm := cfg.api.GetEVM(ctx, &core.Message{}, state, header, &vm.Config{NoBaseFee: true}, nil) + evm := cfg.api.GetEVM(ctx, &core.Message{GasPrice: big.NewInt(1)}, state, header, &vm.Config{NoBaseFee: true}, nil) args := []interface{}{currencyPairs[i]} calldata, err := abi.Pack("currencyPairInfo", args...) if err != nil {