Skip to content

Commit

Permalink
v16.0.1 (#2412)
Browse files Browse the repository at this point in the history
* updated tests and upgraded flextesa image (#2402)

* updated tests and upgraded flextesa image

* fixed test assertion for flextesa

* updated condition

* fixed test conditions

* skip tests until it gets fixed

* remove comment

* changed quotes and removed extra whitespace

* updated validation conditions for contractAddress (#2413)

* 2407 update website listed nodes (#2414)

* docs: update endpoints for available nodes. remove kathmandu

* docs: add ghostnet smartpy

* docs: remove broken link

---------

Co-authored-by: Zainen Suzuki <[email protected]>

* test: remove limanet integration tests and config (#2420)

* test: remove limanet integration tests and config

* refactor: remove github workflow for lima and flex lima

* fix: rename to lowercase

---------

Co-authored-by: Zainen Suzuki <[email protected]>

* test: combine mumbai test cases with all test cases (#2421)

Co-authored-by: Zainen Suzuki <[email protected]>

* chore: satisfy lerna

* chore(releng) bump version to 16.0.1

---------

Co-authored-by: Zainen <[email protected]>
Co-authored-by: Zainen Suzuki <[email protected]>
  • Loading branch information
3 people authored Mar 31, 2023
1 parent d5b86e9 commit fb064dd
Show file tree
Hide file tree
Showing 59 changed files with 380 additions and 763 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ jobs:
strategy:
matrix:
include:
- testnet: limanet
testnet_uppercase: LIMANET
- testnet: mumbainet
testnet_uppercase: MUMBAINET
steps:
Expand All @@ -71,10 +69,6 @@ jobs:
strategy:
matrix:
include:
- protocol: Lima
testnet: limanet
testnet_uppercase: LIMANET
flextesa_docker_image: oxheadalpha/flextesa:20221123
- protocol: Mumbai
testnet: mumbainet
testnet_uppercase: MUMBAINET
Expand Down
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": "16.0.0",
"version": "16.0.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -25,9 +25,9 @@
},
"dependencies": {
"@airgap/beacon-sdk": "^3.3.1",
"@taquito/beacon-wallet": "^16.0.0",
"@taquito/taquito": "^16.0.0",
"@taquito/utils": "^16.0.0",
"@taquito/beacon-wallet": "^16.0.1",
"@taquito/taquito": "^16.0.1",
"@taquito/utils": "^16.0.1",
"buffer": "^6.0.3",
"svelte-select": "^4.4.7",
"vite-compatible-readable-stream": "^3.6.1"
Expand Down
10 changes: 5 additions & 5 deletions docs/rpc_nodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ 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 | Kathmandunet | https://kathmandunet.ecadinfra.com | [Check](https://kathmandunet.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Limanet | https://limanet.ecadinfra.com | [Check](https://limanet.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 | Mumbainet | https://mumbainet.ecadinfra.com | [Check](https://mumbainet.ecadinfra.com/chains/main/blocks/head/header) |
| ECAD Labs | Limanet | https://limanet.ecadinfra.com | [Check](https://limanet.ecadinfra.com/chains/main/blocks/head/header) |
| SmartPy | Mainnet | https://mainnet.smartpy.io | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header) |
| SmartPy | Kathmandunet | https://kathmandunet.smartpy.io/ | [Check](https://kathmandunet.smartpy.io/chains/main/blocks/head/header) |
| SmartPy | Ghostnet | https://ghostnet.smartpy.io | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header) |
| SmartPy | Limanet | https://limanet.smartpy.io/ | [Check](https://limanet.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 | Limanet | https://rpczero.tzbeta.net/ | [Check](https://rpczero.tzbeta.net/chains/main/blocks/head/header) |
| Marigold | Mainnet | https://mainnet.tezos.marigold.dev/ | [Check](https://mainnet.tezos.marigold.dev/chains/main/blocks/head/header) |
| Marigold | Kathmandunet | https://kathmandunet.tezos.marigold.dev/ | [Check](https://kathmandunet.tezos.marigold.dev/chains/main/blocks/head/header) |
| Marigold | Ghostnet | https://ghostnet.tezos.marigold.dev/ | [Check](https://ghostnet.tezos.marigold.dev/chains/main/blocks/head/header) |
| Marigold | Mumbainet | https://mumbainet.tezos.marigold.dev/ | [Check](https://mumbainet.tezos.marigold.dev/chains/main/blocks/head/header) |
| TezTools | Mainnet | https://eu01-node.teztools.net/ | [Check](https://eu01-node.teztools.net/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.*
Expand Down
22 changes: 11 additions & 11 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@taquito/example",
"private": true,
"version": "16.0.0",
"version": "16.0.1",
"scripts": {
"example": "node -r ts-node/register --preserve-symlinks example-node.ts",
"example:activation": "node -r ts-node/register --preserve-symlinks example-activate.ts",
Expand Down Expand Up @@ -41,16 +41,16 @@
},
"dependencies": {
"@ledgerhq/hw-transport-node-hid": "^6.27.3",
"@taquito/ledger-signer": "^16.0.0",
"@taquito/local-forging": "^16.0.0",
"@taquito/michel-codec": "^16.0.0",
"@taquito/michelson-encoder": "^16.0.0",
"@taquito/rpc": "^16.0.0",
"@taquito/sapling": "^16.0.0",
"@taquito/signer": "^16.0.0",
"@taquito/taquito": "^16.0.0",
"@taquito/tzip16": "^16.0.0",
"@taquito/utils": "^16.0.0",
"@taquito/ledger-signer": "^16.0.1",
"@taquito/local-forging": "^16.0.1",
"@taquito/michel-codec": "^16.0.1",
"@taquito/michelson-encoder": "^16.0.1",
"@taquito/rpc": "^16.0.1",
"@taquito/sapling": "^16.0.1",
"@taquito/signer": "^16.0.1",
"@taquito/taquito": "^16.0.1",
"@taquito/tzip16": "^16.0.1",
"@taquito/utils": "^16.0.1",
"bignumber.js": "^9.1.0"
},
"devDependencies": {
Expand Down
45 changes: 4 additions & 41 deletions integration-tests/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { b58cencode, Prefix, prefix } from '@taquito/utils';
import { importKey, InMemorySigner } from '@taquito/signer';
import { RpcClient, RpcClientCache } from '@taquito/rpc';
import { knownBigMapContractProtoALph, knownContractProtoALph, knownOnChainViewContractAddressProtoALph, knownSaplingContractProtoALph, knownTzip12BigMapOffChainContractProtoALph } from './known-contracts-ProtoALph';
import { knownContractPtLimaPtL, knownBigMapContractPtLimaPtL, knownTzip12BigMapOffChainContractPtLimaPtL, knownSaplingContractPtLimaPtL, knownOnChainViewContractAddressPtLimaPtL } from './known-contracts-PtLimaPtL';
import { knownContractPtGhostnet, knownBigMapContractPtGhostnet, knownTzip12BigMapOffChainContractPtGhostnet, knownSaplingContractPtGhostnet, knownOnChainViewContractAddressPtGhostnet } from './known-contracts-PtGhostnet';
import { knownContractPtMumbai2, knownBigMapContractPtMumbai2, knownTzip12BigMapOffChainContractPtMumbai2, knownSaplingContractPtMumbai2, knownOnChainViewContractAddressPtMumbai2 } from './known-contracts-PtMumbai2';

Expand Down Expand Up @@ -73,24 +72,6 @@ const defaultSecretKey: SecretKeyConfig = {
password: process.env['PASSWORD_SECRET_KEY'] || undefined,
}

const limanetEphemeral = {
rpc: process.env['TEZOS_RPC_LIMANET'] || 'http://ecad-limanet-full:8732',
pollingIntervalMilliseconds: process.env['POLLING_INTERVAL_MILLISECONDS'] || undefined,
rpcCacheMilliseconds: process.env['RPC_CACHE_MILLISECONDS'] || '1000',
knownBaker: process.env['TEZOS_BAKER'] || 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD',
knownContract: process.env['TEZOS_LIMANET_CONTRACT_ADDRESS'] || knownContractPtLimaPtL,
knownBigMapContract: process.env['TEZOS_LIMANET_BIGMAPCONTRACT_ADDRESS'] || knownBigMapContractPtLimaPtL,
knownTzip1216Contract: process.env['TEZOS_LIMANET_TZIP1216CONTRACT_ADDRESS'] || knownTzip12BigMapOffChainContractPtLimaPtL,
knownSaplingContract: process.env['TEZOS_LIMANET_SAPLINGCONTRACT_ADDRESS'] || knownSaplingContractPtLimaPtL,
knownViewContract: process.env['TEZOS_LIMANET_ON_CHAIN_VIEW_CONTRACT'] || knownOnChainViewContractAddressPtLimaPtL,
protocol: Protocols.PtLimaPtL,
signerConfig: {
type: SignerType.EPHEMERAL_KEY as SignerType.EPHEMERAL_KEY,
keyUrl: 'https://api.tez.ie/keys/limanet',
requestHeaders: { Authorization: 'Bearer taquito-example' },
},
};

const mumbainetEphemeral = {
rpc: process.env['TEZOS_RPC_MUMBAINET'] || 'http://ecad-mumbainet-full.i.tez.ie:8732',
pollingIntervalMilliseconds: process.env['POLLING_INTERVAL_MILLISECONDS'] || undefined,
Expand Down Expand Up @@ -119,7 +100,7 @@ const ghostnetEphemeral = {
knownTzip1216Contract: process.env['TEZOS_GHOSTNET_TZIP1216CONTRACT_ADDRESS'] || knownTzip12BigMapOffChainContractPtGhostnet,
knownSaplingContract: process.env['TEZOS_GHOSTNET_SAPLINGCONTRACT_ADDRESS'] || knownSaplingContractPtGhostnet,
knownViewContract: process.env['TEZOS_GHOSTNET_ON_CHAIN_VIEW_CONTRACT'] || knownOnChainViewContractAddressPtGhostnet,
protocol: Protocols.PtLimaPtL,
protocol: Protocols.PtMumbai2,
signerConfig: {
type: SignerType.EPHEMERAL_KEY as SignerType.EPHEMERAL_KEY,
keyUrl: 'https://api.tez.ie/keys/ghostnet',
Expand All @@ -145,20 +126,6 @@ const mondaynetEphemeral = {
},
};

const limanetSecretKey = {
rpc: process.env['TEZOS_RPC_LIMANET'] || 'http://ecad-limanet-full:8732',
pollingIntervalMilliseconds: process.env['POLLING_INTERVAL_MILLISECONDS'] || undefined,
rpcCacheMilliseconds: process.env['RPC_CACHE_MILLISECONDS'] || '1000',
knownBaker: process.env['TEZOS_BAKER'] || 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD',
knownContract: process.env['TEZOS_LIMANET_CONTRACT_ADDRESS'] || knownContractPtLimaPtL,
knownBigMapContract: process.env['TEZOS_LIMANET_BIGMAPCONTRACT_ADDRESS'] || knownBigMapContractPtLimaPtL,
knownTzip1216Contract: process.env['TEZOS_LIMANET_TZIP1216CONTRACT_ADDRESS'] || knownTzip12BigMapOffChainContractPtLimaPtL,
knownSaplingContract: process.env['TEZOS_LIMANET_SAPLINGCONTRACT_ADDRESS'] || knownSaplingContractPtLimaPtL,
knownViewContract: process.env['TEZOS_LIMANET_ON_CHAIN_VIEW_CONTRACT'] || knownOnChainViewContractAddressPtLimaPtL,
protocol: Protocols.PtLimaPtL,
signerConfig: defaultSecretKey
};

const mumbainetSecretKey = {
rpc: process.env['TEZOS_RPC_MUMBAINET'] || 'http://ecad-mumbainet-full:8732',
pollingIntervalMilliseconds: process.env['POLLING_INTERVAL_MILLISECONDS'] || undefined,
Expand All @@ -183,7 +150,7 @@ const ghostnetSecretKey = {
knownTzip1216Contract: process.env['TEZOS_GHOSTNET_TZIP1216CONTRACT_ADDRESS'] || knownTzip12BigMapOffChainContractPtGhostnet,
knownSaplingContract: process.env['TEZOS_GHOSTNET_SAPLINGCONTRACT_ADDRESS'] || knownSaplingContractPtGhostnet,
knownViewContract: process.env['TEZOS_GHOSTNET_ON_CHAIN_VIEW_CONTRACT'] || knownOnChainViewContractAddressPtGhostnet,
protocol: Protocols.PtLimaPtL,
protocol: Protocols.PtMumbai2,
signerConfig: defaultSecretKey
};

Expand All @@ -204,25 +171,21 @@ const mondaynetSecretKey = {
const providers: Config[] = [];

if (process.env['RUN_WITH_SECRET_KEY']) {
providers.push(limanetSecretKey);
} else if (process.env['RUN_LIMANET_WITH_SECRET_KEY']) {
providers.push(limanetSecretKey);
providers.push(mumbainetSecretKey);
} else if (process.env['RUN_MUMBAINET_WITH_SECRET_KEY']) {
providers.push(mumbainetSecretKey);
} else if (process.env['RUN_GHOSTNET_WITH_SECRET_KEY']) {
providers.push(ghostnetSecretKey);
} else if (process.env['RUN_MONDAYNET_WITH_SECRET_KEY']) {
providers.push(mondaynetSecretKey);
} else if (process.env['LIMANET']) {
providers.push(limanetEphemeral);
} else if (process.env['MUMBAINET']) {
providers.push(mumbainetEphemeral);
} else if (process.env['GHOSTNET']) {
providers.push(ghostnetEphemeral);
} else if (process.env['MONDAYNET']) {
providers.push(mondaynetEphemeral);
} else {
providers.push(limanetEphemeral, mumbainetEphemeral);
providers.push(mumbainetEphemeral);
}

const setupForger = (Tezos: TezosToolkit, forger: ForgerType): void => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { CONFIGS } from './config';
import { ligoSample } from './data/ligo-simple-contract';
import { Protocols } from '@taquito/taquito';

CONFIGS().forEach(({ lib, rpc, setup, protocol }) => {
CONFIGS().forEach(({ lib, rpc, setup }) => {
const Tezos = lib;
const mumbaiAndAlpha = protocol === Protocols.PtMumbai2 || protocol === Protocols.ProtoALpha ? test : test.skip;

describe(`Test contract.batch with smart rollup add messages using: ${rpc}`, () => {
beforeEach(async (done) => {
await setup(true);
done();
});

mumbaiAndAlpha('should be able to batch smart rollup add messages with other operations', async (done) => {
it('should be able to batch smart rollup add messages with other operations', async (done) => {
const batch = Tezos.contract
.batch()
.withSmartRollupAddMessages({
Expand All @@ -26,11 +24,11 @@ CONFIGS().forEach(({ lib, rpc, setup, protocol }) => {
});
const op = await batch.send();
await op.confirmation();

expect(op.status).toEqual('applied');
expect(op.includedInBlock).toBeDefined();

done();
});
});
});
});
Loading

0 comments on commit fb064dd

Please sign in to comment.