diff --git a/pkg/eth/eth_state_test.go b/pkg/eth/eth_state_test.go index 6709764d..58148816 100644 --- a/pkg/eth/eth_state_test.go +++ b/pkg/eth/eth_state_test.go @@ -66,6 +66,7 @@ var _ = Describe("eth state reading tests", func() { chain *core.BlockChain db *postgres.DB api *eth.PublicEthAPI + backend *eth.Backend chainConfig = params.TestChainConfig mockTD = big.NewInt(1337) ) @@ -75,7 +76,7 @@ var _ = Describe("eth state reading tests", func() { db, err = shared.SetupDB() Expect(err).ToNot(HaveOccurred()) transformer := eth2.NewStateDiffTransformer(chainConfig, db) - backend, err := eth.NewEthBackend(db, ð.Config{ + backend, err = eth.NewEthBackend(db, ð.Config{ ChainConfig: chainConfig, VmConfig: vm.Config{}, RPCGasCap: big.NewInt(10000000000), @@ -174,6 +175,217 @@ var _ = Describe("eth state reading tests", func() { }) }) + var ( + expectedContractBalance = (*hexutil.Big)(common.Big0) + expectedBankBalanceBlock0 = (*hexutil.Big)(test_helpers.TestBankFunds) + + expectedAcct1BalanceBlock1 = (*hexutil.Big)(big.NewInt(10000)) + expectedBankBalanceBlock1 = (*hexutil.Big)(new(big.Int).Sub(test_helpers.TestBankFunds, big.NewInt(10000))) + + expectedAcct2BalanceBlock2 = (*hexutil.Big)(big.NewInt(1000)) + expectedBankBalanceBlock2 = (*hexutil.Big)(new(big.Int).Sub(expectedBankBalanceBlock1.ToInt(), big.NewInt(1000))) + + expectedAcct2BalanceBlock3 = (*hexutil.Big)(new(big.Int).Add(expectedAcct2BalanceBlock2.ToInt(), test_helpers.MiningReward)) + + expectedAcct2BalanceBlock4 = (*hexutil.Big)(new(big.Int).Add(expectedAcct2BalanceBlock3.ToInt(), test_helpers.MiningReward)) + + expectedAcct1BalanceBlock5 = (*hexutil.Big)(new(big.Int).Add(expectedAcct1BalanceBlock1.ToInt(), test_helpers.MiningReward)) + ) + + Describe("eth_getBalance", func() { + It("Retrieves the eth balance for the provided account address at the block with the provided number", func() { + bal, err := api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(0)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock0)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(1)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + _, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(1)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(1)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(1)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock1)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(2)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(2)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock2)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(2)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(2)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(3)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(3)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock3)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(3)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(3)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(4)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(4)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock4)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(4)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(4)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(5)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock5)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(5)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock4)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(5)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithNumber(5)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + }) + It("Retrieves the eth balance for the provided account address at the block with the provided hash", func() { + bal, err := api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[0].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock0)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[1].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + _, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[1].Hash(), true)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[1].Hash(), true)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[1].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock1)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[2].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[2].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock2)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[2].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[2].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock3)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[4].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock1)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[4].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock4)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[4].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[4].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + + bal, err = api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[5].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct1BalanceBlock5)) + bal, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[5].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedAcct2BalanceBlock4)) + bal, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[5].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedContractBalance)) + bal, err = api.GetBalance(ctx, test_helpers.TestBankAddress, rpc.BlockNumberOrHashWithHash(blocks[5].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(bal).To(Equal(expectedBankBalanceBlock2)) + }) + It("Throws an error for an account it cannot find the balance for an account at the provided block number", func() { + _, err := api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithNumber(0)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithNumber(0)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(0)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + }) + It("Throws an error for an account it cannot find the balance for an account at the provided block hash", func() { + _, err := api.GetBalance(ctx, test_helpers.Account1Addr, rpc.BlockNumberOrHashWithHash(blocks[0].Hash(), true)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.Account2Addr, rpc.BlockNumberOrHashWithHash(blocks[0].Hash(), true)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + _, err = api.GetBalance(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[0].Hash(), true)) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("sql: no rows in result set")) + }) + }) + + Describe("eth_getCode", func() { + It("Retrieves the code for the provided contract address at the block with the provided number", func() { + code, err := api.GetCode(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(3)) + Expect(err).ToNot(HaveOccurred()) + Expect(code).To(Equal((hexutil.Bytes)(test_helpers.ContractCode))) + + code, err = api.GetCode(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(5)) + Expect(err).ToNot(HaveOccurred()) + Expect(code).To(Equal((hexutil.Bytes)(test_helpers.ContractCode))) + }) + It("Retrieves the code for the provided contract address at the block with the provided hash", func() { + code, err := api.GetCode(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(code).To(Equal((hexutil.Bytes)(test_helpers.ContractCode))) + + code, err = api.GetCode(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithHash(blocks[5].Hash(), true)) + Expect(err).ToNot(HaveOccurred()) + Expect(code).To(Equal((hexutil.Bytes)(test_helpers.ContractCode))) + }) + It("Throws an error for an account it cannot find the code for", func() { + _, err := api.GetCode(ctx, randomAddr, rpc.BlockNumberOrHashWithHash(blocks[3].Hash(), true)) + Expect(err).To(HaveOccurred()) + }) + It("Throws an error for a contract that doesn't exist at this hieght", func() { + _, err := api.GetCode(ctx, test_helpers.ContractAddr, rpc.BlockNumberOrHashWithNumber(0)) + Expect(err).To(HaveOccurred()) + }) + }) + Describe("eth_getStorageAt", func() { It("Throws an error if it tries to access a contract which does not exist", func() { _, err := api.GetStorageAt(ctx, test_helpers.ContractAddr, test_helpers.ContractSlotKeyHash.Hex(), rpc.BlockNumberOrHashWithNumber(0)) @@ -211,8 +423,4 @@ var _ = Describe("eth state reading tests", func() { Expect(val).To(Equal(hexutil.Bytes{})) }) }) - - Describe("eth_getProof", func() { - - }) }) diff --git a/pkg/eth/ipld_retriever.go b/pkg/eth/ipld_retriever.go index 057fd6f9..487058cd 100644 --- a/pkg/eth/ipld_retriever.go +++ b/pkg/eth/ipld_retriever.go @@ -30,9 +30,6 @@ import ( ) const ( - RetrieveIPLDpgStr = `SELECT data - FROM public.blocks - WHERE key = $1` RetrieveHeadersByHashesPgStr = `SELECT cid, data FROM eth.header_cids INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key) @@ -129,32 +126,19 @@ const ( AND block_number <= $3 ORDER BY block_number DESC LIMIT 1` - RetrieveStorageLeafByAddressHashAndLeafKeyAndBlockHashPgStr = `SELECT storage_cids.cid, data - FROM eth.storage_cids, eth.state_cids, eth.header_cids, public.blocks - WHERE storage_cids.state_id = state_cids.id - AND state_cids.header_id = header_cids.id - AND storage_cids.mh_key = blocks.key - AND state_leaf_key = $1 - AND storage_leaf_key = $2 - AND block_number <= (SELECT block_number - FROM eth.header_cids - WHERE block_hash = $3) - AND header_cids.id = (SELECT canonical_header(block_number)) - ORDER BY block_number DESC - LIMIT 1` retrieveStorageInfoPgStr = `SELECT storage_cids.cid, data, storage_path, block_number - FROM eth.storage_cids, eth.state_cids, eth.header_cids, public.blocks - WHERE storage_cids.state_id = state_cids.id - AND state_cids.header_id = header_cids.id - AND storage_cids.mh_key = blocks.key - AND state_leaf_key = $1 - AND storage_leaf_key = $2 - AND block_number <= (SELECT block_number - FROM eth.header_cids - WHERE block_hash = $3) - AND header_cids.id = (SELECT canonical_header(block_number)) - ORDER BY block_number DESC - LIMIT 1` + FROM eth.storage_cids, eth.state_cids, eth.header_cids, public.blocks + WHERE storage_cids.state_id = state_cids.id + AND state_cids.header_id = header_cids.id + AND storage_cids.mh_key = blocks.key + AND state_leaf_key = $1 + AND storage_leaf_key = $2 + AND block_number <= (SELECT block_number + FROM eth.header_cids + WHERE block_hash = $3) + AND header_cids.id = (SELECT canonical_header(block_number)) + ORDER BY block_number DESC + LIMIT 1` wasNodeDeletedpgStr = `SELECT exists(SELECT * FROM eth.storage_cids, eth.state_cids, eth.header_cids WHERE storage_cids.state_id = state_cids.id diff --git a/pkg/eth/test_helpers/chain_maker.go b/pkg/eth/test_helpers/chain_maker.go index e694ce67..1444b0d9 100644 --- a/pkg/eth/test_helpers/chain_maker.go +++ b/pkg/eth/test_helpers/chain_maker.go @@ -41,12 +41,15 @@ var ( Account2Key, _ = crypto.HexToECDSA("49a7b37aa6f6645917e7b807e9d1c00d4fa71f18343b0d4122a4d2df64dd6fee") Account1Addr = crypto.PubkeyToAddress(Account1Key.PublicKey) //0x703c4b2bD70c169f5717101CaeE543299Fc946C7 Account2Addr = crypto.PubkeyToAddress(Account2Key.PublicKey) //0x0D3ab14BBaD3D99F4203bd7a11aCB94882050E7e - ContractCode = common.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600180819055506101e2806100676000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a1461005057806373d4a13a1461007e575b600080fd5b61004e61009c565b005b61007c6004803603602081101561006657600080fd5b810190808035906020019092919050505061017b565b005b610086610185565b6040518082815260200191505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610141576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602281526020018061018c6022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018190555050565b6001548156fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158205ba91466129f45285f53176d805117208c231ec6343d7896790e6fc4165b802b64736f6c63430005110032") + DeploymentTxData = common.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600180819055506101e2806100676000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a1461005057806373d4a13a1461007e575b600080fd5b61004e61009c565b005b61007c6004803603602081101561006657600080fd5b810190808035906020019092919050505061017b565b005b610086610185565b6040518082815260200191505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610141576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602281526020018061018c6022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018190555050565b6001548156fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158205ba91466129f45285f53176d805117208c231ec6343d7896790e6fc4165b802b64736f6c63430005110032") + ContractCode = common.Hex2Bytes("608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a1461005057806373d4a13a1461007e575b600080fd5b61004e61009c565b005b61007c6004803603602081101561006657600080fd5b810190808035906020019092919050505061017b565b005b610086610185565b6040518082815260200191505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610141576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602281526020018061018c6022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018190555050565b6001548156fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158205ba91466129f45285f53176d805117208c231ec6343d7896790e6fc4165b802b64736f6c63430005110032") + CodeHash = crypto.Keccak256Hash(ContractCode) ContractAddr common.Address IndexZero = "0000000000000000000000000000000000000000000000000000000000000000" IndexOne = "0000000000000000000000000000000000000000000000000000000000000001" ContractSlotPosition = common.FromHex(IndexOne) ContractSlotKeyHash = crypto.Keccak256Hash(ContractSlotPosition) + MiningReward = big.NewInt(2000000000000000000) ) /* test function signatures @@ -79,7 +82,7 @@ func TestChainGen(i int, block *core.BlockGen) { nonce := block.TxNonce(Account1Addr) tx2, _ := types.SignTx(types.NewTransaction(nonce, Account2Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, Account1Key) nonce++ - tx3, _ := types.SignTx(types.NewContractCreation(nonce, big.NewInt(0), 1000000, big.NewInt(0), ContractCode), signer, Account1Key) + tx3, _ := types.SignTx(types.NewContractCreation(nonce, big.NewInt(0), 1000000, big.NewInt(0), DeploymentTxData), signer, Account1Key) ContractAddr = crypto.CreateAddress(Account1Addr, nonce) block.AddTx(tx1) block.AddTx(tx2)