abi: bring back eth_abi_mpint

Author: mhw0

include/ethc/abi.h

@@ -8,6 +8,7 @@ extern "C" {
 #include "ethc-common.h"
 #include <stddef.h>
 #include <stdint.h>
+#include <tommath.h>
 
 #define ETH_ABI_WORD_SIZE 32
 #define ETH_ABI_DYNAMIC_TYPE_POOL_SIZE 64
@@ -155,7 +156,7 @@ ETHC_EXPORT ETH_OP eth_abi_uint64(struct eth_abi *abi, uint64_t *d);
  * @param[inout] mpz Initialized mpz_t to read/write the data from/to.
  * @return `1` on success, `-1` otherwise.
  */
-// ETHC_EXPORT ETH_OP eth_abi_mpint(struct eth_abi *abi, mpz_t mpz);
+ETHC_EXPORT ETH_OP eth_abi_mpint(struct eth_abi *abi, mp_int *mpint);
 
 /*!
  * @brief Encodes/decodes address.

src/abi.c

@@ -704,6 +704,40 @@ ETH_OP eth_abi_bytes(struct eth_abi *abi, uint8_t *bytes, size_t *len) {
   return ETH_ERR_INVALID_ARGS;
 }
 
+ETH_OP eth_abi_mpint(struct eth_abi *abi, mp_int *mpint) {
+  struct ethc_abi_dynamic_type *ctype = NULL;
+  uint8_t buf[32] = {0}, size = 0;
+  ETH_OP op;
+
+  if (abi == NULL || mpint == NULL)
+    return ETH_ERR_INVALID_ARGS;
+
+  ethc_abi_type_stack_peek(&ctype, &abi->stack);
+
+  if (abi->m == ETH_ABI_ENCODE) {
+    size = mp_unsigned_bin_size(mpint);
+    if (size == 0 || size > 32)
+      return ETH_ERR_INVALID_ARGS;
+
+    if (mp_to_unsigned_bin(mpint, buf + (32 - size)) != MP_OKAY)
+      return ETH_ERR_UNKNOWN;
+
+    return eth_abi_bytes32(abi, buf);
+  }
+
+  if (abi->m == ETH_ABI_DECODE) {
+    if ((op = eth_abi_bytes32(abi, buf)) != ETH_OK)
+      return op;
+
+    if (mp_read_unsigned_bin(mpint, buf, 32) != MP_OKAY)
+      return ETH_ERR_INVALID_ARGS;
+
+    return ETH_OK;
+  }
+
+  return ETH_ERR_INVALID_ARGS;
+}
+
 ETH_OP eth_abi_from_hex(struct eth_abi *abi, char *hex, int len) {
   struct ethc_abi_dynamic_type *ntype = NULL;
   uint8_t *buf = NULL;

test/run-tests.c

@@ -43,6 +43,7 @@ int main() {
   test_eth_abi_bytes32();
   test_eth_abi_address();
   test_eth_abi_bytes();
+  test_eth_abi_mpint();
   test_eth_abi_array();
   test_eth_abi_call();
 

test/test-eth-abi.c

@@ -245,36 +245,43 @@ void test_eth_abi_int64(void) {
   ok(d2 == -0x7cf23097b81adc30 && d3 == 0x45fd66a734b67d50, "encode -0x7cf23097b81adc30 and 0x45fd66a734b67d50");
 }
 
-// void test_eth_abi_mpint(void) {
-//   struct eth_abi abi0, abi1;
-//   size_t hexlen;
-//   char *hex;
-//   mpz_t mpz0, mpz1, mpz2;
-// 
-//   mpz_init_set_str(mpz0, "0xff", 0);
-//   mpz_init_set_str(mpz1, "0xfff", 0);
-//   mpz_init_set_str(mpz2, "0xbbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 0);
-// 
-//   ok(eth_abi_init(&abi0, ETH_ABI_ENCODE) == 1);
-//   ok(eth_abi_mpint(&abi0, mpz0) == 1);
-//   ok(eth_abi_mpint(&abi0, mpz1) == 1);
-//   ok(eth_abi_mpint(&abi0, mpz2) == 1);
-//   ok(eth_abi_to_hex(&abi0, &hex, &hexlen) == 1);
-// 
-//   is(hex, "00000000000000000000000000000000000000000000000000000000000000ff"
-//           "0000000000000000000000000000000000000000000000000000000000000fff"
-//           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-//   mpz_clears(mpz0, mpz1, mpz2, NULL);
-//   free(hex);
-// 
-//   ok(eth_abi_from_hex(&abi1,
-//         "0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff", -1) == 1);
-//   mpz_init_set_str(mpz0, "0x0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff", 0);
-//   mpz_init(mpz1);
-//   ok(eth_abi_mpint(&abi1, mpz1) == 1);
-//   ok(mpz_cmp(mpz0, mpz1) == 0);
-//   mpz_clears(mpz0, mpz1, NULL);
-// }
+void test_eth_abi_mpint(void) {
+  struct eth_abi abi0={0}, abi1={0};
+  mp_int int0, int1, int2, int3, int4;
+  size_t hexlen;
+  char *hex;
+
+  diag("eth_abi_mpint()");
+
+  assert(mp_init_multi(&int0, &int1, &int2, &int3, &int4, NULL) == MP_OKAY);
+
+  assert(mp_read_radix(&int0, "ff", 16) == MP_OKAY);
+  assert(mp_read_radix(&int1, "fff", 16) == MP_OKAY);
+  assert(mp_read_radix(&int2, "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16) == MP_OKAY);
+
+  assert(eth_abi_init(&abi0, ETH_ABI_ENCODE) == ETH_OK);
+
+  assert(eth_abi_mpint(&abi0, &int0) == ETH_OK);
+  assert(eth_abi_mpint(&abi0, &int1) == ETH_OK);
+  assert(eth_abi_mpint(&abi0, &int2) == ETH_OK);
+
+  assert(eth_abi_to_hex(&abi0, &hex, &hexlen) == ETH_OK);
+  is(hex, "00000000000000000000000000000000000000000000000000000000000000ff"
+          "0000000000000000000000000000000000000000000000000000000000000fff"
+          "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+          "encode 0xff, 0xfff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+  free(hex);
+
+
+  assert(eth_abi_from_hex(&abi1,
+        "0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff", -1) == ETH_OK);
+  assert(mp_read_radix(&int3, "0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16) == ETH_OK);
+
+  assert(eth_abi_mpint(&abi1, &int4) == ETH_OK);
+
+  ok(mp_cmp(&int3, &int4) == MP_EQ, "decode 0x0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+  mp_clear_multi(&int0, &int1, &int2, &int3, &int4, NULL);
+}
 
 void test_eth_abi_bytes8() {
   struct eth_abi abi0={0}, abi1={0};