Merge branch 'dev'

mhw0 · Sep 13, 2023 · 3718a6f · 3718a6f
2 parents 77526b3 + b5a7785
commit 3718a6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/abi.c b/src/abi.c
@@ -652,8 +652,9 @@ int eth_abi_mpint(struct eth_abi *abi, mpz_t mpz) {
     mpz_init(mpztmp);
     mpz_and(mpztmp, mpz, mpzmask);
 
-    size = mpz_sizeinbase(mpztmp, 16) / 2;
-    mpz_export(&(bytes[32]) - size, NULL, 1, sizeof(uint8_t), 0, 0, mpz);
+    size = mpz_sizeinbase(mpztmp, 16);
+    size = (size % 2 == 0 ? size : size + 1) / 2;
+    mpz_export((bytes + 32) - size, NULL, 1, sizeof(uint8_t), 0, 0, mpz);
     mpz_clears(mpztmp, mpzmask, NULL);
 
     return eth_abi_bytes32(abi, bytes);

diff --git a/test/test-eth-abi.c b/test/test-eth-abi.c
@@ -245,19 +245,22 @@ void test_eth_abi_mpint(void) {
   struct eth_abi abi0, abi1;
   size_t hexlen;
   char *hex;
-  mpz_t mpz0, mpz1;
+  mpz_t mpz0, mpz1, mpz2;
 
   mpz_init_set_str(mpz0, "0xff", 0);
-  mpz_init_set_str(mpz1, "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbb", 0);
+  mpz_init_set_str(mpz1, "0xfff", 0);
+  mpz_init_set_str(mpz2, "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbb", 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, NULL);
+  mpz_clears(mpz0, mpz1, mpz2, NULL);
   free(hex);
 
   ok(eth_abi_from_hex(&abi1,