diff --git a/docs/contracts.rst b/docs/contracts.rst index 4808a5ae69..9ffda6af9b 100644 --- a/docs/contracts.rst +++ b/docs/contracts.rst @@ -780,7 +780,7 @@ Event Log Object .. code-block:: python - >>> transfer_filter = my_token_contract.eventFilter('Transfer', {'filter': {'_from': '0xdc3a9db694bcdd55ebae4a89b22ac6d12b3f0c24'}}) + >>> transfer_filter = my_token_contract.eventFilter('Transfer', {'filter': {'_from': '0xDc3A9Db694BCdd55EBaE4A89B22aC6D12b3F0c24'}}) >>> transfer_filter.get_new_entries() [...] # array of Event Log Objects that match the filter. # wait a while... @@ -805,7 +805,7 @@ Utils '0x612e45a3000000000000000000000000b656b2a9c3b2416437a811e07466ca712f5a5b5a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000093a80000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000116c6f6e656c792c20736f206c6f6e656c7900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' >>> contract.decode_function_input(transaction.input) (, - {'_recipient': '0xb656b2a9c3b2416437a811e07466ca712f5a5b5a', + {'_recipient': '0xB656b2a9c3b2416437A811e07466cA712F5a5b5a', '_amount': 0, '_description': b'lonely, so lonely', '_transactionData': b'', diff --git a/docs/examples.rst b/docs/examples.rst index 8c933c6e1f..9eadf52c6a 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -17,7 +17,7 @@ representation. Block numbers # get a block by number >>> web3.eth.getBlock(12345) { - 'author': '0xad5c1768e5974c231b2148169da064e61910f31a', + 'author': '0xad5C1768e5974C231b2148169da064e61910f31a', 'difficulty': 735512610763, 'extraData': '0x476574682f76312e302e302f6c696e75782f676f312e342e32', 'gasLimit': 5000, @@ -146,7 +146,7 @@ You can look up transactions using the ``web3.eth.getTransaction`` function. 'blockNumber': 46147, 'condition': None, 'creates': None, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gas': 21000, 'gasPrice': 50000000000000, 'hash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', @@ -158,7 +158,7 @@ You can look up transactions using the ``web3.eth.getTransaction`` function. 'raw': '0xf86780862d79883d2000825208945df9b87991262f6ba471f09758cde1c0fc1de734827a69801ca088ff6cf0fefd94db46111149ae4bfc179e9b94721fffd821d38d16464b3f71d0a045e0aff800961cfce805daef7016b9b675c137a6a41a548f7b60a3484c06a33a', 's': '0x45e0aff800961cfce805daef7016b9b675c137a6a41a548f7b60a3484c06a33a', 'standardV': '0x1', - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionIndex': 0, 'v': '0x1c', 'value': 31337, diff --git a/docs/overview.rst b/docs/overview.rst index a0e39146e8..4152dea148 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -48,7 +48,7 @@ local development this would be something like ``ws://127.0.0.1:8546``. Base API -------- -The ``Web3`` class exposes the following convenience APIs. +The ``Web3`` class exposes the following convenient APIs. .. _overview_type_conversions: @@ -288,7 +288,7 @@ Cryptographic Hashing >>> Web3.solidityKeccak(['uint8[]'], [[97, 98, 99]]) HexBytes("0x233002c671295529bcc50b76a2ef2b0de2dac2d93945fca745255de1a9e4017e") - >>> Web3.solidityKeccak(['address'], ["0x49eddd3769c0712032808d86597b84ac5c2f5614"]) + >>> Web3.solidityKeccak(['address'], ["0x49EdDD3769c0712032808D86597B84ac5c2F5614"]) HexBytes("0x2ff37b5607484cd4eecf6d13292e22bd6e5401eaffcc07e279583bc742c68882") >>> Web3.solidityKeccak(['address'], ["ethereumfoundation.eth"]) @@ -335,7 +335,7 @@ Cryptographic Hashing >>> Web3.soliditySha3(['uint8[]'], [[97, 98, 99]]) HexBytes("0x233002c671295529bcc50b76a2ef2b0de2dac2d93945fca745255de1a9e4017e") - >>> Web3.soliditySha3(['address'], ["0x49eddd3769c0712032808d86597b84ac5c2f5614"]) + >>> Web3.soliditySha3(['address'], ["0x49EdDD3769c0712032808D86597B84ac5c2F5614"]) HexBytes("0x2ff37b5607484cd4eecf6d13292e22bd6e5401eaffcc07e279583bc742c68882") >>> Web3.soliditySha3(['address'], ["ethereumfoundation.eth"]) diff --git a/docs/web3.eth.rst b/docs/web3.eth.rst index f5cbd708cc..bbe1fe1914 100644 --- a/docs/web3.eth.rst +++ b/docs/web3.eth.rst @@ -78,7 +78,7 @@ The following properties are available on the ``web3.eth`` namespace. .. code-block:: python >>> web3.eth.coinbase - '0xd3cda913deb6f67967b99d67acdfa1712c293601' + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601' .. py:attribute:: Eth.mining @@ -126,7 +126,7 @@ The following properties are available on the ``web3.eth`` namespace. .. code-block:: python >>> web3.eth.accounts - ['0xd3cda913deb6f67967b99d67acdfa1712c293601'] + ['0xd3CdA913deB6f67967B99D67aCDFa1712C293601'] .. py:attribute:: Eth.blockNumber @@ -182,7 +182,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.getBalance('0xd3cda913deb6f67967b99d67acdfa1712c293601') + >>> web3.eth.getBalance('0xd3CdA913deB6f67967B99D67aCDFa1712C293601') 77320681768999138915 @@ -197,7 +197,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.getStorageAt('0x6c8f2a135f6ed072de4503bd7c4999a1a17f824b', 0) + >>> web3.eth.getStorageAt('0x6C8f2A135f6ed072DE4503Bd7C4999a1a17F824B', 0) '0x00000000000000000000000000000000000000000000000000120a0b063499d4' @@ -212,7 +212,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.getProof('0x6c8f2a135f6ed072de4503bd7c4999a1a17f824b', [0], 3391) + >>> web3.eth.getProof('0x6C8f2A135f6ed072DE4503Bd7C4999a1a17F824B', [0], 3391) AttributeDict({ 'address': '0x4CB06C43fcdABeA22541fcF1F856A6a296448B6c', 'accountProof': ['0xf90211a03841a7ddd65c70c94b8efa79190d00f0ab134b26f18dcad508f60a7e74559d0ba0464b07429a05039e22931492d6c6251a860c018ea390045d596b1ac11b5c7aa7a011f4b89823a03c9c4b5a8ab079ee1bc0e2a83a508bb7a5dc7d7fb4f2e95d3186a0b5f7c51c3b2d51d97f171d2b38a4df1a7c0acc5eb0de46beeff4d07f5ed20e19a0b591a2ce02367eda31cf2d16eca7c27fd44dbf0864b64ea8259ad36696eb2a04a02b646a7552b8392ae94263757f699a27d6e9176b4c06b9fc0a722f893b964795a02df05d68bceb88eebf68aafde61d10ab942097afc1c58b8435ffd3895358a742a0c2f16143c4d1db03276c433696dddb3e9f3b113bcd854b127962262e98f43147a0828820316cc02bfefd899aba41340659fd06df1e0a0796287ec2a4110239f6d2a050496598670b04df7bbff3718887fa36437d6d8c7afb4eff86f76c5c7097dcc4a0c14e9060c6b3784e35b9e6ae2ad2984142a75910ccc89eb89dc1e2f44b6c58c2a009804db571d0ce07913e1cbacc4f1dc4fb8265c936f5c612e3a47e91c64d8e9fa063d96f38b3cb51b1665c6641e25ffe24803f2941e5df79942f6a53b7169647e4a0899f71abb18c6c956118bf567fac629b75f7e9526873e429d3d8abb6dbb58021a00fd717235298742623c0b3cafb3e4bd86c0b5ab1f71097b4dd19f3d6925d758da0096437146c16097f2ccc1d3e910d65a4132803baee2249e72c8bf0bcaaeb37e580', @@ -298,7 +298,7 @@ The following methods are available on the ``web3.eth`` namespace. return True block = w3.eth.getBlock(3391) - proof = w3.eth.getProof('0x6c8f2a135f6ed072de4503bd7c4999a1a17f824b', [0, 1], 3391) + proof = w3.eth.getProof('0x6C8f2A135f6ed072DE4503Bd7C4999a1a17F824B', [0, 1], 3391) assert verify_eth_getProof(proof, block.stateRoot) @@ -314,10 +314,10 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python # For a contract address. - >>> web3.eth.getCode('0x6c8f2a135f6ed072de4503bd7c4999a1a17f824b') + >>> web3.eth.getCode('0x6C8f2A135f6ed072DE4503Bd7C4999a1a17F824B') '0x6060604052361561027c5760e060020a60003504630199.....' # For a private key address. - >>> web3.eth.getCode('0xd3cda913deb6f67967b99d67acdfa1712c293601') + >>> web3.eth.getCode('0xd3CdA913deB6f67967B99D67aCDFa1712C293601') '0x' @@ -443,13 +443,13 @@ The following methods are available on the ``web3.eth`` namespace. AttributeDict({ 'blockHash': '0x4e3a3754410177e6937ef1f84bba68ea139e8d1a2258c5f85db9f1cd715a1bdd', 'blockNumber': 46147, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gas': 21000, 'gasPrice': 50000000000000, 'hash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', 'input': '0x', 'nonce': 0, - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionIndex': 0, 'value': 31337, }) @@ -478,13 +478,13 @@ The following methods are available on the ``web3.eth`` namespace. AttributeDict({ 'blockHash': '0x4e3a3754410177e6937ef1f84bba68ea139e8d1a2258c5f85db9f1cd715a1bdd', 'blockNumber': 46147, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gas': 21000, 'gasPrice': 50000000000000, 'hash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', 'input': '0x', 'nonce': 0, - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionIndex': 0, 'value': 31337, }) @@ -492,13 +492,13 @@ The following methods are available on the ``web3.eth`` namespace. AttributeDict({ 'blockHash': '0x4e3a3754410177e6937ef1f84bba68ea139e8d1a2258c5f85db9f1cd715a1bdd', 'blockNumber': 46147, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gas': 21000, 'gasPrice': 50000000000000, 'hash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', 'input': '0x', 'nonce': 0, - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionIndex': 0, 'value': 31337, }) @@ -524,11 +524,11 @@ The following methods are available on the ``web3.eth`` namespace. 'blockNumber': 46147, 'contractAddress': None, 'cumulativeGasUsed': 21000, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gasUsed': 21000, 'logs': [], 'root': '96a8e009d2b88b1483e6941e6812e32263b05683fac202abc622a3e31aed1957', - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionHash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', 'transactionIndex': 0, }) @@ -551,11 +551,11 @@ The following methods are available on the ``web3.eth`` namespace. 'blockNumber': 46147, 'contractAddress': None, 'cumulativeGasUsed': 21000, - 'from': '0xa1e4380a3b1f749673e270229993ee55f35663b4', + 'from': '0xA1E4380A3B1f749673E270229993eE55F35663b4', 'gasUsed': 21000, 'logs': [], 'root': '96a8e009d2b88b1483e6941e6812e32263b05683fac202abc622a3e31aed1957', - 'to': '0x5df9b87991262f6ba471f09758cde1c0fc1de734', + 'to': '0x5DF9B87991262F6BA471F09758CDE1c0FC1De734', 'transactionHash': '0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060', 'transactionIndex': 0, }) @@ -572,7 +572,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.getTransactionCount('0xd3cda913deb6f67967b99d67acdfa1712c293601') + >>> web3.eth.getTransactionCount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601') 340 @@ -610,7 +610,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.sendTransaction({'to': '0xd3cda913deb6f67967b99d67acdfa1712c293601', 'from': web3.eth.coinbase, 'value': 12345}) + >>> web3.eth.sendTransaction({'to': '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'from': web3.eth.coinbase, 'value': 12345}) '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331' @@ -627,7 +627,7 @@ The following methods are available on the ``web3.eth`` namespace. nonce=w3.eth.getTransactionCount(w3.eth.coinbase), gasPrice=w3.eth.gasPrice, gas=100000, - to='0xd3cda913deb6f67967b99d67acdfa1712c293601', + to='0xd3CdA913deB6f67967B99D67aCDFa1712C293601', value=1, data=b'', ) @@ -647,7 +647,7 @@ The following methods are available on the ``web3.eth`` namespace. nonce=w3.eth.getTransactionCount(w3.eth.coinbase), gasPrice=w3.eth.gasPrice, gas=100000, - to='0xd3cda913deb6f67967b99d67acdfa1712c293601', + to='0xd3CdA913deB6f67967B99D67aCDFa1712C293601', value=12345, data=b'', ), @@ -688,13 +688,13 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python >>> tx = web3.eth.sendTransaction({ - 'to': '0xd3cda913deb6f67967b99d67acdfa1712c293601', + 'to': '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'from': web3.eth.coinbase, 'value': 1000 }) '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331' >>> web3.eth.replaceTransaction('0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331', { - 'to': '0xd3cda913deb6f67967b99d67acdfa1712c293601', + 'to': '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'from': web3.eth.coinbase, 'value': 2000 }) @@ -718,7 +718,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python >>> tx = web3.eth.sendTransaction({ - 'to': '0xd3cda913deb6f67967b99d67acdfa1712c293601', + 'to': '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'from': web3.eth.coinbase, 'value': 1000 }) @@ -740,17 +740,17 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python >>> web3.eth.sign( - '0xd3cda913deb6f67967b99d67acdfa1712c293601', + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', text='some-text-tö-sign') '0x1a8bbe6eab8c72a219385681efefe565afd3accee35f516f8edf5ae82208fbd45a58f9f9116d8d88ba40fcd29076d6eada7027a3b412a9db55a0164547810cc401' >>> web3.eth.sign( - '0xd3cda913deb6f67967b99d67acdfa1712c293601', + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', data=b'some-text-t\xc3\xb6-sign') '0x1a8bbe6eab8c72a219385681efefe565afd3accee35f516f8edf5ae82208fbd45a58f9f9116d8d88ba40fcd29076d6eada7027a3b412a9db55a0164547810cc401' >>> web3.eth.sign( - '0xd3cda913deb6f67967b99d67acdfa1712c293601', + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', hexstr='0x736f6d652d746578742d74c3b62d7369676e') '0x1a8bbe6eab8c72a219385681efefe565afd3accee35f516f8edf5ae82208fbd45a58f9f9116d8d88ba40fcd29076d6eada7027a3b412a9db55a0164547810cc401' @@ -804,7 +804,7 @@ The following methods are available on the ``web3.eth`` namespace. .. code-block:: python - >>> web3.eth.estimateGas({'to': '0xd3cda913deb6f67967b99d67acdfa1712c293601', 'from': web3.eth.coinbase, 'value': 12345}) + >>> web3.eth.estimateGas({'to': '0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'from': web3.eth.coinbase, 'value': 12345}) 21000 .. note:: @@ -892,7 +892,7 @@ with the filtering API. >>> web3.eth.filter('pending') - >>> web3.eth.filter({'fromBlock': 1000000, 'toBlock': 1000100, 'address': '0x6c8f2a135f6ed072de4503bd7c4999a1a17f824b'}) + >>> web3.eth.filter({'fromBlock': 1000000, 'toBlock': 1000100, 'address': '0x6C8f2A135f6ed072DE4503Bd7C4999a1a17F824B'}) .. py:method:: Eth.getFilterChanges(self, filter_id) @@ -908,7 +908,7 @@ with the filtering API. >>> web3.eth.getFilterChanges(filt.filter_id) [ { - 'address': '0xdc3a9db694bcdd55ebae4a89b22ac6d12b3f0c24', + 'address': '0xDc3A9Db694BCdd55EBaE4A89B22aC6D12b3F0c24', 'blockHash': '0xb72256286ca528e09022ffd408856a73ef90e7216ac560187c6e43b4c4efd2f0', 'blockNumber': 2217196, 'data': '0x0000000000000000000000000000000000000000000000000000000000000001', @@ -935,7 +935,7 @@ with the filtering API. >>> web3.eth.getFilterLogs(filt.filter_id) [ { - 'address': '0xdc3a9db694bcdd55ebae4a89b22ac6d12b3f0c24', + 'address': '0xDc3A9Db694BCdd55EBaE4A89B22aC6D12b3F0c24', 'blockHash': '0xb72256286ca528e09022ffd408856a73ef90e7216ac560187c6e43b4c4efd2f0', 'blockNumber': 2217196, 'data': '0x0000000000000000000000000000000000000000000000000000000000000001', @@ -1013,7 +1013,7 @@ Contracts w3 = Web3(...) - contract = w3.eth.contract(address='0x000000000000000000000000000000000000dead', abi=...) + contract = w3.eth.contract(address='0x000000000000000000000000000000000000dEaD', abi=...) # alternatively: contract = w3.eth.contract(address='mycontract.eth', abi=...) @@ -1037,7 +1037,7 @@ Contracts Contract = w3.eth.contract(abi=...) # later, initialize contracts with the same metadata at different addresses: - contract1 = Contract(address='0x000000000000000000000000000000000000dead') + contract1 = Contract(address='0x000000000000000000000000000000000000dEaD') contract2 = Contract(address='mycontract.eth') ``contract_name`` will be used as the name of the contract class. If it is diff --git a/docs/web3.geth.rst b/docs/web3.geth.rst index dbf4883405..0c44f68ca7 100644 --- a/docs/web3.geth.rst +++ b/docs/web3.geth.rst @@ -196,7 +196,7 @@ The following methods are available on the ``web3.geth.personal`` namespace. .. code-block:: python >>> web3.geth.personal.listAccounts() - ['0xd3cda913deb6f67967b99d67acdfa1712c293601'] + ['0xd3CdA913deB6f67967B99D67aCDFa1712C293601'] .. py:method:: importRawKey(self, private_key, passphrase) @@ -209,7 +209,7 @@ The following methods are available on the ``web3.geth.personal`` namespace. .. code-block:: python >>> web3.geth.personal.importRawKey(some_private_key, 'the-passphrase') - '0xd3cda913deb6f67967b99d67acdfa1712c293601' + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601' .. py:method:: newAccount(self, password) @@ -222,7 +222,7 @@ The following methods are available on the ``web3.geth.personal`` namespace. .. code-block:: python >>> web3.geth.personal.newAccount('the-passphrase') - '0xd3cda913deb6f67967b99d67acdfa1712c293601' + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601' .. py:method:: lockAccount(self, account) @@ -233,7 +233,7 @@ The following methods are available on the ``web3.geth.personal`` namespace. .. code-block:: python - >>> web3.geth.personal.lockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601') + >>> web3.geth.personal.lockAccount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601') .. py:method:: unlockAccount(self, account, passphrase, duration=None) @@ -246,9 +246,9 @@ The following methods are available on the ``web3.geth.personal`` namespace. .. code-block:: python - >>> web3.geth.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'wrong-passphrase') + >>> web3.geth.personal.unlockAccount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'wrong-passphrase') False - >>> web3.geth.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'the-passphrase') + >>> web3.geth.personal.unlockAccount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'the-passphrase') True @@ -283,50 +283,50 @@ The following methods are available on the ``web3.geth.txpool`` namespace. >>> web3.geth.txpool.inspect() { 'pending': { - '0x26588a9301b0428d95e6fc3a5024fce8bec12d51': { - 31813: ["0x3375ee30428b2a71c428afa5e89e427905f95f7e: 0 wei + 500000 × 20000000000 gas"] + '0x26588a9301b0428d95e6Fc3A5024fcE8BEc12D51': { + 31813: ["0x3375Ee30428b2A71c428afa5E89e427905F95F7e: 0 wei + 500000 × 20000000000 gas"] }, - '0x2a65aca4d5fc5b5c859090a6c34d164135398226': { - 563662: ["0x958c1fa64b34db746925c6f8a3dd81128e40355e: 1051546810000000000 wei + 90000 × 20000000000 gas"], - 563663: ["0x77517b1491a0299a44d668473411676f94e97e34: 1051190740000000000 wei + 90000 × 20000000000 gas"], - 563664: ["0x3e2a7fe169c8f8eee251bb00d9fb6d304ce07d3a: 1050828950000000000 wei + 90000 × 20000000000 gas"], - 563665: ["0xaf6c4695da477f8c663ea2d8b768ad82cb6a8522: 1050544770000000000 wei + 90000 × 20000000000 gas"], - 563666: ["0x139b148094c50f4d20b01caf21b85edb711574db: 1048598530000000000 wei + 90000 × 20000000000 gas"], - 563667: ["0x48b3bd66770b0d1eecefce090dafee36257538ae: 1048367260000000000 wei + 90000 × 20000000000 gas"], - 563668: ["0x468569500925d53e06dd0993014ad166fd7dd381: 1048126690000000000 wei + 90000 × 20000000000 gas"], - 563669: ["0x3dcb4c90477a4b8ff7190b79b524773cbe3be661: 1047965690000000000 wei + 90000 × 20000000000 gas"], - 563670: ["0x6dfef5bc94b031407ffe71ae8076ca0fbf190963: 1047859050000000000 wei + 90000 × 20000000000 gas"] + '0x2a65Aca4D5fC5B5C859090a6c34d164135398226': { + 563662: ["0x958c1Fa64B34db746925c6F8a3Dd81128e40355E: 1051546810000000000 wei + 90000 × 20000000000 gas"], + 563663: ["0x77517B1491a0299A44d668473411676f94e97E34: 1051190740000000000 wei + 90000 × 20000000000 gas"], + 563664: ["0x3E2A7Fe169c8F8eee251BB00d9fb6d304cE07d3A: 1050828950000000000 wei + 90000 × 20000000000 gas"], + 563665: ["0xAF6c4695da477F8C663eA2D8B768Ad82Cb6A8522: 1050544770000000000 wei + 90000 × 20000000000 gas"], + 563666: ["0x139B148094C50F4d20b01cAf21B85eDb711574dB: 1048598530000000000 wei + 90000 × 20000000000 gas"], + 563667: ["0x48B3Bd66770b0D1EeceFCe090daFeE36257538aE: 1048367260000000000 wei + 90000 × 20000000000 gas"], + 563668: ["0x468569500925D53e06Dd0993014aD166fD7Dd381: 1048126690000000000 wei + 90000 × 20000000000 gas"], + 563669: ["0x3DcB4C90477a4b8Ff7190b79b524773CbE3bE661: 1047965690000000000 wei + 90000 × 20000000000 gas"], + 563670: ["0x6DfeF5BC94b031407FFe71ae8076CA0FbF190963: 1047859050000000000 wei + 90000 × 20000000000 gas"] }, - '0x9174e688d7de157c5c0583df424eaab2676ac162': { - 3: ["0xbb9bc244d798123fde783fcc1c72d3bb8c189413: 30000000000000000000 wei + 85000 × 21000000000 gas"] + '0x9174E688d7dE157C5C0583Df424EAAB2676aC162': { + 3: ["0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413: 30000000000000000000 wei + 85000 × 21000000000 gas"] }, - '0xb18f9d01323e150096650ab989cfecd39d757aec': { - 777: ["0xcd79c72690750f079ae6ab6ccd7e7aedc03c7720: 0 wei + 1000000 × 20000000000 gas"] + '0xb18F9d01323e150096650ab989CfecD39D757Aec': { + 777: ["0xcD79c72690750F079ae6AB6ccd7e7aEDC03c7720: 0 wei + 1000000 × 20000000000 gas"] }, - '0xb2916c870cf66967b6510b76c07e9d13a5d23514': { - 2: ["0x576f25199d60982a8f31a8dff4da8acb982e6aba: 26000000000000000000 wei + 90000 × 20000000000 gas"] + '0xB2916C870Cf66967B6510B76c07E9d13a5D23514': { + 2: ["0x576f25199D60982A8f31A8DfF4da8aCB982e6ABa: 26000000000000000000 wei + 90000 × 20000000000 gas"] }, - '0xbc0ca4f217e052753614d6b019948824d0d8688b': { - 0: ["0x2910543af39aba0cd09dbb2d50200b3e800a63d2: 1000000000000000000 wei + 50000 × 1171602790622 gas"] + '0xBc0CA4f217E052753614d6B019948824d0d8688B': { + 0: ["0x2910543Af39abA0Cd09dBb2D50200b3E800A63D2: 1000000000000000000 wei + 50000 × 1171602790622 gas"] }, '0xea674fdde714fd979de3edf0f56aa9716b898ec8': { 70148: ["0xe39c55ead9f997f7fa20ebe40fb4649943d7db66: 1000767667434026200 wei + 90000 × 20000000000 gas"] } }, 'queued': { - '0x0f6000de1578619320aba5e392706b131fb1de6f': { - 6: ["0x8383534d0bcd0186d326c993031311c0ac0d9b2d: 9000000000000000000 wei + 21000 × 20000000000 gas"] + '0x0F6000De1578619320aBA5e392706b131FB1dE6f': { + 6: ["0x8383534d0bcd0186d326C993031311c0Ac0D9B2d: 9000000000000000000 wei + 21000 × 20000000000 gas"] }, - '0x5b30608c678e1ac464a8994c3b33e5cdf3497112': { - 6: ["0x9773547e27f8303c87089dc42d9288aa2b9d8f06: 50000000000000000000 wei + 90000 × 50000000000 gas"] + '0x5b30608c678e1ac464A8994C3B33E5CdF3497112': { + 6: ["0x9773547e27f8303C87089dc42D9288aa2B9d8F06: 50000000000000000000 wei + 90000 × 50000000000 gas"] }, - '0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c': { - 3: ["0x346fb27de7e7370008f5da379f74dd49f5f2f80f: 140000000000000000 wei + 90000 × 20000000000 gas"] + '0x976A3Fc5d6f7d259EBfb4cc2Ae75115475E9867C': { + 3: ["0x346FB27dE7E7370008f5da379f74dd49F5f2F80F: 140000000000000000 wei + 90000 × 20000000000 gas"] }, - '0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a': { - 2: ["0x24a461f25ee6a318bdef7f33de634a67bb67ac9d: 17000000000000000000 wei + 90000 × 50000000000 gas"], - 6: ["0x6368f3f8c2b42435d6c136757382e4a59436a681: 17990000000000000000 wei + 90000 × 20000000000 gas", "0x8db7b4e0ecb095fbd01dffa62010801296a9ac78: 16998950000000000000 wei + 90000 × 20000000000 gas"], - 7: ["0x6368f3f8c2b42435d6c136757382e4a59436a681: 17900000000000000000 wei + 90000 × 20000000000 gas"] + '0x9B11bF0459b0c4b2f87f8CEBca4cfc26f294B63A': { + 2: ["0x24a461f25eE6a318BDef7F33De634A67bb67Ac9D: 17000000000000000000 wei + 90000 × 50000000000 gas"], + 6: ["0x6368f3f8c2B42435D6C136757382E4A59436a681: 17990000000000000000 wei + 90000 × 20000000000 gas", "0x8db7b4e0ecb095fbd01dffa62010801296a9ac78: 16998950000000000000 wei + 90000 × 20000000000 gas"], + 7: ["0x6368f3f8c2B42435D6C136757382E4A59436a681: 17900000000000000000 wei + 90000 × 20000000000 gas"] } } } @@ -359,89 +359,89 @@ The following methods are available on the ``web3.geth.txpool`` namespace. >>> web3.geth.txpool.content() { 'pending': { - '0x0216d5032f356960cd3749c31ab34eeff21b3395': { + '0x0216D5032f356960Cd3749C31Ab34eEFF21B3395': { 806: [{ 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x0216d5032f356960cd3749c31ab34eeff21b3395", + 'from': "0x0216D5032f356960Cd3749C31Ab34eEFF21B3395", 'gas': "0x5208", 'gasPrice': "0xba43b7400", 'hash': "0xaf953a2d01f55cfe080c0c94150a60105e8ac3d51153058a1f03dd239dd08586", 'input': "0x", 'nonce': "0x326", - 'to': "0x7f69a91a3cf4be60020fb58b893b7cbb65376db8", + 'to': "0x7f69a91A3CF4bE60020fB58B893b7cbb65376db8", 'transactionIndex': None, 'value': "0x19a99f0cf456000" }] }, - '0x24d407e5a0b506e1cb2fae163100b5de01f5193c': { + '0x24d407e5A0B506E1Cb2fae163100B5DE01F5193C': { 34: [{ 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x24d407e5a0b506e1cb2fae163100b5de01f5193c", + 'from': "0x24d407e5A0B506E1Cb2fae163100B5DE01F5193C", 'gas': "0x44c72", 'gasPrice': "0x4a817c800", 'hash': "0xb5b8b853af32226755a65ba0602f7ed0e8be2211516153b75e9ed640a7d359fe", 'input': "0xb61d27f600000000000000000000000024d407e5a0b506e1cb2fae163100b5de01f5193c00000000000000000000000000000000000000000000000053444835ec580000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 'nonce': "0x22", - 'to': "0x7320785200f74861b69c49e4ab32399a71b34f1a", + 'to': "0x7320785200f74861B69C49e4ab32399a71b34f1a", 'transactionIndex': None, 'value': "0x0" }] } }, 'queued': { - '0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c': { + '0x976A3Fc5d6f7d259EBfb4cc2Ae75115475E9867C': { 3: [{ 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x976a3fc5d6f7d259ebfb4cc2ae75115475e9867c", + 'from': "0x976A3Fc5d6f7d259EBfb4cc2Ae75115475E9867C", 'gas': "0x15f90", 'gasPrice': "0x4a817c800", 'hash': "0x57b30c59fc39a50e1cba90e3099286dfa5aaf60294a629240b5bbec6e2e66576", 'input': "0x", 'nonce': "0x3", - 'to': "0x346fb27de7e7370008f5da379f74dd49f5f2f80f", + 'to': "0x346FB27dE7E7370008f5da379f74dd49F5f2F80F", 'transactionIndex': None, 'value': "0x1f161421c8e0000" }] }, - '0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a': { + '0x9B11bF0459b0c4b2f87f8CEBca4cfc26f294B63A': { 2: [{ 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a", + 'from': "0x9B11bF0459b0c4b2f87f8CEBca4cfc26f294B63A", 'gas': "0x15f90", 'gasPrice': "0xba43b7400", 'hash': "0x3a3c0698552eec2455ed3190eac3996feccc806970a4a056106deaf6ceb1e5e3", 'input': "0x", 'nonce': "0x2", - 'to': "0x24a461f25ee6a318bdef7f33de634a67bb67ac9d", + 'to': "0x24a461f25eE6a318BDef7F33De634A67bb67Ac9D", 'transactionIndex': None, 'value': "0xebec21ee1da40000" }], 6: [{ 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a", + 'from': "0x9B11bF0459b0c4b2f87f8CEBca4cfc26f294B63A", 'gas': "0x15f90", 'gasPrice': "0x4a817c800", 'hash': "0xbbcd1e45eae3b859203a04be7d6e1d7b03b222ec1d66dfcc8011dd39794b147e", 'input': "0x", 'nonce': "0x6", - 'to': "0x6368f3f8c2b42435d6c136757382e4a59436a681", + 'to': "0x6368f3f8c2B42435D6C136757382E4A59436a681", 'transactionIndex': None, 'value': "0xf9a951af55470000" }, { 'blockHash': "0x0000000000000000000000000000000000000000000000000000000000000000", 'blockNumber': None, - 'from': "0x9b11bf0459b0c4b2f87f8cebca4cfc26f294b63a", + 'from': "0x9B11bF0459b0c4b2f87f8CEBca4cfc26f294B63A", 'gas': "0x15f90", 'gasPrice': "0x4a817c800", 'hash': "0x60803251d43f072904dc3a2d6a084701cd35b4985790baaf8a8f76696041b272", 'input': "0x", 'nonce': "0x6", - 'to': "0x8db7b4e0ecb095fbd01dffa62010801296a9ac78", + 'to': "0x8DB7b4e0ECB095FBD01Dffa62010801296a9ac78", 'transactionIndex': None, 'value': "0xebe866f5f0a06000" }], diff --git a/docs/web3.parity.rst b/docs/web3.parity.rst index 05dc821913..4202185ee1 100644 --- a/docs/web3.parity.rst +++ b/docs/web3.parity.rst @@ -19,7 +19,7 @@ The following methods are available on the ``web3.parity.personal`` namespace. .. code-block:: python >>> web3.parity.personal.listAccounts() - ['0xd3cda913deb6f67967b99d67acdfa1712c293601'] + ['0xd3CdA913deB6f67967B99D67aCDFa1712C293601'] .. py:method:: importRawKey(self, private_key, passphrase) @@ -32,7 +32,7 @@ The following methods are available on the ``web3.parity.personal`` namespace. .. code-block:: python >>> web3.parity.personal.importRawKey(some_private_key, 'the-passphrase') - '0xd3cda913deb6f67967b99d67acdfa1712c293601' + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601' .. py:method:: newAccount(self, password) @@ -45,7 +45,7 @@ The following methods are available on the ``web3.parity.personal`` namespace. .. code-block:: python >>> web3.parity.personal.newAccount('the-passphrase') - '0xd3cda913deb6f67967b99d67acdfa1712c293601' + '0xd3CdA913deB6f67967B99D67aCDFa1712C293601' .. py:method:: unlockAccount(self, account, passphrase, duration=None) @@ -59,9 +59,9 @@ The following methods are available on the ``web3.parity.personal`` namespace. .. code-block:: python # Invalid call to personal_unlockAccount on Parity currently returns True, due to Parity bug - >>> web3.parity.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'wrong-passphrase') + >>> web3.parity.personal.unlockAccount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'wrong-passphrase') True - >>> web3.parity.personal.unlockAccount('0xd3cda913deb6f67967b99d67acdfa1712c293601', 'the-passphrase') + >>> web3.parity.personal.unlockAccount('0xd3CdA913deB6f67967B99D67aCDFa1712C293601', 'the-passphrase') True