fix bug in copy constructor codegen

properly generate offset when length is more than 1 byte long

Author: z80dev

puff/codegen.rkt

@@ -13,8 +13,15 @@
          [sz-str (if (odd? (string-length sz-str))
                      (string-append "0" sz-str)
                      sz-str)]
-         [sz-hex-str (string-append "0x" sz-str)])
-    (append (hex->instrs sz-hex-str) '("DUP1" "PUSH1" "0x09" "RETURNDATASIZE" "CODECOPY" "RETURNDATASIZE" "RETURN"))))
+         [sz-hex-str (string-append "0x" sz-str)]
+         ;; Calculate the correct offset based on length bytes
+         [length-bytes (ceiling (/ (string-length sz-str) 2))]
+         [offset-str (number->string (+ 9 (- length-bytes 1)) 16)]
+         [offset-str (if (odd? (string-length offset-str))
+                         (string-append "0" offset-str)
+                         offset-str)]
+         [offset-val (format "0x~a" offset-str)])
+    (append (hex->instrs sz-hex-str) (list "DUP1" "PUSH1" offset-val "RETURNDATASIZE" "CODECOPY" "RETURNDATASIZE" "RETURN"))))
 
 (provide
          generate-copy-constructor)

test/LongJumps.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import {Test, console} from "forge-std/Test.sol";
-import {PuffDeployer} from "../src/Deployers.sol";
+import {PuffDeployer, HuffDeployer} from "../src/Deployers.sol";
 
 // These interfaces define callable functions on our test contracts
 interface ISaysHello {
@@ -11,9 +11,11 @@ interface ISaysHello {
 
 contract LongJumpsTest is Test {
     PuffDeployer public puffDeployer;
+    HuffDeployer public huffDeployer;
 
     function setUp() public {
         puffDeployer = new PuffDeployer();
+        huffDeployer = new HuffDeployer();
     }
 
     function test_longJump() public {
@@ -26,4 +28,14 @@ contract LongJumpsTest is Test {
         assertEq(message, 0x0000000000000000000000000000000000000048656c6c6f2c20576f726c6421);
     }
 
+    function test_longJump_Huff() public {
+        address newContract = huffDeployer.deployContract("examples/long_jump.huff");
+        ISaysHello jumper = ISaysHello(newContract);
+        bytes32 message = jumper.sayHello();
+
+        // The expected output is "Hello, World!" right-aligned in a bytes32
+
+        assertEq(message, 0x0000000000000000000000000000000000000048656c6c6f2c20576f726c6421);
+    }
+
 }