Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ecadlabs/taquito
Browse files Browse the repository at this point in the history
  • Loading branch information
hui-an-yang committed Aug 29, 2024
2 parents 42a5799 + 586cab4 commit e45286c
Show file tree
Hide file tree
Showing 33 changed files with 16,940 additions and 23,853 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ integration-tests/jest-stare
**/saplingOutputParams*
**/saplingSpendParams*
apps/**/node_modules
.nx
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20
24 changes: 12 additions & 12 deletions apps/taquito-test-dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
"check": "svelte-check --tsconfig ./tsconfig.json"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^2.4.6",
"@tsconfig/svelte": "^5.0.2",
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"@tsconfig/svelte": "^5.0.4",
"events": "^3.3.0",
"lerna": "^7.4.2",
"prettier-plugin-svelte": "^3.0.3",
"sass": "^1.70.0",
"svelte": "^4.2.1",
"svelte-check": "^3.5.2",
"svelte-preprocess": "^5.0.4",
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"vite": "^4.4.11"
"lerna": "^8.1.7",
"prettier-plugin-svelte": "^3.2.6",
"sass": "^1.77.8",
"svelte": "^4.2.18",
"svelte-check": "^3.8.5",
"svelte-preprocess": "^6.0.2",
"tslib": "^2.6.3",
"typescript": "^5.5.4",
"vite": "^5.3.5"
},
"dependencies": {
"@airgap/beacon-sdk": "^4.2.2",
Expand All @@ -31,7 +31,7 @@
"@taquito/taquito": "^20.0.1",
"@taquito/utils": "^20.0.1",
"buffer": "^6.0.3",
"svelte-select": "^5.7.0",
"svelte-select": "^5.8.3",
"vite-compatible-readable-stream": "^3.6.1"
},
"alias": {
Expand Down
2 changes: 1 addition & 1 deletion apps/taquito-test-dapp/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const rpcUrls: Record<SupportedNetworks, string> = {
[NetworkType.MAINNET]: "https://mainnet.ecadinfra.com",
[NetworkType.GHOSTNET]: "https://ghostnet.ecadinfra.com/",
[NetworkType.OXFORDNET]: "https://oxfordnet.ecadinfra.com/",
[NetworkType.PARISNET]: "https://rpc.parisnet.teztnets.com/",
[NetworkType.PARISNET]: "https://rpc.pariscnet.teztnets.com/",
[NetworkType.CUSTOM]: "https://ghostnet.ecadinfra.com/",
};

Expand Down
18 changes: 9 additions & 9 deletions apps/taquito-test-dapp/src/lib/Wallet.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@
Tezos.setWalletProvider(wallet);
store.updateTezos(Tezos);
const activeAccount = await wallet.client.getActiveAccount();
if (activeAccount) {
const userAddress = (await wallet.getPKH()) as TezosAccountAddress;
store.updateUserAddress(userAddress);
// const activeAccount = await wallet.client.getActiveAccount();
// if (activeAccount) {
// const userAddress = (await wallet.getPKH()) as TezosAccountAddress;
// store.updateUserAddress(userAddress);
const balance = await Tezos.tz.getBalance(userAddress);
if (balance) {
store.updateUserBalance(balance.toNumber());
}
}
// const balance = await Tezos.tz.getBalance(userAddress);
// if (balance) {
// store.updateUserBalance(balance.toNumber());
// }
// }
return wallet;
};
Expand Down
2 changes: 1 addition & 1 deletion docs/rpc_nodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ values={[
| SmartPy | Ghostnet | https://ghostnet.smartpy.io | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header) |
| Tezos Foundation | Mainnet | https://rpc.tzbeta.net/ | [Check](https://rpc.tzbeta.net/chains/main/blocks/head/header) |
| Tezos Foundation | Ghostnet | https://rpc.ghostnet.teztnets.com/ | [Check](https://rpc.ghostnet.teztnets.com/chains/main/blocks/head/header) |
| Tezos Foundation | Parisnet | https://rpc.parisnet.teztnets.com/ | [Check](https://rpc.parisnet.teztnets.com/chains/main/blocks/head/header) |
| Tezos Foundation | Parisnet | https://rpc.pariscnet.teztnets.com/ | [Check](https://rpc.pariscnet.teztnets.com/chains/main/blocks/head/header) |

*If you are aware of a public node missing from our list or our information is inaccurate, please help us by submitting an issue or pull request on our GitHub page.*
</TabItem>
Expand Down
6 changes: 3 additions & 3 deletions docs/signing.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ InMemorySigner.fromSecretKey('edsk2rKA8YEExg9Zo2qNPiQnnYheF1DhqjLVmfKdxiFfu5GyGR
return Tezos.signer.sign(bytes, new Uint8Array([parseInt(magicByte, 16)]))
})
.then(signed => {
println(JSON.stringify(signed, null, 2));
console.log(JSON.stringify(signed, null, 2));
})
.catch((error) => println(`Error: ${error} ${JSON.stringify(error, null, 2)}`));
.catch((error) => console.log(`Error: ${error} ${JSON.stringify(error, null, 2)}`));
```

</TabItem>
Expand All @@ -219,7 +219,7 @@ const payload = {
signingType: SigningType.RAW,
payload: magicByte + bytes
}
wallet.client.requestSignPayload(payload).then(signed => println(JSON.stringify(signed, null, 2)))
wallet.client.requestSignPayload(payload).then(signed => console.log(JSON.stringify(signed, null, 2)))
```

</TabItem>
Expand Down
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"example:scan-path-ledger": "node -r ts-node/register --preserve-symlinks scan-path-ledger.ts"
},
"dependencies": {
"@ledgerhq/hw-transport-node-hid": "^6.28.5",
"@ledgerhq/hw-transport-node-hid": "^6.29.3",
"@taquito/ledger-signer": "^20.0.1",
"@taquito/local-forging": "^20.0.1",
"@taquito/michel-codec": "^20.0.1",
Expand All @@ -55,7 +55,7 @@
"bignumber.js": "^9.1.2"
},
"devDependencies": {
"@types/node-hid": "^1.3.2",
"ts-node": "^10.9.1"
"@types/node-hid": "^1.3.4",
"ts-node": "^10.9.2"
}
}
26 changes: 13 additions & 13 deletions integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
},
"version": "20.0.1",
"dependencies": {
"@ledgerhq/devices": "8.2.2",
"@ledgerhq/hw-transport": "6.30.5",
"@ledgerhq/hw-transport-node-hid": "6.28.5",
"@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
"@ledgerhq/devices": "8.4.2",
"@ledgerhq/hw-transport": "6.31.2",
"@ledgerhq/hw-transport-node-hid": "6.29.3",
"@ledgerhq/hw-transport-node-hid-noevents": "6.30.3",
"@taquito/contracts-library": "^20.0.1",
"@taquito/core": "^20.0.1",
"@taquito/http-utils": "^20.0.1",
Expand Down Expand Up @@ -64,19 +64,19 @@
"testResultsProcessor": "../node_modules/jest-stare"
},
"devDependencies": {
"@types/jest": "^29.5.5",
"@types/node": "^20.11.20",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"eslint": "^8.51.0",
"@types/jest": "^29.5.12",
"@types/node": "^22.0.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.57.0",
"jest": "^29.7.0",
"jest-config": "^29.7.0",
"jest-retries": "^1.0.1",
"jest-stare": "2.5.1",
"lint-staged": "^14.0.1",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "~5.2.2"
"lint-staged": "^15.2.7",
"ts-jest": "^29.2.3",
"ts-node": "^10.9.2",
"typescript": "~5.5.4"
},
"config": {
"commitizen": {
Expand Down
Loading

0 comments on commit e45286c

Please sign in to comment.