Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ecadlabs/taquito into pre…
Browse files Browse the repository at this point in the history
…pare_bugs
  • Loading branch information
hui-an-yang committed Jan 7, 2025
2 parents bccbe1e + fa8b6f0 commit 2661add
Show file tree
Hide file tree
Showing 190 changed files with 3,475 additions and 4,497 deletions.
1 change: 1 addition & 0 deletions .github/workflows/bundle_webpack.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Bundle Webpack

on:
pull_request:
push:
branches:
- master
Expand Down
31 changes: 7 additions & 24 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ jobs:
include:
- testnet: parisnet
testnet_uppercase: PARISNET
rpc_url: https://rpc.pariscnet.teztnets.com/
- testnet: quebecnet
testnet_uppercase: QUEBECNET
rpc_url: https://rpc.quebecnet.teztnets.com/
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand All @@ -59,29 +63,8 @@ jobs:
with:
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
version: 1.32.2
- run: npm -w integration-tests run test:${{ matrix.testnet }} -- --maxWorkers=4
- id: run-tests
run: npm -w integration-tests run test:${{ matrix.testnet }} -- --maxWorkers=4
env:
# Ternary operator workaround
TEZOS_RPC_${{ matrix.testnet_uppercase }}: ${{ github.event.pull_request.head.repo.fork && format('https://{0}.ecadinfra.com', matrix.testnet) || null }}

