diff --git a/install-all.sh b/install-all.sh
index a203caa3e3..dbdbe7c4c0 100644
--- a/install-all.sh
+++ b/install-all.sh
@@ -1,5 +1,5 @@
-npm i
-npm i --prefix packages/yoroi-extension
-npm i --prefix packages/yoroi-ergo-connector
-npm i --prefix packages/yoroi-ergo-connector/example-ergo
-npm i --prefix packages/yoroi-ergo-connector/example-cardano
\ No newline at end of file
+npm i \
+&& npm i --prefix packages/yoroi-extension \
+&& npm i --prefix packages/yoroi-ergo-connector \
+&& npm i --prefix packages/yoroi-ergo-connector/example-ergo \
+&& npm i --prefix packages/yoroi-ergo-connector/example-cardano
\ No newline at end of file
diff --git a/packages/yoroi-ergo-connector/example-cardano/index.html b/packages/yoroi-ergo-connector/example-cardano/index.html
index 1e256ff23d..e33d847135 100644
--- a/packages/yoroi-ergo-connector/example-cardano/index.html
+++ b/packages/yoroi-ergo-connector/example-cardano/index.html
@@ -35,6 +35,9 @@
diff --git a/packages/yoroi-ergo-connector/example-cardano/index.js b/packages/yoroi-ergo-connector/example-cardano/index.js
index 5f45ed6fc4..1fae492da9 100644
--- a/packages/yoroi-ergo-connector/example-cardano/index.js
+++ b/packages/yoroi-ergo-connector/example-cardano/index.js
@@ -8,6 +8,7 @@ const getAccountBalance = document.querySelector('#get-balance')
const getUtxos = document.querySelector('#get-utxos')
const submitTx = document.querySelector('#submit-tx')
const signTx = document.querySelector('#sign-tx')
+const createTx = document.querySelector('#create-tx')
const alertEl = document.querySelector('#alert')
const spinner = document.querySelector('#spinner')
@@ -150,7 +151,7 @@ signTx.addEventListener('click', () => {
alertError('Should request change address first')
}
- const txBuilder = CardanoWasm.WalletV4TxBuilder(
+ const txBuilder = CardanoWasm.TransactionBuilder.new(
// all of these are taken from the mainnet genesis settings
// linear fee parameters (a*size + b)
CardanoWasm.LinearFee.new(CardanoWasm.BigNum.from_str('44'), CardanoWasm.BigNum.from_str('155381')),
@@ -159,7 +160,11 @@ signTx.addEventListener('click', () => {
// pool deposit
CardanoWasm.BigNum.from_str('500000000'),
// key deposit
- CardanoWasm.BigNum.from_str('2000000')
+ CardanoWasm.BigNum.from_str('2000000'),
+ // maxValueBytes
+ 5000,
+ // maxTxBytes
+ 16384,
)
// add a keyhash input - for ADA held in a Shelley-era normal address (Base, Enterprise, Pointer)
@@ -206,7 +211,7 @@ signTx.addEventListener('click', () => {
cardanoApi.sign_tx(txHex, true).then(witnessSetHex => {
toggleSpinner('hide')
- alertSuccess('Signing tx succeeds: ')
+
const witnessSet = CardanoWasm.TransactionWitnessSet.from_bytes(
Buffer.from(witnessSetHex, 'hex')
)
@@ -216,6 +221,8 @@ signTx.addEventListener('click', () => {
undefined,
)
transactionHex = Buffer.from(transaction.to_bytes()).toString('hex')
+ alertSuccess('Signing tx succeeds: ' + transactionHex)
+
}).catch(error => {
console.error(error)
toggleSpinner('hide')
@@ -223,6 +230,48 @@ signTx.addEventListener('click', () => {
})
})
+createTx.addEventListener('click', () => {
+ toggleSpinner('show');
+
+ if (!accessGranted) {
+ alertError('Should request access first');
+ return;
+ }
+
+ const output = CardanoWasm.TransactionOutput.new(
+ CardanoWasm.Address.from_bech32(SEND_TO_ADDRESS),
+ CardanoWasm.Value.new(CardanoWasm.BigNum.from_str('1000002'))
+ )
+
+ const txReq = {
+ includeInputs: [
+ 'a8ecebf0632518736474012f8d644b6b287859713f60624e961d230422e45c192'
+ ],
+ includeOutputs: [
+ Buffer.from(output.to_bytes()).toString('hex'),
+ ],
+ includeTargets: [
+ {
+ // do not specify value, the connector will use minimum value
+ address: '00756c95f9967c214e571500a0140b88f6dd9c4a7444e74acc1841ce92c3892366f174a76af9252f78368f5747d3055ab3568ea3b6bf40b01e',
+ assets: {
+ '2c9d0ecfc2ee1288056df15be4196d8ded73db345ea5b4cd5c7fac3f.76737562737465737435': 1,
+ },
+ }
+ ]
+ }
+
+ cardanoApi.create_tx(txReq, true).then(txHex => {
+ toggleSpinner('hide')
+ alertSuccess('Creating tx succeeds: ' + txHex)
+ transactionHex = txHex
+ }).catch(error => {
+ console.error(error)
+ toggleSpinner('hide')
+ alertWarrning('Creating tx fails')
+ })
+})
+
if (typeof cardano === "undefined") {
alert("Cardano not found");
} else {
diff --git a/packages/yoroi-ergo-connector/example-cardano/package-lock.json b/packages/yoroi-ergo-connector/example-cardano/package-lock.json
index 0242854f90..ace33ab1d1 100644
--- a/packages/yoroi-ergo-connector/example-cardano/package-lock.json
+++ b/packages/yoroi-ergo-connector/example-cardano/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@emurgo/cardano-serialization-lib-browser": {
- "version": "6.0.0",
- "resolved": "https://registry.nlark.com/@emurgo/cardano-serialization-lib-browser/download/@emurgo/cardano-serialization-lib-browser-6.0.0.tgz",
- "integrity": "sha1-HTPgrqTiCXSqSsXMdmhCI5nqc74=",
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-9.1.0.tgz",
+ "integrity": "sha512-FaNW/RalB/BPYvQbum0zkUcMxd+jKvsdwvT93GErKd/owE9W4IKhQfqI9icDZSphqFFPkDqHms2VE4XT4P7gDA==",
"dev": true
},
"@types/glob": {
diff --git a/packages/yoroi-ergo-connector/example-cardano/package.json b/packages/yoroi-ergo-connector/example-cardano/package.json
index fc801f0642..849f7f99a6 100644
--- a/packages/yoroi-ergo-connector/example-cardano/package.json
+++ b/packages/yoroi-ergo-connector/example-cardano/package.json
@@ -11,7 +11,7 @@
"start": "webpack-dev-server"
},
"devDependencies": {
- "@emurgo/cardano-serialization-lib-browser": "6.0.0",
+ "@emurgo/cardano-serialization-lib-browser": "9.1.0",
"webpack": "^4.29.3",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.5",
diff --git a/packages/yoroi-ergo-connector/example-ergo/index.html b/packages/yoroi-ergo-connector/example-ergo/index.html
index af5b4dc928..2d7860cdfe 100644
--- a/packages/yoroi-ergo-connector/example-ergo/index.html
+++ b/packages/yoroi-ergo-connector/example-ergo/index.html
@@ -3,12 +3,46 @@
+
Ergo Test dApp
-
Balance: n/a
-
Wallet not connected
+
+
+
+
Ergo dApp Example
+
+
+
+ Request access to yoroi
+
+
+ Get Balance
+
+
+ Get Unused Addresses
+
+
+ Get Used Addresses
+
+
+ Get Change Address
+
+
+ Get Utxos
+
+
+ Sign Tx
+
+
+
+
+
This page contains webassembly and javascript content, please enable javascript in your browser.
+