diff --git a/libs/awcp/src/awcp.ts b/libs/awcp/src/awcp.ts index 75034f6..5c24b6f 100644 --- a/libs/awcp/src/awcp.ts +++ b/libs/awcp/src/awcp.ts @@ -1143,12 +1143,42 @@ type Params_A2W_tx_sign_yesprop * (layer 4) * * @example - * { - * "signedTransaction": "tx_+KILAfhCuEDxWnvffMvyrkFWnrImYej38rh99vM9f6pORl/yWTvU97nvUcY8/ck8lgtPA8w5odGSDb9LGY/JSZXsmsXhgKkHuFr4WAwBoQG7Nu65aM7NHt5yM5jz67sd02TQqjFNBwIN6tkQsRD5RKEBe2bmwwUHCDbk6XkgUj3D6lnLv9hsWLoHA+qLzQq4p2wKhg8m9WHIAAABh2hhaW5hbmF7X54G" - * } + * ```json + * "transactionHash": { + * "blockHash": "mh_uJZ65APpLtiagJKjTNPZL1g1LJ7oqc2uG44qVqp1gVWwWUgLb", + * "blockHeight": 806313, + * "hash": "th_o3cudpezVywd99a7VMef9Yg7XPixTFueaCqGjdsnqLM99a78t", + * "signatures": [ + * "sg_U36NDTFJFP4QEWCdjyhELDUDxsVGZNkq3DrcBCxby4NPUsPjQsFDG7VHN9s7TNUsEAd7qdC5aEjZKrqsKyfqA8apNrotz" + * ], + * "tx": { + * "amount": 10, + * "fee": 16800000000000, + * "nonce": 13, + * "payload": "ba_aGFpbmFuYWbkNu8=", + * "recipientId": "ak_wM8yFU8eSETXU7VSN48HMDmevGoCMiuveQZgkPuRn1nTiRqyv", + * "senderId": "ak_2XhCkjzTwcq1coXSSzHJoMZkUzTwnjH88zmPGkkowUsFNTo9UE", + * "type": "SpendTx", + * "version": 1 + * }, + * "rawTx": "tx_+KILAfhCuEDOpyHRaYj8MnRwqOzMyRJSh4qud6jRK01wiAWfRHBDo/4e9klk7MsvM0Cr0ENaNkqKfwCDcaga/iDnogN5cukNuFr4WAwBoQHJY35GAOerO8Lmf8ZA6CN2RET0MFXaXVV4pJo3WvoY3KEBe2bmwwUHCDbk6XkgUj3D6lnLv9hsWLoHA+qLzQq4p2wKhg9HjghAAAANh2hhaW5hbmHkTCSc" + * } + * ``` */ type Result_W2A_tx_sign_yesprop - = {signedTransaction : string}; + = {transactionHash : {blockHash : string, + blockHeight : number, + hash : string, + signatures : Array, + tx : {amount : number, + fee : number, + nonce : number, + payload : string, + recipientId : string, + senderId : string, + type : string, + version : number}, + rawTx : string}}; /** diff --git a/libs/parasite/jex.eterms b/libs/parasite/jex.eterms index 9d84a44..d763a25 100644 --- a/libs/parasite/jex.eterms +++ b/libs/parasite/jex.eterms @@ -1,5 +1,5 @@ {type, library}. {realm, local}. {name, parasite}. -{version, "0.2.0"}. +{version, "0.2.2"}. {deps, []}. diff --git a/libs/parasite/src/ae_node.ts b/libs/parasite/src/ae_node.ts index 5ecc783..6e62662 100644 --- a/libs/parasite/src/ae_node.ts +++ b/libs/parasite/src/ae_node.ts @@ -23,7 +23,7 @@ import * as ae_compiler from './ae_compiler.js' // CONSTANTS //------------------------------------------------------------------- -export const MIN_FEE = 16660000000000; +export const MIN_FEE = 16800000000000; export const MIN_CONTRACT_FEE = 79080000000000; export const MIN_GAS_PRICE = 1000000000; export const URL_MAINNET = "https://mainnet.aeternity.io/v3"; diff --git a/sidekick/src/sidekick.ts b/sidekick/src/sidekick.ts index 5837727..a306ced 100644 --- a/sidekick/src/sidekick.ts +++ b/sidekick/src/sidekick.ts @@ -79,6 +79,7 @@ export { // connect connect, address, + tx_sign_yesprop, tx_sign_noprop, msg_sign, diff --git a/sidekick_examples/connection.html b/sidekick_examples/connection.html index e48ad9e..798c3b1 100644 --- a/sidekick_examples/connection.html +++ b/sidekick_examples/connection.html @@ -62,11 +62,17 @@
- + +
Result:

-    

4.4 Propagate the transaction (parasite)

-

4.5 Verify the transaction was propagated (parasite)

+ +
+ +
Result:
+

+    

4.4 Propagate the transaction (parasite) FIXME

+

4.5 Verify the transaction was propagated (parasite) FIXME

5. Sign a message

diff --git a/sidekick_examples/jex.eterms b/sidekick_examples/jex.eterms index 48888e9..02cfab3 100644 --- a/sidekick_examples/jex.eterms +++ b/sidekick_examples/jex.eterms @@ -1,7 +1,7 @@ {type, library}. {realm, local}. {name, sidekick_examples}. -{version, "0.1.0"}. -{deps, ["local-awcp-0.2.1", - "local-parasite-0.2.0", - "local-sidekick-0.2.1"]}. +{version, "0.2.2"}. +{deps, ["local-awcp-0.2.2", + "local-parasite-0.2.2", + "local-sidekick-0.2.2"]}. diff --git a/sidekick_examples/src/connection.ts b/sidekick_examples/src/connection.ts index 0d6f5b4..3de5edc 100644 --- a/sidekick_examples/src/connection.ts +++ b/sidekick_examples/src/connection.ts @@ -1,6 +1,6 @@ -import * as ae_node from './jex_include/local-parasite-0.2.0/dist/ae_node.js'; -import * as awcp from './jex_include/local-awcp-0.2.1/dist/awcp.js'; -import * as sk from './jex_include/local-sidekick-0.2.1/dist/sidekick.js'; +import * as ae_node from './jex_include/local-parasite-0.2.2/dist/ae_node.js'; +import * as awcp from './jex_include/local-awcp-0.2.2/dist/awcp.js'; +import * as sk from './jex_include/local-sidekick-0.2.2/dist/sidekick.js'; var pv_address: string; var pv_spendtx_base64: string; @@ -181,6 +181,7 @@ form_tx // } + async function sign_tx (logger: sk.Logger) @@ -197,6 +198,24 @@ sign_tx document.getElementById("sign-spendtx-result")!.innerHTML = JSON.stringify(signedTx, undefined, 4); } + +async function +sign_tx_prop + (logger: sk.Logger) + : Promise +{ + let sign_params = { + tx: pv_spendtx_base64, + // returnsigned: false tells it to propagate the transaction + // returnsigned: true just signs it and returns the signed tx back + returnSigned: false as false, + networkId: "ae_uat" + }; + let signedTx = await sk.tx_sign_yesprop('sk-tx-sign-2', sign_params, sk.TIMEOUT_DEF_TX_SIGN_NOPROP_MS, 'sign transaction timed out', logger); + document.getElementById("sign-spendtx-prop-result")!.innerHTML = JSON.stringify(signedTx, undefined, 4); +} + + async function sign_msg (logger: sk.Logger) @@ -224,6 +243,7 @@ main document.getElementById('address')!.onclick = function() { address(logger); }; document.getElementById('mk-spendtx')!.onclick = function() { form_tx(logger); }; document.getElementById('sign-spendtx')!.onclick = function() { sign_tx(logger); }; + document.getElementById('sign-spendtx-prop')!.onclick = function() { sign_tx_prop(logger); }; document.getElementById('sign-message')!.onclick = function() { sign_msg(logger); }; //set_pv_address("ak_2XhCkjzTwcq1coXSSzHJoMZkUzTwnjH88zmPGkkowUsFNTo9UE"); diff --git a/sidekick_examples/src/hello.ts b/sidekick_examples/src/hello.ts index a0d980f..b78f53f 100644 --- a/sidekick_examples/src/hello.ts +++ b/sidekick_examples/src/hello.ts @@ -1,3 +1,3 @@ -import * as sk from './jex_include/local-sidekick-0.2.1/dist/sidekick.js'; +import * as sk from './jex_include/local-sidekick-0.2.2/dist/sidekick.js'; sk.hello();