integration-tests-tezbox:
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
include:
- testnet: parisnet
testnet_uppercase: PARISNET
flextesa_docker_image:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/hydrogen
- name: Provision Tezbox ${{ matrix.testnet }} container
run: npm -w integration-tests run sandbox:${{ matrix.testnet }}
- run: npm ci
- run: npm run build
- run: npm -w integration-tests run test __tests__/tezbox/
env:
TEZOS_RPC_${{ matrix.testnet_uppercase }}: http://0.0.0.0:8732
TEZOS_RPC_${{ matrix.testnet_uppercase }}: ${{ github.event.pull_request.head.repo.fork && matrix.rpc_url || null }}
16 changes: 8 additions & 8 deletions apps/taquito-test-dapp/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "taquito-test-dapp-vite",
"private": true,
"version": "20.1.2",
"version": "21.0.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -24,13 +24,13 @@
"vite": "^5.3.5"
},
"dependencies": {
"@airgap/beacon-sdk": "^4.3.1",
"@airgap/beacon-types": "^4.3.1",
"@taquito/beacon-wallet": "^20.1.2",
"@taquito/core": "^20.1.2",
"@taquito/taquito": "^20.1.2",
"@taquito/utils": "^20.1.2",
"@taquito/wallet-connect": "^20.1.2",
"@airgap/beacon-sdk": "^4.3.2-beta.0",
"@airgap/beacon-types": "^4.3.2-beta.0",
"@taquito/beacon-wallet": "^21.0.0",
"@taquito/core": "^21.0.0",
"@taquito/taquito": "^21.0.0",
"@taquito/utils": "^21.0.0",
"@taquito/wallet-connect": "^21.0.0",
"buffer": "^6.0.3",
"svelte-modals": "^2.0.0-beta.2",
"svelte-select": "^5.8.3",
Expand Down
4 changes: 4 additions & 0 deletions apps/taquito-test-dapp/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
let availableNetworks = [
{ value: "ghostnet", label: "Ghostnet", group: "current testnets" },
{ value: "parisnet", label: "Parisnet", group: "current testnets" },
{ value: "quebecnet", label: "Quebecnet", group: "current testnets" },
{ value: "mainnet", label: "Mainnet", group: "mainnet" },
{ value: "dailynet", label: "Dailynet", group: "other testnets" },
{ value: "weeklynet", label: "Weeklynet", group: "other testnets" },
Expand Down Expand Up @@ -42,6 +43,9 @@
case "parisnet":
store.updateNetworkType(NetworkType.PARISNET);
break;
case "quebecnet":
store.updateNetworkType(NetworkType.QUEBECNET);
break;
case "custom":
//TODO: input custom RPC URL
showCustomNetworkInput = true;
Expand Down
7 changes: 6 additions & 1 deletion apps/taquito-test-dapp/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { NetworkType as NetworkTypeBeacon } from "@airgap/beacon-sdk";
import { NetworkType as NetworkTypeWc } from "@taquito/wallet-connect";

export type SupportedNetworks = NetworkTypeBeacon.MAINNET | NetworkTypeBeacon.GHOSTNET | NetworkTypeBeacon.PARISNET | NetworkTypeWc.MAINNET | NetworkTypeWc.GHOSTNET | NetworkTypeWc.PARISNET | NetworkTypeBeacon.CUSTOM;
export type SupportedNetworks = NetworkTypeBeacon.MAINNET | NetworkTypeBeacon.GHOSTNET | NetworkTypeBeacon.PARISNET | NetworkTypeBeacon.QUEBECNET | NetworkTypeWc.MAINNET | NetworkTypeWc.GHOSTNET | NetworkTypeWc.PARISNET | NetworkTypeWc.QUEBECNET | NetworkTypeBeacon.CUSTOM;

const rpcUrls: Record<SupportedNetworks, string> = {
[NetworkTypeBeacon.MAINNET]: "https://mainnet.tezos.ecadinfra.com",
[NetworkTypeBeacon.GHOSTNET]: "https://ghostnet.tezos.ecadinfra.com/",
[NetworkTypeBeacon.PARISNET]: "https://rpc.pariscnet.teztnets.com/",
[NetworkTypeBeacon.QUEBECNET]: "https://rpc.quebecnet.teztnets.com",
[NetworkTypeBeacon.CUSTOM]: "https://ghostnet.tezos.ecadinfra.com/",
};

Expand All @@ -25,6 +26,9 @@ export const getTzKtUrl = (networkType: SupportedNetworks): string | undefined =
case NetworkTypeBeacon.PARISNET:
case NetworkTypeWc.PARISNET:
return "https://parisnet.tzkt.io";
case NetworkTypeBeacon.QUEBECNET:
case NetworkTypeWc.QUEBECNET:
return "https://quebecnet.tzkt.io";
case NetworkTypeBeacon.CUSTOM:
return undefined;
}
Expand All @@ -40,4 +44,5 @@ export const contractAddress = {
ghostnet: "KT1QKmcNBcfzVTXG2kBcE6XqXtEuYYUzMcT5",
oxfordnet: "KT1GYx1KDhMQt2GJEztRh8EyYxJUPM6fnAMM",
parisnet: "KT1E43cQefjM8fq7B5pEJFJoGbRmuNibDoBC",
quebecnet: "KT1JZ3H8zMn6GXoftLpRzGUwRD4fP7mmxKqW"
};
2 changes: 2 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"b58cdecode",
"b58cencode",
"beaconwallet",
"BETANET",
"bigmap",
"BIGMAPCONTRACT",
"bigmaps",
Expand Down Expand Up @@ -86,6 +87,7 @@
"Protofire",
"ProxfordY",
"PtNairobi",
"Quebecnet",
"refetched",
"riscv",
"rollups",
Expand Down
2 changes: 1 addition & 1 deletion docs/consensus_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Consensus Keys
author: Davis Sawali & Hui-An Yang
---

The "consensus key" feature allows bakers to use a different key, called the consensus key. It will allow for baking and signing consensus operations (i.e. preattestation/preendorsements and attestation/endorsements). For more detailed information on consensus keys, refer to [this documentation](https://tezos.gitlab.io/protocols/015_lima.html?highlight=update%20consensus%20key#consensus-key)
The "consensus key" feature allows bakers to use a different key, called the consensus key. It will allow for baking and signing consensus operations (i.e. preattestation and attestation). For more detailed information on consensus keys, refer to [this documentation](https://tezos.gitlab.io/protocols/015_lima.html?highlight=update%20consensus%20key#consensus-key)

Starting from Lima protocol, these 2 new operations will be available:

Expand Down
12 changes: 6 additions & 6 deletions docs/maps_bigmaps.md
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ Tezos.contract
//When called on a bigMap, the get method returns a promise
return myStorage['thebigmap'].get({
0: '10', //nat
1: 'tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx', //address
1: 'tz3WXYtyDUNL91qfiCJtVUX746QpNv5i5ve5', //address
});
})
.then((valueBigMap) => {
Expand Down Expand Up @@ -851,7 +851,7 @@ Tezos.wallet
//When called on a bigMap, the get method returns a promise
return myStorage['thebigmap'].get({
0: '10', //nat
1: 'tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx', //address
1: 'tz3WXYtyDUNL91qfiCJtVUX746QpNv5i5ve5', //address
});
})
.then((valueBigMap) => {
Expand Down Expand Up @@ -915,9 +915,9 @@ Tezos.contract
console.log('Fetching the big map values...\n');
return storage['0'].getMultipleValues([
'tz3WXYtyDUNL91qfiCJtVUX746QpNv5i5ve5',
'tz1h3rQ8wBxFd8L9B3d7Jhaawu6Z568XU3xY',
'tz1PgQt52JMirBUhhkq1eanX8hVd1Fsg71Lr',
'tz1bwsEWCwSEXdRvnJxvegQZKeX5dj6oKEys',
'tz1VSUr8wwNhLAzempoch5d6hLRiTh8Cjcjb',
'tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx',
]);
})
.then((values) => {
Expand Down Expand Up @@ -945,9 +945,9 @@ Tezos.wallet
console.log('Fetching the big map values...\n');
return storage['0'].getMultipleValues([
'tz3WXYtyDUNL91qfiCJtVUX746QpNv5i5ve5',
'tz1h3rQ8wBxFd8L9B3d7Jhaawu6Z568XU3xY',
'tz1PgQt52JMirBUhhkq1eanX8hVd1Fsg71Lr',
'tz1bwsEWCwSEXdRvnJxvegQZKeX5dj6oKEys',
'tz1VSUr8wwNhLAzempoch5d6hLRiTh8Cjcjb',
'tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx',
]);
})
.then((values) => {
Expand Down
15 changes: 10 additions & 5 deletions docs/rpc_nodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,26 @@ values={[

| Provider | Net | URL | Header |
|------------------|--------------|------------------------------------------|---------------------------------------------------------------------------------|
| ECAD Labs | Mainnet | https://mainnet.tezos.ecadinfra.com | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Ghostnet | https://ghostnet.tezos.ecadinfra.com | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Mainnet | https://mainnet.tezos.ecadinfra.com | [Check](https://mainnet.tezos.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Ghostnet | https://ghostnet.tezos.ecadinfra.com | [Check](https://ghostnet.tezos.ecadinfra.com/chains/main/blocks/head/header) |
| SmartPy | Mainnet | https://mainnet.smartpy.io | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header) |
| 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.pariscnet.teztnets.com/ | [Check](https://rpc.pariscnet.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) |
| Tezos Foundation | Quebecnet | https://rpc.quebecnet.teztnets.com/ | [Check](https://rpc.quebecnet.teztnets.com/chains/main/blocks/head/header) |
| Tzkt | Mainnet | https://rpc.tzkt.io/mainnet/ | [Check](https://rpc.tzkt.io/mainnet/chains/main/blocks/head/header) |
| Tzkt | Ghostnet | https://rpc.tzkt.io/ghostnet | [Check](https://rpc.tzkt.io/ghostnet/chains/main/blocks/head/header) |
| Tzkt | Parisnet | https://rpc.tzkt.io/parisnet | [Check](https://rpc.tzkt.io/parisnet/chains/main/blocks/head/header) |
| Tzkt | Quebecnet | https://rpc.tzkt.io/quebecnet | [Check](https://rpc.tzkt.io/quebecnet/chains/main/blocks/head/header) |

https://api.mainnet.tzkt.io/
*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>
<TabItem value="commercialNodes">

| Provider | Details |
|------------------|---------------------------------------------|
| TzPro | https://tzpro.io/ |
| MIDL.dev | https://midl.dev/tezos-rpc/ |
| Exaion | https://node.exaion.com |

Expand Down
Loading

0 comments on commit 2661add

Please sign in to comment.