feat: Change port binding to be limited to only one module (#382)

Author: AntonAndell

contracts/javascore/ibc/src/main/java/ibc/ics05/port/ModuleManager.java

@@ -22,8 +22,8 @@ public void bindPort(String portId, Address moduleAddress) {
      * lookupModuleByPort will return the IBCModule along with the capability associated with a given portID
      */
     public IIBCModuleScoreInterface lookupModuleByPort(String portId) {
-        ArrayDB<Address> modules = lookupModules(portCapabilityPath(portId));
-        return new IIBCModuleScoreInterface(modules.get(0));
+        Address module = lookupModules(portCapabilityPath(portId));
+        return new IIBCModuleScoreInterface(module);
 
     }
 
@@ -32,8 +32,8 @@ public IIBCModuleScoreInterface lookupModuleByPort(String portId) {
      * defined by its portID and channelID
      */
     public IIBCModuleScoreInterface lookupModuleByChannel(String portId, String channelId) {
-        ArrayDB<Address> modules = lookupModules(channelCapabilityPath(portId, channelId));
-        return new IIBCModuleScoreInterface(modules.get(0));
+        Address module = lookupModules(channelCapabilityPath(portId, channelId));
+        return new IIBCModuleScoreInterface(module);
     }
 
     /**
@@ -66,6 +66,6 @@ public byte[] channelCapabilityPath(String portId, String channelId) {
      * lookupModule will return the IBCModule address bound to a given name. Currently, the function returns only one
      * module.
      */
-    public abstract ArrayDB<Address> lookupModules(byte[] name);
+    public abstract Address lookupModules(byte[] name);
 
 }

contracts/javascore/ibc/src/main/java/ibc/ics24/host/IBCHost.java

@@ -21,15 +21,9 @@ public class IBCHost extends IBCStore {
      *
      */
     public void claimCapability(byte[] name, Address addr) {
-        ArrayDB<Address> capability = capabilities.at(name);
-        int capabilitiesCount = capability.size();
-        if (capabilitiesCount == 0) {
-            portIds.add(name);
-        }
-        for (int i = 0; i < capabilitiesCount; i++) {
-            Context.require(!capability.get(i).equals(addr), TAG + "Capability already claimed");
-        }
-        capability.add(addr);
+        Context.require(capabilities.get(name) == null,  TAG + "Capability already claimed");
+        portIds.add(name);
+        capabilities.set(name, addr);
     }
 
     /**
@@ -42,14 +36,7 @@ public void claimCapability(byte[] name, Address addr) {
      */
     public boolean authenticateCapability(byte[] name) {
         Address caller = Context.getCaller();
-        ArrayDB<Address> capability = capabilities.at(name);
-        int capabilitiesCount = capability.size();
-        for (int i = 0; i < capabilitiesCount; i++) {
-            if (capability.get(i).equals(caller)) {
-                return Boolean.TRUE;
-            }
-        }
-        return Boolean.FALSE;
+        return caller.equals(capabilities.get(name));
     }
 
     /**
@@ -58,10 +45,10 @@ public boolean authenticateCapability(byte[] name) {
      * @param name Name of the capability
      * @return ArrayDB of addresses having the capability
      */
-    public ArrayDB<Address> lookupModules(byte[] name) {
-        ArrayDB<Address> modules = capabilities.at(name);
-        Context.require(modules.size() > 0, "Module not found");
-        return modules;
+    public Address lookupModules(byte[] name) {
+        Address module = capabilities.get(name);
+        Context.require(module != null,  "Module not found");
+        return module;
     }
 
     /**

contracts/javascore/ibc/src/main/java/ibc/ics24/host/IBCStore.java

@@ -56,7 +56,7 @@ public abstract class IBCStore extends ModuleManager implements IIBCHost {
     public static final BranchDB<String, BranchDB<String, DictDB<BigInteger, Boolean>>> packetReceipts = Context
             .newBranchDB(PACKET_RECEIPTS, Boolean.class);
 
-    public static final BranchDB<byte[], ArrayDB<Address>> capabilities = Context.newBranchDB(CAPABILITIES, Address.class);
+    public static final DictDB<byte[],Address> capabilities = Context.newDictDB(CAPABILITIES, Address.class);
     public static final ArrayDB<byte[]> portIds = Context.newArrayDB(PORT_IDS, byte[].class);
     // Host Parameters
     public static final VarDB<BigInteger> expectedTimePerBlock = Context.newVarDB(EXPECTED_TIME_PER_BLOCK, BigInteger.class);
@@ -120,15 +120,8 @@ public boolean getPacketReceipt(String portId, String channelId, BigInteger sequ
     }
 
     @External(readonly = true)
-    public String[] getCapability(byte[] name) {
-        ArrayDB<Address> arrayDB = capabilities.at(name);
-        final int size = arrayDB.size();
-        String[] capability = new String[size];
-        for (int i = 0; i < size; i++) {
-            capability[i] = arrayDB.get(i).toString();
-        }
-
-        return capability;
+    public Address getCapability(byte[] name) {
+        return capabilities.get(name);
     }
 
     @External(readonly = true)

contracts/javascore/ibc/src/test/java/ibc/ics25/handler/IBCHandlerTest.java

@@ -9,6 +9,7 @@
 import static org.mockito.Mockito.verify;
 
 import java.math.BigInteger;
+import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -17,6 +18,7 @@
 import com.iconloop.score.test.Account;
 
 import ibc.icon.structs.messages.*;
+import score.Address;
 import test.proto.core.channel.ChannelOuterClass.Packet;
 
 public class IBCHandlerTest extends IBCHandlerTestBase {
@@ -237,6 +239,26 @@ void handlerAdminPermissions() {
         assertOnlyCallableBy(owner, "setExpectedTimePerBlock", BigInteger.TWO);
     }
 
+    @Test
+    @SuppressWarnings("unchecked")
+    void bindPort() {
+        // Arrange
+        handler.invoke(owner, "bindPort", portId, module.getAddress());
+
+        // Act & Assert
+        String expectedErrorMessage = "Capability already claimed";
+        Executable alreadyClaimed = () -> handler.invoke(owner, "bindPort", portId, sm.createAccount().getAddress());
+        AssertionError e = assertThrows(AssertionError.class, alreadyClaimed);
+        assertTrue(e.getMessage().contains(expectedErrorMessage));
+
+        // Assert
+        List<byte[]> ports = (List<byte[]>)handler.call("getBindPorts");
+        Address portModule = (Address)handler.call("getCapability", ports.get(0));
+
+        assertEquals(1, ports.size());
+        assertEquals(module.getAddress(), portModule);
+    }
+
     private void assertOnlyCallableBy(Account authorizedCaller, String method, Object... params) {
         Account nonOwner = sm.createAccount();
         String expectedErrorMessage = "Reverted(0): SenderNotScoreOwner: Sender=" + nonOwner.getAddress()

contracts/javascore/lib/src/main/java/ibc/icon/interfaces/IIBCHost.java

@@ -39,7 +39,7 @@ public interface IIBCHost {
     boolean getPacketReceipt(String portId, String channelId, BigInteger sequence);
 
     @External(readonly = true)
-    String[] getCapability(byte[] name);
+    Address getCapability(byte[] name);
 
     @External(readonly = true)
     BigInteger getExpectedTimePerBlock();