Skip to content

Fix indexed event decoding for non-dynamic topic values #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 4 commits into
base: release-3.9.0
Choose a base branch
from
+57 −3
Open

Fix indexed event decoding for non-dynamic topic values #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5ec923
Remove outdated fisco-bcos.org URL from Maven POM metadata (#946)
Copilot Mar 4, 2026
8af29be
Initial plan
Copilot Jun 16, 2026
7b5f9bb
Fix indexed event value decoding
Copilot Jun 16, 2026
66acecd
Merge branch 'release-3.9.0' into copilot/fix-contractcodec-decode-in…
kyonRay Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ publishing {
pom {
name = 'fisco-bcos'
description = 'fisco-bcos java-sdk'
url = 'http://www.fisco-bcos.org'
url = 'https://github.com/FISCO-BCOS/java-sdk'

licenses {
license {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/fisco/bcos/sdk/v3/codec/ContractCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,11 @@ public List<String> decodeIndexedEvent(EventLog log, ABIDefinition abiDefinition
ABIObject indexedObject = eventIndexedObject.get(i - 1);
if (indexedObject.isDynamic()) {
topics.add(log.getTopics().get(i));
} else if (indexedObject.getType() == ABIObject.ObjectType.VALUE) {
ABIObject decodedIndexedObject =
ContractCodecTools.decode(
indexedObject, Hex.decode(log.getTopics().get(i)), isWasm);
topics.add(contractCodecJsonWrapper.decode(decodedIndexedObject).asText());
Comment on lines +1043 to +1047
} else {
List<String> objects =
contractCodecJsonWrapper.decode(
Expand Down
53 changes: 51 additions & 2 deletions src/test/java/org/fisco/bcos/sdk/v3/test/codec/abi/ABIEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package org.fisco.bcos.sdk.v3.test.codec.abi;

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;

import org.fisco.bcos.sdk.v3.codec.abi.TypeEncoder;
import org.fisco.bcos.sdk.v3.codec.abi.tools.TopicTools;
Comment on lines +3 to +7
import org.fisco.bcos.sdk.v3.codec.datatypes.generated.Uint256;
import org.fisco.bcos.sdk.v3.codec.wrapper.ABIDefinition;
import org.fisco.bcos.sdk.v3.codec.ContractCodec;
import org.fisco.bcos.sdk.v3.codec.ContractCodecException;
import org.fisco.bcos.sdk.v3.test.codec.TestUtils;
import org.fisco.bcos.sdk.v3.model.EventLog;
import org.fisco.bcos.sdk.v3.test.codec.TestUtils;
import org.fisco.bcos.sdk.v3.utils.Numeric;
import org.junit.Assert;
import org.junit.Test;

Expand All @@ -15,6 +20,8 @@ public class ABIEventTest {
"[{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"_addrDArray\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"_addr\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getUint256\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"v\",\"type\":\"uint256\"}],\"name\":\"incrementUint256\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"_bytesV\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"_s\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"getSArray\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256[2]\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"bytesArray\",\"type\":\"bytes1[]\"}],\"name\":\"setBytesMapping\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"b\",\"type\":\"bytes\"}],\"name\":\"setBytes\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"i\",\"type\":\"int256\"},{\"name\":\"a\",\"type\":\"address[]\"},{\"name\":\"s\",\"type\":\"string\"}],\"name\":\"setValues\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"b\",\"type\":\"bytes1\"}],\"name\":\"getByBytes\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes1[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"_intV\",\"outputs\":[{\"name\":\"\",\"type\":\"int256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"emptyArgs\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"name\":\"i\",\"type\":\"int256\"},{\"name\":\"s\",\"type\":\"string\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"a\",\"type\":\"uint256\"}],\"name\":\"LogIncrement\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"s\",\"type\":\"string\"}],\"name\":\"LogInit\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"i\",\"type\":\"int256\"},{\"indexed\":false,\"name\":\"a\",\"type\":\"address[]\"},{\"indexed\":false,\"name\":\"s\",\"type\":\"string\"}],\"name\":\"LogSetValues\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"o\",\"type\":\"bytes\"},{\"indexed\":false,\"name\":\"b\",\"type\":\"bytes\"}],\"name\":\"LogSetBytes\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"o\",\"type\":\"uint256[2]\"},{\"indexed\":false,\"name\":\"n\",\"type\":\"uint256[2]\"}],\"name\":\"LogSetSArray\",\"type\":\"event\"}]";
private static final String encoded =
"0x0000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000147365742076616c75657320e5ad97e7aca6e4b8b2000000000000000000000000";
private static final String indexedAbi =
"[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"id\",\"type\":\"uint256\"},{\"indexed\":false,\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"Transfer\",\"type\":\"event\"}]";

@Test
public void testDecode() {
Expand All @@ -32,4 +39,46 @@ public void testDecode() {
Assert.fail(e.getMessage());
}
}

@Test
public void testDecodeIndexedEventByInterface() {
ContractCodec abiCodec = new ContractCodec(TestUtils.getCryptoSuite(), false);
String eventSignature = "Transfer(address,uint256,uint256)";
String from = "0x0000000000000000000000000000000000000123";
BigInteger id = BigInteger.valueOf(42);
BigInteger value = BigInteger.valueOf(99);

List<String> topics = new ArrayList<>();
topics.add(Numeric.toHexString(abiCodec.getFunctionEncoder().buildMethodId(eventSignature)));
TopicTools topicTools = new TopicTools(TestUtils.getCryptoSuite());
topics.add(topicTools.addressToTopic(from));
topics.add(topicTools.integerToTopic(id));

EventLog log = new EventLog(Numeric.toHexString(TypeEncoder.encode(new Uint256(value))), topics);
ABIDefinition abiDefinition = TestUtils.getContractABIDefinition(indexedAbi).getEvents().get("Transfer").get(0);
Comment on lines +51 to +58

try {
List<String> decodedTopics = abiCodec.decodeIndexedEvent(log, abiDefinition);
Assert.assertEquals(3, decodedTopics.size());
Assert.assertEquals(topics.get(0), decodedTopics.get(0));
Assert.assertEquals(from, decodedTopics.get(1));
Assert.assertEquals(id.toString(), decodedTopics.get(2));

List<Object> decodedByInterface =
abiCodec.decodeEventByInterface(indexedAbi, eventSignature, log);
Assert.assertEquals(3, decodedByInterface.size());
Assert.assertEquals(from, decodedByInterface.get(0));
Assert.assertEquals(id.toString(), decodedByInterface.get(1));
Assert.assertEquals(value, decodedByInterface.get(2));

List<String> decodedByInterfaceToString =
abiCodec.decodeEventByInterfaceToString(indexedAbi, eventSignature, log);
Assert.assertEquals(3, decodedByInterfaceToString.size());
Assert.assertEquals(from, decodedByInterfaceToString.get(0));
Assert.assertEquals(id.toString(), decodedByInterfaceToString.get(1));
Assert.assertEquals(value.toString(), decodedByInterfaceToString.get(2));
} catch (ContractCodecException | ClassNotFoundException e) {
Assert.fail(e.getMessage());
}
}
}
Loading