forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Access List Encoding in JSON-RPC (hyperledger#1936)
Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com>
- Loading branch information
Showing
12 changed files
with
180 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResultTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata; | ||
| import org.hyperledger.besu.ethereum.core.BlockDataGenerator; | ||
| import org.hyperledger.besu.ethereum.core.Hash; | ||
| import org.hyperledger.besu.ethereum.core.Transaction; | ||
| import org.hyperledger.besu.plugin.data.TransactionType; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.junit.Test; | ||
|
|
||
| public class TransactionCompleteResultTest { | ||
| @Test | ||
| public void accessListTransactionFields() throws JsonProcessingException { | ||
| final BlockDataGenerator gen = new BlockDataGenerator(); | ||
| final Transaction transaction = gen.transaction(TransactionType.ACCESS_LIST); | ||
| final TransactionCompleteResult transactionCompleteResult = | ||
| new TransactionCompleteResult( | ||
| new TransactionWithMetadata( | ||
| transaction, | ||
| 136, | ||
| Hash.fromHexString( | ||
| "0xfc84c3946cb419cbd8c2c68d5e79a3b2a03a8faff4d9e2be493f5a07eb5da95e"), | ||
| 0)); | ||
|
|
||
| final ObjectMapper objectMapper = new ObjectMapper(); | ||
| final String jsonString = | ||
| objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(transactionCompleteResult); | ||
|
|
||
| assertThat(jsonString) | ||
| .startsWith( | ||
| "{\n" | ||
| + " \"accessList\" : [ {\n" | ||
| + " \"address\" : \"0x47902028e61cfdc243d9d16008aabc9fb77cc723\",\n" | ||
| + " \"storageKeys\" : [ ]\n" | ||
| + " }, {\n" | ||
| + " \"address\" : \"0xa56017e14f1ce8b1698341734a6823ce02043e01\",\n" | ||
| + " \"storageKeys\" : [ \"0x6b544901214a2ddab82fec85c0b9fe0549c475be5b887bb4b8995b24fb5c6846\", \"0xf88b527b4f9d4c1391f1678b23ba4f9c9cd7bc93eb5776f4f036753448642946\" ]\n" | ||
| + " } ],"); | ||
| } | ||
| } |
35 changes: 0 additions & 35 deletions
35
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccessList.java
This file was deleted.
Oops, something went wrong.
73 changes: 73 additions & 0 deletions
73
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccessListEntry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.core; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonGenerator; | ||
| import com.fasterxml.jackson.databind.SerializerProvider; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import com.fasterxml.jackson.databind.ser.std.StdSerializer; | ||
| import org.apache.tuweni.bytes.Bytes32; | ||
|
|
||
| @JsonSerialize(using = AccessListEntry.Serializer.class) | ||
| public class AccessListEntry { | ||
| private final Address address; | ||
| private final List<Bytes32> storageKeys; | ||
|
|
||
| public AccessListEntry(final Address address, final List<Bytes32> storageKeys) { | ||
|
|
||
| this.address = address; | ||
| this.storageKeys = storageKeys; | ||
| } | ||
|
|
||
| public Address getAddress() { | ||
| return address; | ||
| } | ||
|
|
||
| public List<Bytes32> getStorageKeys() { | ||
| return storageKeys; | ||
| } | ||
|
|
||
| public static class Serializer extends StdSerializer<AccessListEntry> { | ||
|
|
||
| Serializer() { | ||
| this(null); | ||
| } | ||
|
|
||
| protected Serializer(final Class<AccessListEntry> t) { | ||
| super(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void serialize( | ||
| final AccessListEntry accessListEntry, | ||
| final JsonGenerator gen, | ||
| final SerializerProvider provider) | ||
| throws IOException { | ||
| gen.writeStartObject(); | ||
| gen.writeFieldName("address"); | ||
| gen.writeString(accessListEntry.getAddress().toHexString()); | ||
| gen.writeFieldName("storageKeys"); | ||
| final List<Bytes32> storageKeys = accessListEntry.getStorageKeys(); | ||
| gen.writeArray( | ||
| storageKeys.stream().map(Bytes32::toHexString).toArray(String[]::new), | ||
| 0, | ||
| storageKeys.size()); | ||
| gen.writeEndObject(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.