From 17b345146677219d8bb3c618b3837ffd9a9cb924 Mon Sep 17 00:00:00 2001 From: matiwinnetou Date: Tue, 25 Feb 2025 15:25:20 +0100 Subject: [PATCH] feat: upgrade to the latest Cardano Client Lib, 0.6.3 which is Conway era / Ploomin HFC compatible. (#289) Co-authored-by: Mateusz Czeladka --- .../CardanoConstructionServiceImplTest.java | 26 +++++++------------ .../construction/service/CombineApiTest.java | 19 +++++++++----- .../construction/service/PayloadsApiTest.java | 18 +++++++++---- .../service/PreprocessApiTest.java | 6 ++--- .../common/util/CardanoAddressUtilTest.java | 1 - .../common/util/CborEncodeUtilTest.java | 12 +++++---- .../common/util/ParseOperationTest.java | 1 - pom.xml | 2 +- .../rosetta-java.postman_collection.json | 8 +++--- test-data-generator/pom.xml | 4 +-- .../testgenerator/common/BaseFunctions.java | 2 +- 11 files changed, 52 insertions(+), 47 deletions(-) diff --git a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImplTest.java b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImplTest.java index 31ea0653f..a088b889e 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImplTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImplTest.java @@ -43,24 +43,16 @@ import org.cardanofoundation.rosetta.common.util.Constants; import org.cardanofoundation.rosetta.common.util.RosettaConstants.RosettaErrorType; -import static org.cardanofoundation.rosetta.EntityGenerator.givenOperation; -import static org.cardanofoundation.rosetta.EntityGenerator.givenPublicKey; -import static org.cardanofoundation.rosetta.EntityGenerator.givenSignatures; +import static com.bloxbean.cardano.client.crypto.Blake2bUtil.blake2bHash256; +import static com.bloxbean.cardano.client.util.HexUtil.decodeHexString; +import static com.bloxbean.cardano.client.util.HexUtil.encodeHexString; +import static org.cardanofoundation.rosetta.EntityGenerator.*; import static org.cardanofoundation.rosetta.api.construction.enumeration.AddressType.BASE; import static org.cardanofoundation.rosetta.api.construction.enumeration.AddressType.REWARD; import static org.cardanofoundation.rosetta.common.enumeration.NetworkEnum.PREPROD; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import static org.openapitools.client.model.CurveType.EDWARDS25519; @ExtendWith(MockitoExtension.class) @@ -69,7 +61,7 @@ class CardanoConstructionServiceImplTest { private final static String TRANSACTION_SIGNED = "8279025a3833613430303831383235383230326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663031303138323832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666238323139323731306131353831636230643037643435666539353134663830323133663430323065356136313234313435386265363236383431636465373137636233386137613334393437373536393634366634333666363936653139303930363530346137353631366534333732373537613534366636623635366536313761366631393161306134373665373537343633366636393665313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032313939633430303330306131303038313832353832303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303035383430303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303066356636a16a6f7065726174696f6e7381a7746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800647479706565696e707574667374617475736773756363657373676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26576616c7565662d39303030306863757272656e6379a26673796d626f6c6341444168646563696d616c73066b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74686d65746164617461a16b746f6b656e42756e646c6581a268706f6c69637949647838623064303764343566653935313466383032313366343032306535613631323431343538626536323638343163646537313763623338613766746f6b656e7383a26576616c756564323331306863757272656e6379a26673796d626f6c7234373735363936343666343336663639366568646563696d616c7300a26576616c756564363636366863757272656e6379a26673796d626f6c7820346137353631366534333732373537613534366636623635366536313761366668646563696d616c7300a26576616c75656531303030306863757272656e6379a26673796d626f6c6e366537353734363336663639366568646563696d616c7300"; private final static String TRANSACTION_NOT_SIGNED = "82790132613530303831383235383230326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663031303138323832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666230313832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666230343032316130353762636566623033313930336538303438313832303138323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800647479706565696e707574667374617475736773756363657373676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26576616c7565692d39303030303030306863757272656e6379a26673796d626f6c6341444168646563696d616c73066b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74a5746f7065726174696f6e5f6964656e746966696572a165696e646578036474797065767374616b654b65794465726567697374726174696f6e667374617475736773756363657373676163636f756e74a16761646472657373783b7374616b653175387a666e6b687034673676686e6565746d763271656e3766356e64726b6c716a7138653973326e636b3968333063667a36716d70686d65746164617461a2727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396c726566756e64416d6f756e74a26576616c7565682d323030303030306863757272656e6379a26673796d626f6c6341444168646563696d616c7306"; private final static String COMBINE_UNSIGNED_TRANSACTION = "a400818258202f23fd8cca835af21f3ac375bac601f97ead75f2e79143bdf71fe2c4be043e8f01018282581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb19271082581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb199c4002199c40031903e8"; - private final static String COMBINE_SIGNED_TRANSACTION = "84a400818258202f23fd8cca835af21f3ac375bac601f97ead75f2e79143bdf71fe2c4be043e8f01018282581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb19271082581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb199c4002199c40031903e8a1028184582073fea80d424276ad0978d4fe5310e8bc2d485f5f6bb3bf87612989f112ad5a7d5840dc2a1948bfa9411b37e8d280b04c48a85af5588bcf509c0fca798f7b462ebca92d6733dacc1f1c6c1463623c085401be07ea422ad4f1c543375e7d3d2393aa0b5820dd75e154da417becec55cdd249327454138f082110297d5e87ab25e15fad150f41a0f5f6"; + private final static String COMBINE_SIGNED_TRANSACTION = "84a400d90102818258202f23fd8cca835af21f3ac375bac601f97ead75f2e79143bdf71fe2c4be043e8f01018282581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb19271082581d61bb40f1a647bc88c1bd6b738db8eb66357d926474ea5ffd6baa76c9fb199c4002199c40031903e8a102d901028184582073fea80d424276ad0978d4fe5310e8bc2d485f5f6bb3bf87612989f112ad5a7d5840dc2a1948bfa9411b37e8d280b04c48a85af5588bcf509c0fca798f7b462ebca92d6733dacc1f1c6c1463623c085401be07ea422ad4f1c543375e7d3d2393aa0b5820dd75e154da417becec55cdd249327454138f082110297d5e87ab25e15fad150f41a0f5f6"; @Mock private RestTemplate restTemplate; @@ -442,7 +434,7 @@ void buildTransaction() { List signatures = Collections.singletonList(givenSignatures()); String result = cardanoService.buildTransaction(COMBINE_UNSIGNED_TRANSACTION, signatures, ""); - assertEquals(COMBINE_SIGNED_TRANSACTION, result); + assertEquals(encodeHexString(blake2bHash256(decodeHexString(COMBINE_SIGNED_TRANSACTION))), encodeHexString(blake2bHash256(decodeHexString(result)))); } @Test diff --git a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CombineApiTest.java b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CombineApiTest.java index 6825f90dd..3a949ceed 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CombineApiTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/CombineApiTest.java @@ -19,9 +19,10 @@ import org.cardanofoundation.rosetta.common.exception.ApiException; import org.cardanofoundation.rosetta.common.util.RosettaConstants.RosettaErrorType; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static com.bloxbean.cardano.client.crypto.Blake2bUtil.blake2bHash256; +import static com.bloxbean.cardano.client.util.HexUtil.decodeHexString; +import static com.bloxbean.cardano.client.util.HexUtil.encodeHexString; +import static org.junit.jupiter.api.Assertions.*; @Execution(ExecutionMode.CONCURRENT) class CombineApiTest extends IntegrationTest { @@ -36,8 +37,10 @@ void combineWithMetadataTest() throws IOException { ConstructionCombineResponse constructionCombineResponse = constructionApiService.constructionCombineService(combineRequest); - String signedTransaction = "82790378383461353030383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538303735383230383863613836353435383265383339333738373332333062363634366132323130313334643365343165306263393832346365376265346530623238613839366131303038313832353832303162343030643630616166333465616636646362616239626261343630303161323334393738383663663131303636663738343639333364333065356164336635383430366339323530383133356362303630313837613237303661646538313534373832383637623135323665393631356430363734326265356335366630333761623835383934633039386332616230373937313133336330343737626165653932616466333532376164376363383136663133653165346333363130343132303666353832613231396566363461343031353832303030333665663365316630643366353938396532643135356561353462646232613732633463343536636362393539616634633934383638663437336635613030323538323038363837306566633939633435336138373361313634393263653837373338656337396130656264303634333739613632653263396366346531313932313965303335383164653130303035373534616538663933316135373162313733373036336334393034636233346236633434646264633964653637316362623731313034313930346432313965663635613130313538343036633233313263643439303637656366303932306466376530363731393963353562336661656634656330626365316264326366623939373933393732343738633435383736616632626332373161633735396335636534306163653561333938623966646230653335396633633333336665383536363438383034373830653830a26a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a4746f7065726174696f6e5f6964656e746966696572a165696e64657803686d65746164617461a17818766f7465526567697374726174696f6e4d65746164617461a5687374616b654b6579a2696865785f62797465737840383638373065666339396334353361383733613136343932636538373733386563373961306562643036343337396136326532633963663465313139323139656a63757276655f747970656c65647761726473323535313969766f74696e674b6579a2696865785f62797465737840303033366566336531663064336635393839653264313535656135346264623261373263346334353663636239353961663463393438363866343733663561306a63757276655f747970656c6564776172647332353531396b766f74696e674e6f6e63651904d26d72657761726441646472657373783b7374616b653175797171326132326172756e726674336b396568716337796a707874786a6d76676e6461653830787738396d7779676539736b79706f766f74696e675369676e617475726578803663323331326364343930363765636630393230646637653036373139396335356233666165663465633062636531626432636662393937393339373234373863343538373661663262633237316163373539633563653430616365356133393862396664623065333539663363333333666538353636343838303437383065667374617475736773756363657373647479706570766f7465526567697374726174696f6e767472616e73616374696f6e4d657461646174614865787901703832613231396566363461343031353832303030333665663365316630643366353938396532643135356561353462646232613732633463343536636362393539616634633934383638663437336635613030323538323038363837306566633939633435336138373361313634393263653837373338656337396130656264303634333739613632653263396366346531313932313965303335383164653130303035373534616538663933316135373162313733373036336334393034636233346236633434646264633964653637316362623731313034313930346432313965663635613130313538343036633233313263643439303637656366303932306466376530363731393963353562336661656634656330626365316264326366623939373933393732343738633435383736616632626332373161633735396335636534306163653561333938623966646230653335396633633333336665383536363438383034373830653830"; - assertEquals(signedTransaction, constructionCombineResponse.getSignedTransaction()); + + String signedTransaction = "82790384383461353030643930313032383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538303735383230383863613836353435383265383339333738373332333062363634366132323130313334643365343165306263393832346365376265346530623238613839366131303064393031303238313832353832303162343030643630616166333465616636646362616239626261343630303161323334393738383663663131303636663738343639333364333065356164336635383430366339323530383133356362303630313837613237303661646538313534373832383637623135323665393631356430363734326265356335366630333761623835383934633039386332616230373937313133336330343737626165653932616466333532376164376363383136663133653165346333363130343132303666353832613231396566363461343031353832303030333665663365316630643366353938396532643135356561353462646232613732633463343536636362393539616634633934383638663437336635613030323538323038363837306566633939633435336138373361313634393263653837373338656337396130656264303634333739613632653263396366346531313932313965303335383164653130303035373534616538663933316135373162313733373036336334393034636233346236633434646264633964653637316362623731313034313930346432313965663635613130313538343036633233313263643439303637656366303932306466376530363731393963353562336661656634656330626365316264326366623939373933393732343738633435383736616632626332373161633735396335636534306163653561333938623966646230653335396633633333336665383536363438383034373830653830a26a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a4746f7065726174696f6e5f6964656e746966696572a165696e64657803686d65746164617461a17818766f7465526567697374726174696f6e4d65746164617461a5687374616b654b6579a2696865785f62797465737840383638373065666339396334353361383733613136343932636538373733386563373961306562643036343337396136326532633963663465313139323139656a63757276655f747970656c65647761726473323535313969766f74696e674b6579a2696865785f62797465737840303033366566336531663064336635393839653264313535656135346264623261373263346334353663636239353961663463393438363866343733663561306a63757276655f747970656c6564776172647332353531396b766f74696e674e6f6e63651904d26d72657761726441646472657373783b7374616b653175797171326132326172756e726674336b396568716337796a707874786a6d76676e6461653830787738396d7779676539736b79706f766f74696e675369676e617475726578803663323331326364343930363765636630393230646637653036373139396335356233666165663465633062636531626432636662393937393339373234373863343538373661663262633237316163373539633563653430616365356133393862396664623065333539663363333333666538353636343838303437383065667374617475736773756363657373647479706570766f7465526567697374726174696f6e767472616e73616374696f6e4d657461646174614865787901703832613231396566363461343031353832303030333665663365316630643366353938396532643135356561353462646232613732633463343536636362393539616634633934383638663437336635613030323538323038363837306566633939633435336138373361313634393263653837373338656337396130656264303634333739613632653263396366346531313932313965303335383164653130303035373534616538663933316135373162313733373036336334393034636233346236633434646264633964653637316362623731313034313930346432313965663635613130313538343036633233313263643439303637656366303932306466376530363731393963353562336661656634656330626365316264326366623939373933393732343738633435383736616632626332373161633735396335636534306163653561333938623966646230653335396633633333336665383536363438383034373830653830"; + + assertEquals(encodeHexString(blake2bHash256(decodeHexString(signedTransaction))), encodeHexString(blake2bHash256(decodeHexString(constructionCombineResponse.getSignedTransaction())))); } @RepeatedTest(10) @@ -47,8 +50,10 @@ void combineWithByronAddressTest() throws IOException { ConstructionCombineResponse constructionCombineResponse = constructionApiService.constructionCombineService(combineRequest); - String signedTransaction = "8279020c3834613430303831383235383230326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663031303138323832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393237313038323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313939633430303231393963343030333139303365386131303238313834353832303733666561383064343234323736616430393738643466653533313065386263326434383566356636626233626638373631323938396631313261643561376435383430646332613139343862666139343131623337653864323830623034633438613835616635353838626366353039633066636137393866376234363265626361393264363733336461636331663163366331343633363233633038353430316265303765613432326164346631633534333337356537643364323339336161306235383230646437356531353464613431376265636563353563646432343933323734353431333866303832313130323937643565383761623235653135666164313530663431613066356636a26a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574767472616e73616374696f6e4d6574616461746148657860"; - assertEquals(signedTransaction, constructionCombineResponse.getSignedTransaction()); + + String signedTransaction = "827902183834613430306439303130323831383235383230326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663031303138323832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393237313038323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313939633430303231393963343030333139303365386131303264393031303238313834353832303733666561383064343234323736616430393738643466653533313065386263326434383566356636626233626638373631323938396631313261643561376435383430646332613139343862666139343131623337653864323830623034633438613835616635353838626366353039633066636137393866376234363265626361393264363733336461636331663163366331343633363233633038353430316265303765613432326164346631633534333337356537643364323339336161306235383230646437356531353464613431376265636563353563646432343933323734353431333866303832313130323937643565383761623235653135666164313530663431613066356636a26a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574767472616e73616374696f6e4d6574616461746148657860"; + + assertEquals(encodeHexString(blake2bHash256(decodeHexString(signedTransaction))), encodeHexString(blake2bHash256(decodeHexString(constructionCombineResponse.getSignedTransaction())))); } @Test diff --git a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PayloadsApiTest.java b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PayloadsApiTest.java index 0aaa21915..7e570a5f9 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PayloadsApiTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PayloadsApiTest.java @@ -5,6 +5,8 @@ import java.util.List; import jakarta.validation.ConstraintViolationException; +import lombok.val; + import org.springframework.beans.factory.annotation.Autowired; import com.fasterxml.jackson.databind.ObjectMapper; import org.openapitools.client.api.ConstructionApi; @@ -37,35 +39,38 @@ private ConstructionPayloadsRequest getPayloadRequest(String fileName) throws IO @Test void payloadsMultipleInputTests() throws Exception { - String expectedUnsignedTransaction = "8279013661343030383238323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139633335303033313930336538a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a6746f7065726174696f6e5f6964656e746966696572a265696e646578016d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d31303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedUnsignedTransaction = "8279013c61343030643930313032383238323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139633335303033313930336538a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a6746f7065726174696f6e5f6964656e746966696572a265696e646578016d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d31303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; assertConstructionPayloads("testdata/construction/payloads/multiple_inputs.json", expectedUnsignedTransaction); } @Test void byronInputTest() throws Exception { - String expectedUnsignedTransaction = "8278ee61343030383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedUnsignedTransaction = "8278f461343030643930313032383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; assertConstructionPayloads("testdata/construction/payloads/byronInput.json", expectedUnsignedTransaction); } @Test void depositTest() throws Exception { - String expectedUnsignedTransaction = "8279013a6135303038313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303661306337303033313930336538303438313832303038323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565682d393030303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a2727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396d6465706f736974416d6f756e74a166616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c756567323030303030306673746174757367737563636573736474797065747374616b654b6579526567697374726174696f6e"; + String expectedUnsignedTransaction = "827901466135303064393031303238313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303661306337303033313930336538303464393031303238313832303038323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565682d393030303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a2727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396d6465706f736974416d6f756e74a166616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c756567323030303030306673746174757367737563636573736474797065747374616b654b6579526567697374726174696f6e"; assertConstructionPayloads("testdata/construction/payloads/deposit.json", expectedUnsignedTransaction); } @Test void simpeInputOutputTest() throws Exception { - String expectedUnsignedTransaction = "8278ee61343030383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedUnsignedTransaction = "8278f461343030643930313032383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + + //assertEquals(encodeHexString(blake2bHash256(decodeHexString(signedTransaction))), encodeHexString(blake2bHash256(decodeHexString(constructionCombineResponse.getSignedTransaction())))); assertConstructionPayloads("testdata/construction/payloads/simpleInputOutput.json", expectedUnsignedTransaction); } @Test void stakeKeyDeregistrationTest() throws Exception { - String expectedUnsignedTransaction = "8279013a6135303038313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303166323063303033313930336538303438313832303138323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a1727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396673746174757367737563636573736474797065767374616b654b65794465726567697374726174696f6e"; + String expectedUnsignedTransaction = "827901466135303064393031303238313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303166323063303033313930336538303464393031303238313832303138323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a1727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396673746174757367737563636573736474797065767374616b654b65794465726567697374726174696f6e"; + assertConstructionPayloads("testdata/construction/payloads/stakeKey_deregistration.json", expectedUnsignedTransaction); } @@ -98,6 +103,9 @@ private void assertConstructionPayloads(String requestFile, String expectedUnsig ConstructionPayloadsResponse body = constructionApiService.constructionPayloadsService( request); + + val s = body.getUnsignedTransaction(); + assertEquals(expectedUnsignedTransaction, body.getUnsignedTransaction()); } } diff --git a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PreprocessApiTest.java b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PreprocessApiTest.java index 7cea10f5b..6601dbf1c 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PreprocessApiTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PreprocessApiTest.java @@ -32,17 +32,17 @@ private ConstructionPreprocessRequest getPreprocessRequest(String constructionPa @Test void simplePreprocessTest() throws IOException { - assertPreprocessRequest("testdata/construction/preprocess/simple_preprocess.json", 1000, 224); + assertPreprocessRequest("testdata/construction/preprocess/simple_preprocess.json", 1000, 230); } @Test void twoWithdrawalsTest() throws IOException { - assertPreprocessRequest("testdata/construction/preprocess/two_withdrawals.json", 100, 399); + assertPreprocessRequest("testdata/construction/preprocess/two_withdrawals.json", 100, 408); } @Test void poolRegistrationTest() throws IOException { - assertPreprocessRequest("testdata/construction/preprocess/pool_registration.json", 100, 921); + assertPreprocessRequest("testdata/construction/preprocess/pool_registration.json", 100, 933); } private void assertPreprocessRequest(String constructionPayloadFile, int expectedTtl, diff --git a/api/src/test/java/org/cardanofoundation/rosetta/common/util/CardanoAddressUtilTest.java b/api/src/test/java/org/cardanofoundation/rosetta/common/util/CardanoAddressUtilTest.java index 47bf94e8f..5baffad8e 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/common/util/CardanoAddressUtilTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/common/util/CardanoAddressUtilTest.java @@ -99,7 +99,6 @@ void generateAddressTest() { void getEraAddressTypeTest() { Account account = new Account(Networks.preprod(), testMnemonic); String address = account.getBaseAddress().getAddress(); - System.out.println(address); EraAddressType eraAddressType = getEraAddressType( account.getBaseAddress().getAddress()); assertEquals(EraAddressType.SHELLEY, eraAddressType); diff --git a/api/src/test/java/org/cardanofoundation/rosetta/common/util/CborEncodeUtilTest.java b/api/src/test/java/org/cardanofoundation/rosetta/common/util/CborEncodeUtilTest.java index d7647f8d1..31df680b0 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/common/util/CborEncodeUtilTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/common/util/CborEncodeUtilTest.java @@ -23,7 +23,8 @@ class CborEncodeUtilTest { @Test void encodeSimpleInputOutputTest() throws IOException, CborException, AddressExcepion, CborSerializationException { - String expectedTransaction = "8278ee61343030383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedTransaction = "8278f461343030643930313032383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + assertEncodedTransaction(expectedTransaction, "testdata/construction/payloads/simpleInputOutput.json"); } @@ -31,21 +32,21 @@ void encodeSimpleInputOutputTest() @Test void encodeByronInputTest() throws IOException, CborException, AddressExcepion, CborSerializationException { - String expectedTransaction = "8278ee61343030383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedTransaction = "8278f461343030643930313032383138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139396334303033313930336538a16a6f7065726174696f6e7381a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783b416532746450775550455a4336574a66565178544e4e3274577734736b47724e367a5256756b76784a6d544679316e596b5647514275555255334c66616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; assertEncodedTransaction(expectedTransaction, "testdata/construction/payloads/byronInput.json"); } @Test void encodeDepositTest() throws IOException, CborException, AddressExcepion, CborSerializationException { - String expectedTransaction = "8279013a6135303038313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303661306337303033313930336538303438313832303038323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565682d393030303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a2727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396d6465706f736974416d6f756e74a166616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c756567323030303030306673746174757367737563636573736474797065747374616b654b6579526567697374726174696f6e"; + String expectedTransaction = "827901466135303064393031303238313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303661306337303033313930336538303464393031303238313832303038323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565682d393030303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a2727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396d6465706f736974416d6f756e74a166616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c756567323030303030306673746174757367737563636573736474797065747374616b654b6579526567697374726174696f6e"; assertEncodedTransaction(expectedTransaction, "testdata/construction/payloads/deposit.json"); } @Test void encodeMultipleInputsTest() throws IOException, CborException, AddressExcepion, CborSerializationException { - String expectedTransaction = "8279013661343030383238323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139633335303033313930336538a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a6746f7065726174696f6e5f6964656e746966696572a265696e646578016d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d31303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; + String expectedTransaction = "8279013c61343030643930313032383238323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303138323538323032663233666438636361383335616632316633616333373562616336303166393765616437356632653739313433626466373166653263346265303433653866303130313832383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139323731303832353831643631626234306631613634376263383863316264366237333864623865623636333537643932363437346561356666643662616137366339666231393963343030323139633335303033313930336538a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a6746f7065726174696f6e5f6964656e746966696572a265696e646578016d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d31303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574"; assertEncodedTransaction(expectedTransaction, "testdata/construction/payloads/multiple_inputs.json"); } @@ -53,7 +54,7 @@ void encodeMultipleInputsTest() @Test void encodeStakeKeyDeregistrationTest() throws IOException, CborException, AddressExcepion, CborSerializationException { - String expectedTransaction = "8279013a6135303038313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303166323063303033313930336538303438313832303138323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a1727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396673746174757367737563636573736474797065767374616b654b65794465726567697374726174696f6e"; + String expectedTransaction = "827901466135303064393031303238313832353832303266323366643863636138333561663231663361633337356261633630316639376561643735663265373931343362646637316665326334626530343365386630313031383238323538316436316262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662313932373130383235383164363162623430663161363437626338386331626436623733386462386562363633353764393236343734656135666664366261613736633966623139396334303032316130303166323063303033313930336538303464393031303238313832303138323030353831636262343066316136343762633838633162643662373338646238656236363335376439323634373465613566666436626161373663396662a16a6f7065726174696f6e7382a6746f7065726174696f6e5f6964656e746966696572a265696e646578006d6e6574776f726b5f696e64657800676163636f756e74a16761646472657373783a616464723176786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e3763706e6b63707866616d6f756e74a26863757272656e6379a26673796d626f6c6341444168646563696d616c73066576616c7565662d39303030306b636f696e5f6368616e6765a26f636f696e5f6964656e746966696572a16a6964656e7469666965727842326632336664386363613833356166323166336163333735626163363031663937656164373566326537393134336264663731666532633462653034336538663a316b636f696e5f616374696f6e6a636f696e5f7370656e74667374617475736773756363657373647479706565696e707574a5746f7065726174696f6e5f6964656e746966696572a165696e64657803676163636f756e74a16761646472657373783b7374616b653175786135707564786737376733736461646465636d773874766336686d796e79776e34396c6c747434666d766e376361656b376135686d65746164617461a1727374616b696e675f63726564656e7469616ca2696865785f62797465737840314234303044363041414633344541463644434241423942424134363030314132333439373838364346313130363646373834363933334433304535414433466a63757276655f747970656c6564776172647332353531396673746174757367737563636573736474797065767374616b654b65794465726567697374726174696f6e"; assertEncodedTransaction(expectedTransaction, "testdata/construction/payloads/stakeKey_deregistration.json"); } @@ -61,6 +62,7 @@ void encodeStakeKeyDeregistrationTest() private void assertEncodedTransaction(String expectedTransaction, String requestPayloadFilename) throws IOException, CborException, AddressExcepion, CborSerializationException { String encodedTransaction = getEncodedTransaction(requestPayloadFilename); + assertEquals(expectedTransaction, encodedTransaction); } diff --git a/api/src/test/java/org/cardanofoundation/rosetta/common/util/ParseOperationTest.java b/api/src/test/java/org/cardanofoundation/rosetta/common/util/ParseOperationTest.java index cd1ddc2bd..bdb964899 100644 --- a/api/src/test/java/org/cardanofoundation/rosetta/common/util/ParseOperationTest.java +++ b/api/src/test/java/org/cardanofoundation/rosetta/common/util/ParseOperationTest.java @@ -41,7 +41,6 @@ void parseInputOperationTest() throws IOException { resultAccumulator.getTransactionInputs().getFirst().getTransactionId() + ":" + resultAccumulator.getTransactionInputs().getFirst().getIndex()); assertEquals(operation.getAmount().getValue(), resultAccumulator.getInputAmounts().getFirst().toString()); - System.out.println(operation); } @Test void parseOutputOperationTest() throws IOException { diff --git a/pom.xml b/pom.xml index 82a08d7aa..5cd294234 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.20.0 9.25.6 0.4.3 - 0.5.1 + 0.6.3 0.3.4.1 0.1.0 2.14.0 diff --git a/postmanTests/rosetta-java.postman_collection.json b/postmanTests/rosetta-java.postman_collection.json index 6e22d6d99..b338b3bc8 100644 --- a/postmanTests/rosetta-java.postman_collection.json +++ b/postmanTests/rosetta-java.postman_collection.json @@ -183,7 +183,7 @@ " var responseData = pm.response.json();", " pm.expect(responseData).to.be.an('object');", " pm.expect(responseData.options.relative_ttl).to.eql(1000.0);", - " pm.expect(responseData.options.transaction_size).to.eql(224.0);", + " pm.expect(responseData.options.transaction_size).to.eql(230.0);", "});", "", "" @@ -238,7 +238,7 @@ " var responseData = pm.response.json();", " pm.expect(responseData).to.be.an('object');", " pm.expect(responseData.options.relative_ttl).to.eql(100.0);", - " pm.expect(responseData.options.transaction_size).to.eql(399.0);", + " pm.expect(responseData.options.transaction_size).to.eql(408.0);", "});", "", "" @@ -293,7 +293,7 @@ " var responseData = pm.response.json();", " pm.expect(responseData).to.be.an('object');", " pm.expect(responseData.options.relative_ttl).to.eql(100.0);", - " pm.expect(responseData.options.transaction_size).to.eql(921.0);", + " pm.expect(responseData.options.transaction_size).to.eql(933.0);", "});", "", "" @@ -349,7 +349,7 @@ " var responseData = pm.response.json();", " pm.expect(responseData).to.be.an('object');", " pm.expect(responseData.payloads.length).to.equal(2)", - " pm.expect(responseData.payloads[0].hex_bytes).to.equal('159434d5bab91b4a3b041ee49540d01bcaeef35481bd386f9feb17acfc3aa0af')", + " pm.expect(responseData.payloads[0].hex_bytes).to.equal('c1ce05e0626510a08696da806e3bf7956cabafbcbad039c4ad87694b7816024b')", "});", "", "" diff --git a/test-data-generator/pom.xml b/test-data-generator/pom.xml index a686fc45e..d3583d61e 100644 --- a/test-data-generator/pom.xml +++ b/test-data-generator/pom.xml @@ -28,12 +28,12 @@ com.bloxbean.cardano cardano-client-lib - 0.5.1 + 0.6.3 com.bloxbean.cardano cardano-client-backend-blockfrost - 0.5.1 + 0.6.3 org.projectlombok diff --git a/test-data-generator/src/main/java/org/cardanofoundation/rosetta/testgenerator/common/BaseFunctions.java b/test-data-generator/src/main/java/org/cardanofoundation/rosetta/testgenerator/common/BaseFunctions.java index 37fa35bf0..b1e88528c 100644 --- a/test-data-generator/src/main/java/org/cardanofoundation/rosetta/testgenerator/common/BaseFunctions.java +++ b/test-data-generator/src/main/java/org/cardanofoundation/rosetta/testgenerator/common/BaseFunctions.java @@ -56,7 +56,7 @@ public static Block getBlock(String txHash) { try { TransactionContent txContent = backendService.getTransactionService().getTransaction(txHash) .getValue(); - Integer blockHeight = txContent.getBlockHeight(); + Long blockHeight = txContent.getBlockHeight(); log.info("Block height: {}", blockHeight); return backendService.getBlockService() .getBlockByNumber(BigInteger.valueOf(blockHeight)).getValue();