diff --git a/pkg/arvo/app/azimuth.hoon b/pkg/arvo/app/azimuth.hoon index 65404e1095..dcec78d069 100644 --- a/pkg/arvo/app/azimuth.hoon +++ b/pkg/arvo/app/azimuth.hoon @@ -76,12 +76,7 @@ [%log event-log] ?~ input.u.mined.i.logs [%bat *@] - =/ len (met 3 u.input.u.mined.i.logs) - =/ fun - (rsh [3 (sub len 4)] u.input.u.mined.i.logs) - ?. =(0x2688.7f26 fun) - [%bat *@] - [%bat (end [3 (sub len 4)] u.input.u.mined.i.logs)] + [%bat u.input.u.mined.i.logs] =/ res %- mule |.((%*(. naive lac |) verifier chain-id:contracts:azimuth nas input)) diff --git a/pkg/arvo/ted/aggregator/send.hoon b/pkg/arvo/ted/aggregator/send.hoon index a430212e18..082b69cf48 100644 --- a/pkg/arvo/ted/aggregator/send.hoon +++ b/pkg/arvo/ted/aggregator/send.hoon @@ -37,22 +37,10 @@ ~& [%insufficient-aggregator-balance address] not-sent :: -=/ tx-data=@ux - %+ can:naive 3 - :_ [batch-function ~] - =; =cord - =/ parsed=(unit (pair @ud @ux)) - (de:base16:mimes:html cord) - ?~(parsed !! u.parsed) - %- crip - %- encode-args:abi:ethereum - :_ ~ - :- %bytes - %+ cad:naive 3 - %+ roll txs - |= [=raw-tx:naive out=(list octs)] - [raw.raw-tx 65^sig.raw-tx out] -=/ tx=@ux +::NOTE this fails the thread if sending fails, which in the app gives us +:: the "retry with same gas price" behavior we want +;< =response:rpc bind:m + %+ send-batch endpoint =; tx=transaction:rpc:ethereum (sign-transaction:key:ethereum tx pk) :* nonce @@ -60,17 +48,19 @@ gas-limit contract 0 - tx-data + :: + %+ can:naive 3 + %+ roll txs + |= [=raw-tx:naive out=(list octs)] + :_ [raw.raw-tx out] + (met 3 sig.raw-tx)^sig.raw-tx + :: chain-id == -:: -::NOTE this fails the thread if sending fails, which in the app gives us -:: the "retry with same gas price" behavior we want -;< =response:rpc bind:m (send-batch endpoint tx) %- pure:m !> ^- (each @ud @t) ?+ -.response %.n^'unexpected rpc response' - %error %.n^message.res + %error %.n^message.response :: TODO: :: check that tx-hash in +.response is non-zero? :: log tx-hash to getTransactionReceipt(tx-hash)?