diff --git a/tests/test.nim b/tests/test.nim
index 6e4ac5f..7e444b1 100644
--- a/tests/test.nim
+++ b/tests/test.nim
@@ -52,7 +52,7 @@ contract MetaCoin {
 contract(MetaCoin):
   proc sendCoin(receiver: Address, amount: Uint256): Bool
   proc getBalance(address: Address): Uint256 {.view.}
-  proc Transfer(fromAddr: indexed[Address], toAddr: indexed[Address], value: Uint256) {.event.}
+  proc Transfer(fromAddr, toAddr: indexed[Address], value: Uint256) {.event.}
   proc BlaBla(fromAddr: indexed[Address]) {.event.}
 
 const MetaCoinCode = "608060405234801561001057600080fd5b5032600090815260208190526040902061271090556101c2806100346000396000f30060806040526004361061004b5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166390b98a118114610050578063f8b2cb4f14610095575b600080fd5b34801561005c57600080fd5b5061008173ffffffffffffffffffffffffffffffffffffffff600435166024356100d5565b604080519115158252519081900360200190f35b3480156100a157600080fd5b506100c373ffffffffffffffffffffffffffffffffffffffff6004351661016e565b60408051918252519081900360200190f35b336000908152602081905260408120548211156100f457506000610168565b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060015b92915050565b73ffffffffffffffffffffffffffffffffffffffff16600090815260208190526040902054905600a165627a7a72305820000313ec0ebbff4ffefbe79d615d0ab019d8566100c40eb95a4eee617a87d1090029"
diff --git a/tests/test_deposit_contract.nim b/tests/test_deposit_contract.nim
index f0e01b0..5a039a9 100644
--- a/tests/test_deposit_contract.nim
+++ b/tests/test_deposit_contract.nim
@@ -3,10 +3,11 @@ import chronos, nimcrypto, options, json, stint
 import test_utils
 
 contract(DepositContract):
-    proc deposit(pubkey: Bytes48, withdrawalCredentials: Bytes32, signature: Bytes96)
-    proc Deposit(pubkey: Bytes48, withdrawalCredentials: Bytes32, amount: Bytes8, signature: Bytes96, merkleTreeIndex: Bytes8) {.event.}
-  
-const contractCode = "0x600035601c52740100000000000000000000000000000000000000006020526f7fffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff8000000000000000000000000000000060605274012a05f1fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffed5fa0e000000000000000000000000000000000060a052341561009e57600080fd5b6101406000601f818352015b600061014051602081106100bd57600080fd5b600260c052602060c020015460208261016001015260208101905061014051602081106100e957600080fd5b600260c052602060c020015460208261016001015260208101905080610160526101609050602060c0825160208401600060025af161012757600080fd5b60c0519050606051600161014051018060405190131561014657600080fd5b809190121561015457600080fd5b6020811061016157600080fd5b600260c052602060c02001555b81516001018083528114156100aa575b50506111c656600035601c52740100000000000000000000000000000000000000006020526f7fffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff8000000000000000000000000000000060605274012a05f1fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffed5fa0e000000000000000000000000000000000060a052600015610277575b6101605261014052600061018052610140516101a0526101c060006008818352015b61018051600860008112156100da578060000360020a82046100e1565b8060020a82025b905090506101805260ff6101a051166101e052610180516101e0516101805101101561010c57600080fd5b6101e0516101805101610180526101a0517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff86000811215610155578060000360020a820461015c565b8060020a82025b905090506101a0525b81516001018083528114156100bd575b50506018600860208206610200016020828401111561019357600080fd5b60208061022082610180600060046015f15050818152809050905090508051602001806102c0828460006004600a8704601201f16101d057600080fd5b50506102c05160206001820306601f82010390506103206102c0516008818352015b826103205111156102025761021e565b6000610320516102e001535b81516001018083528114156101f2575b50505060206102a05260406102c0510160206001820306601f8201039050610280525b6000610280511115156102535761026f565b602061028051036102a001516020610280510361028052610241565b610160515650005b63c5f2892f60005114156103cf57341561029057600080fd5b6000610140526001546101605261018060006020818352015b600160016101605116141561032a57600061018051602081106102cb57600080fd5b600060c052602060c02001546020826102200101526020810190506101405160208261022001015260208101905080610220526102209050602060c0825160208401600060025af161031c57600080fd5b60c051905061014052610398565b6000610140516020826101a0010152602081019050610180516020811061035057600080fd5b600260c052602060c02001546020826101a0010152602081019050806101a0526101a09050602060c0825160208401600060025af161038e57600080fd5b60c0519050610140525b61016060026103a657600080fd5b60028151048152505b81516001018083528114156102a9575b50506101405160005260206000f3005b63621fd13060005114156104e15734156103e857600080fd5b63806732896101405260015461016052610160516006580161009b565b506101c0526000610220525b6101c05160206001820306601f8201039050610220511015156104335761044c565b610220516101e001526102205160200161022052610411565b6101c0805160200180610280828460006004600a8704601201f161046f57600080fd5b50506102805160206001820306601f82010390506102e0610280516008818352015b826102e05111156104a1576104bd565b60006102e0516102a001535b8151600101808352811415610491575b5050506020610260526040610280510160206001820306601f8201039050610260f3005b63c47e300d600051141561103b57606060046101403760506004356004016101a037603060043560040135111561051757600080fd5b604060243560040161022037602060243560040135111561053757600080fd5b608060443560040161028037606060443560040135111561055757600080fd5b63ffffffff6001541061056957600080fd5b633b9aca00610340526103405161057f57600080fd5b61034051340461032052633b9aca0061032051101561059d57600080fd5b60306101a051146105ad57600080fd5b602061022051146105bd57600080fd5b606061028051146105cd57600080fd5b6101a0516101c0516101e05161020051610220516102405161026051610280516102a0516102c0516102e05161030051610320516103405161036051610380516103a05163806732896103c052610320516103e0526103e0516006580161009b565b506104405260006104a0525b6104405160206001820306601f82010390506104a05110151561065d57610676565b6104a05161046001526104a0516020016104a05261063b565b6103a05261038052610360526103405261032052610300526102e0526102c0526102a05261028052610260526102405261022052610200526101e0526101c0526101a052610440805160200180610360828460006004600a8704601201f16106dd57600080fd5b50506101a0516101c0516101e05161020051610220516102405161026051610280516102a0516102c0516102e05161030051610320516103405161036051610380516103a0516103c0516103e05161040051610420516104405161046051610480516104a05163806732896104c0526001546104e0526104e0516006580161009b565b506105405260006105a0525b6105405160206001820306601f82010390506105a05110151561078e576107a7565b6105a05161056001526105a0516020016105a05261076c565b6104a05261048052610460526104405261042052610400526103e0526103c0526103a05261038052610360526103405261032052610300526102e0526102c0526102a05261028052610260526102405261022052610200526101e0526101c0526101a0526105408051602001806105c0828460006004600a8704601201f161082e57600080fd5b505060a06106405261064051610680526101a08051602001806106405161068001828460006004600a8704601201f161086657600080fd5b505061064051610680015160206001820306601f8201039050610640516106800161062081516040818352015b83610620511015156108a4576108c1565b6000610620516020850101535b8151600101808352811415610893575b50505050602061064051610680015160206001820306601f820103905061064051010161064052610640516106a0526102208051602001806106405161068001828460006004600a8704601201f161091857600080fd5b505061064051610680015160206001820306601f8201039050610640516106800161062081516020818352015b836106205110151561095657610973565b6000610620516020850101535b8151600101808352811415610945575b50505050602061064051610680015160206001820306601f820103905061064051010161064052610640516106c0526103608051602001806106405161068001828460006004600a8704601201f16109ca57600080fd5b505061064051610680015160206001820306601f8201039050610640516106800161062081516020818352015b8361062051101515610a0857610a25565b6000610620516020850101535b81516001018083528114156109f7575b50505050602061064051610680015160206001820306601f820103905061064051010161064052610640516106e0526102808051602001806106405161068001828460006004600a8704601201f1610a7c57600080fd5b505061064051610680015160206001820306601f8201039050610640516106800161062081516060818352015b8361062051101515610aba57610ad7565b6000610620516020850101535b8151600101808352811415610aa9575b50505050602061064051610680015160206001820306601f82010390506106405101016106405261064051610700526105c08051602001806106405161068001828460006004600a8704601201f1610b2e57600080fd5b505061064051610680015160206001820306601f8201039050610640516106800161062081516020818352015b8361062051101515610b6c57610b89565b6000610620516020850101535b8151600101808352811415610b5b575b50505050602061064051610680015160206001820306601f8201039050610640510101610640527fdc5fc95703516abd38fa03c3737ff3b52dc52347055c8028460fdf5bbe2f12ce61064051610680a160006107205260006101a06030806020846107e001018260208501600060046016f150508051820191505060006010602082066107600160208284011115610c2057600080fd5b60208061078082610720600060046015f15050818152809050905090506010806020846107e001018260208501600060046013f1505080518201915050806107e0526107e09050602060c0825160208401600060025af1610c8057600080fd5b60c0519050610740526000600060406020820661088001610280518284011115610ca957600080fd5b6060806108a0826020602088068803016102800160006004601bf1505081815280905090509050602060c0825160208401600060025af1610ce957600080fd5b60c0519050602082610a800101526020810190506000604060206020820661094001610280518284011115610d1d57600080fd5b606080610960826020602088068803016102800160006004601bf1505081815280905090509050602080602084610a0001018260208501600060046015f150508051820191505061072051602082610a0001015260208101905080610a0052610a009050602060c0825160208401600060025af1610d9a57600080fd5b60c0519050602082610a8001015260208101905080610a8052610a809050602060c0825160208401600060025af1610dd157600080fd5b60c0519050610860526000600061074051602082610b20010152602081019050610220602080602084610b2001018260208501600060046015f150508051820191505080610b2052610b209050602060c0825160208401600060025af1610e3757600080fd5b60c0519050602082610ca00101526020810190506000610360600880602084610c2001018260208501600060046012f15050805182019150506000601860208206610ba00160208284011115610e8c57600080fd5b602080610bc082610720600060046015f1505081815280905090509050601880602084610c2001018260208501600060046014f150508051820191505061086051602082610c2001015260208101905080610c2052610c209050602060c0825160208401600060025af1610eff57600080fd5b60c0519050602082610ca001015260208101905080610ca052610ca09050602060c0825160208401600060025af1610f3657600080fd5b60c0519050610b00526001805460018254011015610f5357600080fd5b6001815401815550600154610d2052610d4060006020818352015b60016001610d2051161415610fa357610b0051610d405160208110610f9257600080fd5b600060c052602060c0200155611037565b6000610d405160208110610fb657600080fd5b600060c052602060c0200154602082610d60010152602081019050610b0051602082610d6001015260208101905080610d6052610d609050602060c0825160208401600060025af161100757600080fd5b60c0519050610b0052610d20600261101e57600080fd5b60028151048152505b8151600101808352811415610f6e575b5050005b60006000fd5b6101856111c6036101856000396101856111c6036000f3"
+  proc deposit(pubkey: Bytes48, withdrawalCredentials: Bytes32, signature: Bytes96, deposit_data_root: FixedBytes[32])
+  proc get_deposit_root(): FixedBytes[32]
+  proc DepositEvent(pubkey: Bytes48, withdrawalCredentials: Bytes32, amount: Bytes8, signature: Bytes96, merkleTreeIndex: Bytes8) {.event.}
+
+const contractCode = "0x740100000000000000000000000000000000000000006020526f7fffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff8000000000000000000000000000000060605274012a05f1fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffed5fa0e000000000000000000000000000000000060a052341561009857600080fd5b6101406000601f818352015b600061014051602081106100b757600080fd5b600260c052602060c020015460208261016001015260208101905061014051602081106100e357600080fd5b600260c052602060c020015460208261016001015260208101905080610160526101609050602060c0825160208401600060025af161012157600080fd5b60c0519050606051600161014051018060405190131561014057600080fd5b809190121561014e57600080fd5b6020811061015b57600080fd5b600260c052602060c02001555b81516001018083528114156100a4575b505061125e56600035601c52740100000000000000000000000000000000000000006020526f7fffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff8000000000000000000000000000000060605274012a05f1fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffed5fa0e000000000000000000000000000000000060a052600015610277575b6101605261014052600061018052610140516101a0526101c060006008818352015b61018051600860008112156100da578060000360020a82046100e1565b8060020a82025b905090506101805260ff6101a051166101e052610180516101e0516101805101101561010c57600080fd5b6101e0516101805101610180526101a0517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff86000811215610155578060000360020a820461015c565b8060020a82025b905090506101a0525b81516001018083528114156100bd575b50506018600860208206610200016020828401111561019357600080fd5b60208061022082610180600060046015f15050818152809050905090508051602001806102c0828460006004600a8704601201f16101d057600080fd5b50506102c05160206001820306601f82010390506103206102c0516008818352015b826103205111156102025761021e565b6000610320516102e001535b81516001018083528114156101f2575b50505060206102a05260406102c0510160206001820306601f8201039050610280525b6000610280511115156102535761026f565b602061028051036102a001516020610280510361028052610241565b610160515650005b63c5f2892f600051141561050957341561029057600080fd5b6000610140526101405161016052600154610180526101a060006020818352015b60016001610180511614156103325760006101a051602081106102d357600080fd5b600060c052602060c02001546020826102400101526020810190506101605160208261024001015260208101905080610240526102409050602060c0825160208401600060025af161032457600080fd5b60c0519050610160526103a0565b6000610160516020826101c00101526020810190506101a0516020811061035857600080fd5b600260c052602060c02001546020826101c0010152602081019050806101c0526101c09050602060c0825160208401600060025af161039657600080fd5b60c0519050610160525b61018060026103ae57600080fd5b60028151048152505b81516001018083528114156102b1575b505060006101605160208261046001015260208101905061014051610160516101805163806732896102e05260015461030052610300516006580161009b565b506103605260006103c0525b6103605160206001820306601f82010390506103c0511015156104355761044e565b6103c05161038001526103c0516020016103c052610413565b61018052610160526101405261036060088060208461046001018260208501600060046012f150508051820191505060006018602082066103e0016020828401111561049957600080fd5b60208061040082610140600060046015f150508181528090509050905060188060208461046001018260208501600060046014f150508051820191505080610460526104609050602060c0825160208401600060025af16104f957600080fd5b60c051905060005260206000f350005b63621fd130600051141561061c57341561052257600080fd5b63806732896101405260015461016052610160516006580161009b565b506101c0526000610220525b6101c05160206001820306601f82010390506102205110151561056d57610586565b610220516101e00152610220516020016102205261054b565b6101c0805160200180610280828460006004600a8704601201f16105a957600080fd5b50506102805160206001820306601f82010390506102e0610280516008818352015b826102e05111156105db576105f7565b60006102e0516102a001535b81516001018083528114156105cb575b5050506020610260526040610280510160206001820306601f8201039050610260f350005b632289511860005114156110d957605060043560040161014037603060043560040135111561064a57600080fd5b60406024356004016101c037602060243560040135111561066a57600080fd5b608060443560040161022037606060443560040135111561068a57600080fd5b63ffffffff6001541061069c57600080fd5b633b9aca006102e0526102e0516106b257600080fd5b6102e05134046102c052633b9aca006102c05110156106d057600080fd5b603061014051146106e057600080fd5b60206101c051146106f057600080fd5b6060610220511461070057600080fd5b610140610360525b6103605151602061036051016103605261036061036051101561072a57610708565b6380673289610380526102c0516103a0526103a0516006580161009b565b50610400526000610460525b6104005160206001820306601f8201039050610460511015156107765761078f565b6104605161042001526104605160200161046052610754565b610340610360525b61036051526020610360510361036052610140610360511015156107ba57610797565b610400805160200180610300828460006004600a8704601201f16107dd57600080fd5b5050610140610480525b61048051516020610480510161048052610480610480511015610809576107e7565b63806732896104a0526001546104c0526104c0516006580161009b565b50610520526000610580525b6105205160206001820306601f8201039050610580511015156108545761086d565b6105805161054001526105805160200161058052610832565b610460610480525b610480515260206104805103610480526101406104805110151561089857610875565b6105208051602001806105a0828460006004600a8704601201f16108bb57600080fd5b505060a06106205261062051610660526101408051602001806106205161066001828460006004600a8704601201f16108f357600080fd5b505061062051610660015160206001820306601f8201039050610620516106600161060081516040818352015b83610600511015156109315761094e565b6000610600516020850101535b8151600101808352811415610920575b50505050602061062051610660015160206001820306601f82010390506106205101016106205261062051610680526101c08051602001806106205161066001828460006004600a8704601201f16109a557600080fd5b505061062051610660015160206001820306601f8201039050610620516106600161060081516020818352015b83610600511015156109e357610a00565b6000610600516020850101535b81516001018083528114156109d2575b50505050602061062051610660015160206001820306601f820103905061062051010161062052610620516106a0526103008051602001806106205161066001828460006004600a8704601201f1610a5757600080fd5b505061062051610660015160206001820306601f8201039050610620516106600161060081516020818352015b8361060051101515610a9557610ab2565b6000610600516020850101535b8151600101808352811415610a84575b50505050602061062051610660015160206001820306601f820103905061062051010161062052610620516106c0526102208051602001806106205161066001828460006004600a8704601201f1610b0957600080fd5b505061062051610660015160206001820306601f8201039050610620516106600161060081516060818352015b8361060051101515610b4757610b64565b6000610600516020850101535b8151600101808352811415610b36575b50505050602061062051610660015160206001820306601f820103905061062051010161062052610620516106e0526105a08051602001806106205161066001828460006004600a8704601201f1610bbb57600080fd5b505061062051610660015160206001820306601f8201039050610620516106600161060081516020818352015b8361060051101515610bf957610c16565b6000610600516020850101535b8151600101808352811415610be8575b50505050602061062051610660015160206001820306601f8201039050610620510101610620527f649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c561062051610660a160006107005260006101406030806020846107c001018260208501600060046016f150508051820191505060006010602082066107400160208284011115610cad57600080fd5b60208061076082610700600060046015f15050818152809050905090506010806020846107c001018260208501600060046013f1505080518201915050806107c0526107c09050602060c0825160208401600060025af1610d0d57600080fd5b60c0519050610720526000600060406020820661086001610220518284011115610d3657600080fd5b606080610880826020602088068803016102200160006004601bf1505081815280905090509050602060c0825160208401600060025af1610d7657600080fd5b60c0519050602082610a600101526020810190506000604060206020820661092001610220518284011115610daa57600080fd5b606080610940826020602088068803016102200160006004601bf15050818152809050905090506020806020846109e001018260208501600060046015f1505080518201915050610700516020826109e0010152602081019050806109e0526109e09050602060c0825160208401600060025af1610e2757600080fd5b60c0519050602082610a6001015260208101905080610a6052610a609050602060c0825160208401600060025af1610e5e57600080fd5b60c0519050610840526000600061072051602082610b000101526020810190506101c0602080602084610b0001018260208501600060046015f150508051820191505080610b0052610b009050602060c0825160208401600060025af1610ec457600080fd5b60c0519050602082610c800101526020810190506000610300600880602084610c0001018260208501600060046012f15050805182019150506000601860208206610b800160208284011115610f1957600080fd5b602080610ba082610700600060046015f1505081815280905090509050601880602084610c0001018260208501600060046014f150508051820191505061084051602082610c0001015260208101905080610c0052610c009050602060c0825160208401600060025af1610f8c57600080fd5b60c0519050602082610c8001015260208101905080610c8052610c809050602060c0825160208401600060025af1610fc357600080fd5b60c0519050610ae052606435610ae05114610fdd57600080fd5b6001805460018254011015610ff157600080fd5b6001815401815550600154610d0052610d2060006020818352015b60016001610d005116141561104157610ae051610d20516020811061103057600080fd5b600060c052602060c02001556110d5565b6000610d20516020811061105457600080fd5b600060c052602060c0200154602082610d40010152602081019050610ae051602082610d4001015260208101905080610d4052610d409050602060c0825160208401600060025af16110a557600080fd5b60c0519050610ae052610d0060026110bc57600080fd5b60028151048152505b815160010180835281141561100c575b5050005b60006000fd5b61017f61125e0361017f60003961017f61125e036000f3"
 
 var contractAddress = Address.fromHex("e9d8d67ec115e8345606b3ab59fc71cec46761e4")
 
@@ -26,10 +27,11 @@ proc test() {.async.} =
   var pk = Bytes48.fromHex("0x97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb")
   var cr = Bytes32.fromHex("0xaa000000000000000000000000000000000000000000000000000000000000bb")
   var sig = Bytes96.fromHex("0xad606d747d9d8590583107e23b41d6191215495df34a34d767e81c3c7f1f2d7041f421f3486186044a02c3dd65a05b44061455c2ca7d6525db68d5fa146e34de8234d3acd8de7e00b971acd4458b740fa6368d437db2c8dae6b2011db9be2f07")
+  var dataRoot = FixedBytes[32].fromHex("0x60D0C2DAF1C10803DB5781D876CDBC42EADD52E6E49C2A1A7C1E5952B279E463")
 
   var fut = newFuture[void]()
 
-  let s = await ns.subscribe(Deposit, %*{"fromBlock": "0x0"}) do(pubkey: Bytes48, withdrawalCredentials: Bytes32, amount: Bytes8, signature: Bytes96, merkleTreeIndex: Bytes8):
+  let s = await ns.subscribe(DepositEvent, %*{"fromBlock": "0x0"}) do(pubkey: Bytes48, withdrawalCredentials: Bytes32, amount: Bytes8, signature: Bytes96, merkleTreeIndex: Bytes8):
     echo "onDeposit"
     echo "pubkey: ", pubkey
     echo "withdrawalCredentials: ", withdrawalCredentials
@@ -39,9 +41,9 @@ proc test() {.async.} =
     assert(pubkey == pk)
     fut.complete()
 
-  discard await ns.deposit(pk, cr, sig).send(value = 32.u256.ethToWei)
+  discard await ns.deposit(pk, cr, sig, dataRoot).send(value = 32.u256.ethToWei)
 
   await fut
-
+  echo "hash_tree_root: ", await ns.get_deposit_root().call()
 
 waitFor test()
diff --git a/web3.nim b/web3.nim
index 8b5997a..03ff74c 100644
--- a/web3.nim
+++ b/web3.nim
@@ -138,7 +138,9 @@ func decode*[N](input: string, offset: int, to: var Stint[N]): int =
   meaningfulLen
 
 func fixedEncode(a: openarray[byte]): EncodeResult =
-  result = (dynamic: false, data: "00".repeat(32 - a.len mod 32) & byteutils.toHex(a))
+  var padding = a.len mod 32
+  if padding != 0: padding = 32 - padding
+  result = (dynamic: false, data: "00".repeat(padding) & byteutils.toHex(a))
 
 func encode*[N](b: FixedBytes[N]): EncodeResult = fixedEncode(array[N, byte](b))
 func encode*(b: Address): EncodeResult = fixedEncode(array[20, byte](b))
@@ -175,7 +177,8 @@ func fromHex*(x: type Address, s: string): Address {.inline.} =
 
 func decodeFixed(input: string, offset: int, to: var openarray[byte]): int =
   let meaningfulLen = to.len * 2
-  let padding = (32 - to.len mod 32) * 2
+  var padding = to.len mod 32
+  if padding != 0: padding = (32 - padding) * 2
   let offset = offset + padding
   fromHexAux(input[offset .. offset + meaningfulLen - 1], to)
   meaningfulLen + padding
@@ -219,7 +222,7 @@ template typeSignature(T: typedesc): string =
   elif T is DynamicBytes:
     "bytes"
   elif T is FixedBytes:
-    "byte" & $T.N
+    "bytes" & $T.N
   elif T is StUint:
     "uint" & $T.bits
   elif T is Address:
@@ -369,23 +372,13 @@ type
     function, constructor, event
   MutabilityKind = enum
     pure, view, nonpayable, payable
-  SequenceKind = enum
-    single, fixed, dynamic
   FunctionInputOutput = object
     name: string
-    typ: string
-    case sequenceKind: SequenceKind
-    of single, dynamic: discard
-    of fixed:
-      count: int
+    typ: NimNode
   EventInput = object
     name: string
-    typ: string
+    typ: NimNode
     indexed: bool
-    case sequenceKind: SequenceKind
-    of single, dynamic: discard
-    of fixed:
-      count: int
   FunctionObject = object
     name: string
     stateMutability: MutabilityKind
@@ -412,7 +405,7 @@ proc getSignature(function: FunctionObject | EventObject): NimNode =
   result = newCall(bindSym"joinStrings")
   result.add(newLit(function.name & "("))
   for i, input in function.inputs:
-    result.add(newCall(bindSym"typeSignature", ident input.typ))
+    result.add(newCall(bindSym"typeSignature", input.typ))
     if i != function.inputs.high:
       result.add(newLit(","))
   result.add(newLit(")"))
@@ -432,90 +425,40 @@ proc addAddressAndSignatureToOptions(options: JsonNode, address: Address, signat
 
 proc parseContract(body: NimNode): seq[InterfaceObject] =
   proc parseOutputs(outputNode: NimNode): seq[FunctionInputOutput] =
-    #if outputNode.kind == nnkIdent:
-    #  result.add FunctionInputOutput(
-    #    name: "",
-    #    typ: $outputNode.ident
-    #  )
-    case outputNode.kind:
-    of nnkBracketExpr:
-      result.add FunctionInputOutput(
-        name: "",
-        typ: $outputNode[0].ident,
-        sequenceKind: if outputNode.len == 1:
-          dynamic
-        else:
-          fixed
-      )
-      if outputNode.len == 2:
-        result[^1].count = outputNode[1].intVal.int
-    of nnkIdent:
-      result.add FunctionInputOutput(
-        name: "",
-        typ: $outputNode.ident,
-        sequenceKind: single
-      )
-    else:
-      discard
+    result.add FunctionInputOutput(typ: (if outputNode.kind == nnkEmpty: ident"void" else: outputNode))
+
   proc parseInputs(inputNodes: NimNode): seq[FunctionInputOutput] =
     for i in 1..<inputNodes.len:
       let input = inputNodes[i]
-      if input.kind == nnkIdentDefs:
-        when defined(debug):
-          echo input.repr
-          # echo input.treerepr
-        if input[1].kind == nnkBracketExpr:
-          result.add FunctionInputOutput(
-            name: $input[0].ident,
-            typ: $input[1][0].ident,
-            sequenceKind: if input[1].len == 1:
-              dynamic
-            else:
-              fixed
-          )
-          if input[1].len == 2:
-            result[^1].count = input[1][1].intVal.int
-        else:
-          result.add FunctionInputOutput(
-            name: $input[0].ident,
-            typ: $input[1].ident,
-            sequenceKind: single
-          )
+      input.expectKind(nnkIdentDefs)
+      let typ = input[^2]
+      for j in 0 .. input.len - 3:
+        let arg = input[j]
+        result.add(FunctionInputOutput(
+          name: $arg,
+          typ: typ,
+        ))
+
   proc parseEventInputs(inputNodes: NimNode): seq[EventInput] =
     for i in 1..<inputNodes.len:
       let input = inputNodes[i]
-      if input.kind == nnkIdentDefs:
-        case input[1].kind:
-        of nnkIdent:
-          result.add EventInput(
-            name: $input[0].ident,
-            typ: $input[1].ident,
-            indexed: false
-          )
+      input.expectKind(nnkIdentDefs)
+      let typ = input[^2]
+      for j in 0 .. input.len - 3:
+        let arg = input[j]
+        case typ.kind:
         of nnkBracketExpr:
-          #doAssert($input[1][0].ident == "indexed",
-          #  "Only `indexed` is allowed as option for event inputs")
-          if $input[1][0].ident == "indexed":
+          if $typ[0] == "indexed":
             result.add EventInput(
-              name: $input[0].ident,
-              typ: $input[1][1].ident,
+              name: $arg,
+              typ: typ[1],
               indexed: true
             )
           else:
-            result.add EventInput(
-              name: $input[0].ident,
-              typ: $input[1][0].ident,
-              indexed: false,
-              sequenceKind: if input[1].len == 1:
-                dynamic
-              else:
-                fixed
-            )
-            if input[1].len != 1:
-              result[^1].count = input[1][1].intVal.int
+            result.add EventInput(name: $arg, typ: typ)
         else:
-          doAssert(false,
-            "Can't have anything but ident or bracket expression here")
+          result.add EventInput(name: $arg, typ: typ)
+
   when defined(debug):
     echo body.treeRepr
   var
@@ -599,7 +542,7 @@ macro contract*(cname: untyped, body: untyped): untyped =
         output = if obj.functionObject.outputs.len != 1:
             ident "void"
           else:
-            ident obj.functionObject.outputs[0].typ
+            obj.functionObject.outputs[0].typ
       var
         encodedParams = genSym(nskVar)#newLit("")
         offset = genSym(nskVar)
@@ -619,13 +562,8 @@ macro contract*(cname: untyped, body: untyped): untyped =
           `offset` += (if encoding.dynamic:
             32
           else:
-            encoding.data.len)
+            encoding.data.len div 2)
           `encodings`.add encoding
-        #encodedParams = nnkInfix.newTree(
-        #  ident "&",
-        #  encodedParams,
-        #  nnkCall.newTree(ident "encode", ident input.name)
-        #)
       encoder.add quote do:
         for encoding in `encodings`:
           if encoding.dynamic:
@@ -642,20 +580,7 @@ macro contract*(cname: untyped, body: untyped): untyped =
       for input in obj.functionObject.inputs:
         procDef[3].add nnkIdentDefs.newTree(
           ident input.name,
-          (case input.sequenceKind:
-          of single: ident input.typ
-          of dynamic: nnkBracketExpr.newTree(ident "seq", ident input.typ)
-          of fixed:
-            nnkBracketExpr.newTree(
-              ident "array",
-              nnkInfix.newTree(
-                ident "..",
-                newLit(0),
-                newLit(input.count)
-              ),
-              ident input.typ
-            )
-          ),
+          input.typ,
           newEmptyNode()
         )
       procDef[6].add quote do:
@@ -686,14 +611,14 @@ macro contract*(cname: untyped, body: untyped): untyped =
         for input in obj.eventObject.inputs:
           let param = nnkIdentDefs.newTree(
             ident input.name,
-            ident input.typ,
+            input.typ,
             newEmptyNode()
           )
           params.add param
           paramsWithRawData.add param
           let
             argument = genSym(nskVar)
-            kind = ident input.typ
+            kind = input.typ
           if input.indexed:
             argParseBody.add quote do:
               var `argument`: `kind`