Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ecadlabs/taquito into oxford
Browse files Browse the repository at this point in the history
  • Loading branch information
hui-an-yang committed Aug 31, 2023
2 parents 3c3687c + b7520a1 commit fa1e4f7
Show file tree
Hide file tree
Showing 166 changed files with 3,008 additions and 1,365 deletions.
8 changes: 4 additions & 4 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": "17.2.0",
"version": "17.3.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -25,9 +25,9 @@
},
"dependencies": {
"@airgap/beacon-sdk": "4.0.6",
"@taquito/beacon-wallet": "^17.2.0",
"@taquito/taquito": "^17.2.0",
"@taquito/utils": "^17.2.0",
"@taquito/beacon-wallet": "^17.3.0",
"@taquito/taquito": "^17.3.0",
"@taquito/utils": "^17.3.0",
"buffer": "^6.0.3",
"svelte-select": "^4.4.7",
"vite-compatible-readable-stream": "^3.6.1"
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 @@ -5,7 +5,7 @@ export const rpcUrl = {
nairobinet: "https://nairobinet.ecadinfra.com/",
ghostnet: "https://ghostnet.ecadinfra.com/",
ithacanet: "https://ithacanet.ecadinfra.com/",
mainnet: "https://mainnet.api.tez.ie", //"https://mainnet-tezos.giganode.io"
mainnet: "https://mainnet.ecadinfra.com", //"https://mainnet-tezos.giganode.io"
custom: "https://ghostnet.ecadinfra.com/"
};

Expand Down
3 changes: 1 addition & 2 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@
"**/coverage/**",
"**/build/**",
"**/scripts/**",
"**/examples/**",
"**/packages/**"
"**/examples/**"
],
"ignoreRegExpList": [
"KT1[a-zA-Z0-9]{33}",
Expand Down
2 changes: 1 addition & 1 deletion docs/estimate.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Tezos.contract

```js live noInline wallet
// import { TezosToolkit } from '@taquito/taquito';
// const Tezos = new TezosToolkit('https://ghostnet.api.tez.ie');
// const Tezos = new TezosToolkit('https://ghostnet.ecadinfra.com');

Tezos.wallet
.at('KT1BJadpDyLCACMH7Tt9xtpx4dQZVKw9cDF7')
Expand Down
4 changes: 2 additions & 2 deletions docs/making_transfers.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ In the following example, we transfer 0.5ꜩ from a `tz1aaYoabvj2DQtpHz74Z83fSNj
// const Tezos = new TezosToolkit('https://ghostnet.ecadinfra.com');

render(`Fetching a private key...`);
fetch('https://api.tez.ie/keys/ghostnet/', {
fetch('https://keygen.ecadinfra.com/ghostnet/', {
method: 'POST',
headers: { Authorization: 'Bearer taquito-example' },
})
Expand Down Expand Up @@ -136,4 +136,4 @@ export const transferToContract = (key: string, amount: number) => {
{ prim: 'CONS' },
];
};
```
```
2 changes: 1 addition & 1 deletion docs/rpc_nodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ values={[

| Provider | Net | URL | Header |
|------------------|--------------|------------------------------------------|---------------------------------------------------------------------------------|
| ECAD Labs | Mainnet | https://mainnet.api.tez.ie | [Check](https://mainnet.api.tez.ie/chains/main/blocks/head/header) |
| ECAD Labs | Mainnet | https://mainnet.ecadinfra.com | [Check](https://mainnet.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Ghostnet | https://ghostnet.ecadinfra.com | [Check](https://ghostnet.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Nairobinet | https://nairobinet.ecadinfra.com | [Check](https://nairobinet.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Mumbainet | https://mumbainet.ecadinfra.com | [Check](https://mumbainet.ecadinfra.com/chains/main/blocks/head/header) |
Expand Down
6 changes: 3 additions & 3 deletions docs/tezos_domains.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const domainContractAddress = "KT1GBZmSxmnKJXGMdMLbugPfLyUPmuLSMwKS";

// the function returns the domain name if found or the provided address
const fetchTezosDomainFromAddress = async (address: string): Promise<string> => {
const Tezos = new TezosToolkit("https://mainnet.api.tez.ie");
const Tezos = new TezosToolkit("https://mainnet.ecadinfra.com");
const contract = await Tezos.wallet.at(domainContractAddress);
const storage: any = await contract.storage();
const domain = await storage.store.reverse_records.get(address);
Expand Down Expand Up @@ -53,7 +53,7 @@ const contractAddress = "KT1GBZmSxmnKJXGMdMLbugPfLyUPmuLSMwKS";

// the function returns the address if found or the provided domain name
const fetchAddressFromTezosDomain = async (domainName: string): Promise<string> => {
const Tezos = new TezosToolkit("https://mainnet.api.tez.ie");
const Tezos = new TezosToolkit("https://mainnet.ecadinfra.com");
const contract = await Tezos.wallet.at(contractAddress);
const storage: any = await contract.storage();
const domain = await storage.store.records.get(char2Bytes(domainName));
Expand Down Expand Up @@ -82,7 +82,7 @@ const contractAddress = "KT1GBZmSxmnKJXGMdMLbugPfLyUPmuLSMwKS";

// this function return the expiry date of a domain name
const fetchExpiryDate = async (domainName: string): Promise<string> => {
const Tezos = new TezosToolkit("https://mainnet.api.tez.ie");
const Tezos = new TezosToolkit("https://mainnet.ecadinfra.com");
const contract = await Tezos.wallet.at(contractAddress);
const storage: any = await contract.storage();
const expiryDate = await storage.store.expiry_map.get(char2Bytes(domainName));
Expand Down
Loading

0 comments on commit fa1e4f7

Please sign in to comment.