Merge branch 'master' of github.com:ecadlabs/taquito into oxford

.github/workflows/main.yml

@@ -78,7 +78,7 @@ jobs:
           - protocol: Oxford
             testnet: oxfordnet
             testnet_uppercase: OXFORDNET
-            flextesa_docker_image: oxheadalpha/flextesa:20230901
+            flextesa_docker_image: oxheadalpha/flextesa:20230915
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3

apps/taquito-test-dapp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "taquito-test-dapp-vite",
   "private": true,
-  "version": "17.3.0",
+  "version": "17.3.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,10 +24,10 @@
     "vite": "^3.2.0"
   },
   "dependencies": {
-    "@airgap/beacon-sdk": "4.0.6",
-    "@taquito/beacon-wallet": "^17.3.0",
-    "@taquito/taquito": "^17.3.0",
-    "@taquito/utils": "^17.3.0",
+    "@airgap/beacon-sdk": "4.0.10",
+    "@taquito/beacon-wallet": "^17.3.1",
+    "@taquito/taquito": "^17.3.1",
+    "@taquito/utils": "^17.3.1",
     "buffer": "^6.0.3",
     "svelte-select": "^4.4.7",
     "vite-compatible-readable-stream": "^3.6.1"

docs/version.md

@@ -3,6 +3,14 @@ title: Versions
 author: Jev Bjorsell
 ---
 
+# Taquito v17.3.1
+
+## Summary
+- This is a patch release to upgrade `@airgap/beacon-sdk` and `@airgap/beacon-dapp` packages to `v4.0.10` [PR#2649](https://github.com/ecadlabs/taquito/pull/2649)
+- Updating license to `Apache-2.0` in `package.json` files  [PR#2636](https://github.com/ecadlabs/taquito/pull/2636)
+- Updated the ledger dependencies [PR#2645](https://github.com/ecadlabs/taquito/pull/2645)
+- Applied dependency upgrades in website suggested by dependabot [PR#2645](https://github.com/ecadlabs/taquito/pull/2645)
+
 # Taquito v17.3.0
 
 **A change in Licensing**:

example/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@taquito/example",
   "private": true,
-  "version": "17.3.0",
+  "version": "17.3.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",
@@ -41,16 +41,16 @@
   },
   "dependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.27.3",
-    "@taquito/ledger-signer": "^17.3.0",
-    "@taquito/local-forging": "^17.3.0",
-    "@taquito/michel-codec": "^17.3.0",
-    "@taquito/michelson-encoder": "^17.3.0",
-    "@taquito/rpc": "^17.3.0",
-    "@taquito/sapling": "^17.3.0",
-    "@taquito/signer": "^17.3.0",
-    "@taquito/taquito": "^17.3.0",
-    "@taquito/tzip16": "^17.3.0",
-    "@taquito/utils": "^17.3.0",
+    "@taquito/ledger-signer": "^17.3.1",
+    "@taquito/local-forging": "^17.3.1",
+    "@taquito/michel-codec": "^17.3.1",
+    "@taquito/michelson-encoder": "^17.3.1",
+    "@taquito/rpc": "^17.3.1",
+    "@taquito/sapling": "^17.3.1",
+    "@taquito/signer": "^17.3.1",
+    "@taquito/taquito": "^17.3.1",
+    "@taquito/tzip16": "^17.3.1",
+    "@taquito/utils": "^17.3.1",
     "bignumber.js": "^9.1.0"
   },
   "devDependencies": {

integration-tests/config.ts

@@ -122,7 +122,7 @@ const defaultConfig = ({
     rpc: process.env[`TEZOS_RPC_${networkName}`] || defaultRpc,
     pollingIntervalMilliseconds: process.env[`POLLING_INTERVAL_MILLISECONDS`] || undefined,
     rpcCacheMilliseconds: process.env[`RPC_CACHE_MILLISECONDS`] || '1000',
-    knownBaker: process.env[`TEZOS_BAKER`] || 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD',
+    knownBaker: process.env[`TEZOS_BAKER`] || (networkName === 'MONDAYNET' ? 'tz1ck3EJwzFpbLVmXVuEn5Ptwzc6Aj14mHSH' : 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD'),
     knownContract: process.env[`TEZOS_${networkName}_CONTRACT_ADDRESS`] || knownContracts.contract,
     knownBigMapContract: process.env[`TEZOS_${networkName}_BIGMAPCONTRACT_ADDRESS`] || knownContracts.bigMapContract,
     knownTzip1216Contract: process.env[`TEZOS_${networkName}_TZIP1216CONTRACT_ADDRESS`] || knownContracts.tzip12BigMapOffChainContract,

integration-tests/contract-estimation-tests.spec.ts

@@ -199,7 +199,7 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
       const params = { fee: 2000, to: await Tezos.signer.publicKeyHash(), mutez: true, amount: amt - (1382 + DEFAULT_FEE.REVEAL) };
 
       await expect(LowAmountTez.estimate.transfer(params)).rejects.toMatchObject({
-        id: expect.stringContaining('implicit_contract'),
+        id: expect.stringContaining('empty_implicit_contract'),
       });
       done();
     });

integration-tests/contract-events.spec.ts

@@ -1,5 +1,5 @@
 import { CONFIGS } from "./config";
-import { mainContractWithDuplicateEvents } from "./main-contract-with-duplicate-events";
+import { mainContractWithDuplicateEvents } from "./data/main-contract-with-duplicate-events";
 
 CONFIGS().forEach(({ lib, rpc, setup }) => {
   const Tezos = lib;

integration-tests/data/allTestsCases.ts

@@ -49,7 +49,6 @@ interface TestCase {
 }
 
 export const nairobiCases: TestCase[] = [
-
   {
     name: 'Set deposits limit 1000000',
     operation: {

integration-tests/known-contracts-ProtoALph.ts

@@ -1,8 +1,8 @@
 import { KnownContracts } from './known-contracts';
 export const knownContractsProtoALph: KnownContracts = {
-  contract: "KT1EqE9uiQoodrX3hymdTsMzv4Ugh9Ba7WQh",
-  bigMapContract: "KT1AhkcgTg5Yve1akqhp3L2VYe9wuJyr9Cf2",
-  tzip12BigMapOffChainContract: "KT1L13TdpnvSnH9oax8BVsjsGwYUEAymvsUY",
-  saplingContract: "KT1REUu1WbovnUHgxP5ywV6Nc8WSTSquoRmw",
-  onChainViewContractAddress: "KT1NewFz74bCpfQw1qVkxGbN6MncRaVgaymH"
+  contract: "KT1XXrWDuK77kQWX55zjD347Wh6bwgmJDfJ8",
+  bigMapContract: "KT1NSDEhMTWoX2Vie98NCtQV4fVYoPfqfAN3",
+  tzip12BigMapOffChainContract: "KT1X4c8BCVSDE7dtf5jPRtpYtYcaSFknwzN5",
+  saplingContract: "KT1JKC49zUSCXJGKT2p1bHVWmg47rAgF53ff",
+  onChainViewContractAddress: "KT1FVjUZeH5KM8tMwYvrVCMC3QFyDRUBFNLk",
 };

integration-tests/local-forging.spec.ts

@@ -20,6 +20,18 @@ CONFIGS().forEach(({ rpc, protocol }) => {
       });
     });
     // all protocols
+    nairobiCases.forEach(({ name, operation, expected }) => {
+      nairobinet(`Verify that .forge for local forge will return same result as for network forge for rpc: ${name} (${rpc})`, async done => {
+        const localForger = new LocalForger(protocol as unknown as ProtocolsHash);
+        const result = await localForger.forge(operation);
+        const rpcResult = await Tezos.rpc.forgeOperations(operation);
+        expect(result).toEqual(rpcResult);
+        expect(await localForger.parse(result)).toEqual(expected || operation);
+
+        done();
+      });
+    });
+
     commonCases.forEach(({ name, operation, expected }) => {
       it(`Verify that .forge for local forge will return same result as for network forge for rpc: ${name} (${rpc})`, async done => {
         const localForger = new LocalForger(protocol as unknown as ProtocolsHash);

integration-tests/package.json

@@ -12,25 +12,25 @@
     "test:mondaynet-secret-key": "RUN_MONDAYNET_WITH_SECRET_KEY=true jest --runInBand",
     "test": "jest"
   },
-  "version": "17.3.0",
+  "version": "17.3.1",
   "dependencies": {
     "@ledgerhq/devices": "6.20.0",
-    "@ledgerhq/hw-transport": "6.20.0",
-    "@ledgerhq/hw-transport-node-hid": "6.20.0",
-    "@ledgerhq/hw-transport-node-hid-noevents": "6.20.0",
-    "@taquito/contracts-library": "^17.3.0",
-    "@taquito/http-utils": "^17.3.0",
-    "@taquito/local-forging": "^17.3.0",
-    "@taquito/michel-codec": "^17.3.0",
-    "@taquito/michelson-encoder": "^17.3.0",
-    "@taquito/remote-signer": "^17.3.0",
-    "@taquito/rpc": "^17.3.0",
-    "@taquito/sapling": "^17.3.0",
-    "@taquito/signer": "^17.3.0",
-    "@taquito/taquito": "^17.3.0",
-    "@taquito/tzip12": "^17.3.0",
-    "@taquito/tzip16": "^17.3.0",
-    "@taquito/utils": "^17.3.0",
+    "@ledgerhq/hw-transport": "6.28.8",
+    "@ledgerhq/hw-transport-node-hid": "6.27.21",
+    "@ledgerhq/hw-transport-node-hid-noevents": "6.27.19",
+    "@taquito/contracts-library": "^17.3.1",
+    "@taquito/http-utils": "^17.3.1",
+    "@taquito/local-forging": "^17.3.1",
+    "@taquito/michel-codec": "^17.3.1",
+    "@taquito/michelson-encoder": "^17.3.1",
+    "@taquito/remote-signer": "^17.3.1",
+    "@taquito/rpc": "^17.3.1",
+    "@taquito/sapling": "^17.3.1",
+    "@taquito/signer": "^17.3.1",
+    "@taquito/taquito": "^17.3.1",
+    "@taquito/tzip12": "^17.3.1",
+    "@taquito/tzip16": "^17.3.1",
+    "@taquito/utils": "^17.3.1",
     "bignumber.js": "^9.1.0",
     "bip39": "3.0.4",
     "blakejs": "^1.2.1"

integration-tests/rpc-get-protocol-constants.spec.ts

@@ -801,7 +801,6 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
         zk_rollup_min_pending_to_process: 10,
         zk_rollup_origination_size: 4000,
       });
-
       done();
     });
 
@@ -1046,35 +1045,63 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
       const constants: ConstantsResponseProto017 = await Tezos.rpc.getConstants();
 
       expect(constants).toEqual({
+        adaptive_issuance_launch_ema_threshold: 10000000,
+        adaptive_rewards_params: {
+          center_dz: {
+            denominator: "2",
+            numerator: "1",
+          },
+          growth_rate: "115740740",
+          issuance_ratio_max: {
+            denominator: "10",
+            numerator: "1",
+          },
+          issuance_ratio_min: {
+            denominator: "200",
+            numerator: "1",
+          },
+          max_bonus: "50000000000000",
+          radius_dz: {
+            denominator: "50",
+            numerator: "1",
+          },
+        },
         proof_of_work_nonce_size: 8,
         nonce_length: 32,
         nonce_revelation_threshold: 32,
         max_anon_ops_per_block: 132,
         max_operation_data_length: 32768,
         max_proposals_per_delegate: 20,
         preserved_cycles: 3,
-        blocks_per_cycle: 8192,
-        blocks_per_commitment: 64,
+        blocks_per_cycle: 128,
+        blocks_per_commitment: 16,
         hard_gas_limit_per_operation: new BigNumber(1040000),
         hard_gas_limit_per_block: new BigNumber(5200000),
         proof_of_work_threshold: new BigNumber(-1),
-        seed_nonce_revelation_tip: new BigNumber(125000),
         origination_size: 257,
+        percentage_of_frozen_deposits_slashed_per_double_baking: 11,
+        percentage_of_frozen_deposits_slashed_per_double_attestation: 50,
         cost_per_byte: new BigNumber(250),
         hard_storage_limit_per_operation: new BigNumber(60000),
+        issuance_weights: {
+          attesting_reward_weight: 10240,
+          baking_reward_bonus_weight: 5120,
+          baking_reward_fixed_portion_weight: 5120,
+          base_total_issued_per_minute: "85007812",
+          liquidity_baking_subsidy_weight: 1280,
+          seed_nonce_revelation_tip_weight: 1,
+          vdf_revelation_tip_weight: 1,
+        },
+        limit_of_delegation_over_baking: 9,
         quorum_min: 2000,
         quorum_max: 7000,
         min_proposal_quorum: 500,
-        liquidity_baking_subsidy: new BigNumber(2500000),
         liquidity_baking_toggle_ema_threshold: 100000,
         max_allowed_global_constants_depth: 10000,
         max_micheline_bytes_limit: 50000,
         max_micheline_node_count: 50000,
         michelson_maximum_type_size: 2001,
-        blocks_per_stake_snapshot: 512,
-        baking_reward_fixed_portion: new BigNumber(10000000),
-        baking_reward_bonus_per_slot: new BigNumber(4286),
-        endorsing_reward_per_slot: new BigNumber(2857),
+        blocks_per_stake_snapshot: 64,
         max_operations_time_to_live: 120,
         consensus_committee_size: 7000,
         consensus_threshold: 4667,
@@ -1083,23 +1110,20 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
           numerator: 2,
         },
         max_slashing_period: 2,
-        frozen_deposits_percentage: 10,
-        double_baking_punishment: new BigNumber(640000000),
-        ratio_of_frozen_deposits_slashed_per_double_endorsement: {
-          denominator: 2,
-          numerator: 1,
-        },
-        minimal_block_delay: new BigNumber(15),
-        delay_increment_per_round: new BigNumber(15),
+        minimal_block_delay: new BigNumber(7),
+        minimal_frozen_stake: "600000000",
+        delay_increment_per_round: new BigNumber(7),
+        edge_of_staking_over_delegation: 2,
+        global_limit_of_staking_over_baking: 5,
         dal_parametric: {
-          attestation_lag: 2,
+          attestation_lag: 4,
           attestation_threshold: 50,
           feature_enable: true,
           number_of_shards: 2048,
-          number_of_slots: 256,
+          number_of_slots: 32,
           page_size: 4096,
           redundancy_factor: 16,
-          slot_size: 1048576,
+          slot_size: 65536,
           blocks_per_epoch: 32,
         },
         minimal_stake: new BigNumber('6000000000'),
@@ -1108,39 +1132,33 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
         cache_script_size: 100000000,
         cache_stake_distribution_cycles: 8,
         cycles_per_voting_period: 1,
-        smart_rollup_arith_pvm_enable: false,
+        smart_rollup_arith_pvm_enable: true,
         smart_rollup_challenge_window_in_blocks: 40,
         smart_rollup_commitment_period_in_blocks: 20,
         smart_rollup_enable: true,
         smart_rollup_max_active_outbox_levels: 20160,
         smart_rollup_max_lookahead_in_blocks: 30000,
         smart_rollup_max_number_of_cemented_commitments: 5,
-        smart_rollup_max_number_of_messages_per_level: new BigNumber(1000000),
+        smart_rollup_max_number_of_messages_per_level: "1000000",
         smart_rollup_max_number_of_parallel_games: 32,
         smart_rollup_max_outbox_messages_per_level: 100,
         smart_rollup_max_wrapped_proof_binary_size: 30000,
         smart_rollup_message_size_limit: 4096,
         smart_rollup_number_of_sections_in_dissection: 32,
         smart_rollup_origination_size: 6314,
-        smart_rollup_stake_amount: new BigNumber(32000000),
+        smart_rollup_private_enable: true,
+        smart_rollup_reveal_activation_level: {
+          dal_page: 0,
+          metadata: 0,
+          raw_data: {
+            Blake2B: 0,
+          },
+        },
+        smart_rollup_stake_amount: "32000000",
         smart_rollup_timeout_period_in_blocks: 500,
-        tx_rollup_commitment_bond: new BigNumber(10000000000),
-        tx_rollup_cost_per_byte_ema_factor: 120,
-        tx_rollup_enable: false,
-        tx_rollup_finality_period: 10,
-        tx_rollup_hard_size_limit_per_inbox: 500000,
-        tx_rollup_hard_size_limit_per_message: 5000,
-        tx_rollup_max_commitments_count: 30,
-        tx_rollup_max_inboxes_count: 15,
-        tx_rollup_max_messages_per_inbox: 1010,
-        tx_rollup_max_ticket_payload_size: 2048,
-        tx_rollup_max_withdrawals_per_batch: 15,
-        tx_rollup_origination_size: 4000,
-        tx_rollup_rejection_max_proof_size: 30000,
-        tx_rollup_sunset_level: 10000000,
-        tx_rollup_withdraw_period: 10,
         vdf_difficulty: new BigNumber('10000000'),
         zk_rollup_enable: true,
+        zk_rollup_max_ticket_payload_size: 2048,
         zk_rollup_min_pending_to_process: 10,
         zk_rollup_origination_size: 4000,
       });

lerna.json

@@ -1,5 +1,5 @@
 {
   "useWorkspaces": true,
   "useNx": true,
-  "version": "17.3.0"
+  "version": "17.3.1"
 }