diff --git a/apps/taquito-test-dapp/src/config.ts b/apps/taquito-test-dapp/src/config.ts index 930ec83c5e..2f01fa7cbc 100644 --- a/apps/taquito-test-dapp/src/config.ts +++ b/apps/taquito-test-dapp/src/config.ts @@ -38,5 +38,5 @@ export const contractAddress = { mainnet: "KT1ShtH2zCrKMuWGRejEd6RAcnePwxBQeMAN", ghostnet: "KT1QKmcNBcfzVTXG2kBcE6XqXtEuYYUzMcT5", oxfordnet: "KT1GYx1KDhMQt2GJEztRh8EyYxJUPM6fnAMM", - parisnet: "KT1LBQmSDGsRj4LFa2bsCsZLkGCtmRFVVcPh", + parisnet: "KT1E43cQefjM8fq7B5pEJFJoGbRmuNibDoBC", }; diff --git a/integration-tests/__tests__/contract/estimation-tests.spec.ts b/integration-tests/__tests__/contract/estimation-tests.spec.ts index 05b06fcce7..6b260fe721 100644 --- a/integration-tests/__tests__/contract/estimation-tests.spec.ts +++ b/integration-tests/__tests__/contract/estimation-tests.spec.ts @@ -41,11 +41,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { const estimate = await LowAmountTez.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), amount: 0.019 }); expect(estimate.gasLimit).toEqual(101); expect(estimate.storageLimit).toEqual(0); - expect(estimate.suggestedFeeMutez).toEqual(188); + expect(estimate.suggestedFeeMutez).toEqual(186); expect(estimate.burnFeeMutez).toEqual(0); - expect(estimate.minimalFeeMutez).toEqual(168); - expect(estimate.totalCost).toEqual(168); - expect(estimate.usingBaseFeeMutez).toEqual(168); + expect(estimate.minimalFeeMutez).toEqual(166); + expect(estimate.totalCost).toEqual(166); + expect(estimate.usingBaseFeeMutez).toEqual(166); expect(estimate.consumedMilligas).toEqual(100040); }); @@ -53,11 +53,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { const estimate = await LowAmountTez.estimate.transfer({ to: await (await createAddress()).signer.publicKeyHash(), amount: 0.017 }); expect(estimate.gasLimit).toEqual(101); expect(estimate.storageLimit).toEqual(277); - expect(estimate.suggestedFeeMutez).toEqual(188); + expect(estimate.suggestedFeeMutez).toEqual(186); expect(estimate.burnFeeMutez).toEqual(69250); - expect(estimate.minimalFeeMutez).toEqual(168); - expect(estimate.totalCost).toEqual(69418); - expect(estimate.usingBaseFeeMutez).toEqual(168); + expect(estimate.minimalFeeMutez).toEqual(166); + expect(estimate.totalCost).toEqual(69416); + expect(estimate.usingBaseFeeMutez).toEqual(166); expect(estimate.consumedMilligas).toEqual(100040); }); @@ -69,11 +69,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { }); expect(estimate.gasLimit).toEqual(677); expect(estimate.storageLimit).toEqual(591); - expect(estimate.suggestedFeeMutez).toEqual(537); + expect(estimate.suggestedFeeMutez).toEqual(535); expect(estimate.burnFeeMutez).toEqual(147750); - expect(estimate.minimalFeeMutez).toEqual(517); - expect(estimate.totalCost).toEqual(148267); - expect(estimate.usingBaseFeeMutez).toEqual(517); + expect(estimate.minimalFeeMutez).toEqual(515); + expect(estimate.totalCost).toEqual(148265); + expect(estimate.usingBaseFeeMutez).toEqual(515); expect(estimate.consumedMilligas).toEqual(676402); }); @@ -84,25 +84,25 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { }); expect(estimate.gasLimit).toEqual(100); expect(estimate.storageLimit).toEqual(0); - expect(estimate.suggestedFeeMutez).toEqual(183); + expect(estimate.suggestedFeeMutez).toEqual(181); expect(estimate.burnFeeMutez).toEqual(0); - expect(estimate.minimalFeeMutez).toEqual(163); - expect(estimate.totalCost).toEqual(163); - expect(estimate.usingBaseFeeMutez).toEqual(163); + expect(estimate.minimalFeeMutez).toEqual(161); + expect(estimate.totalCost).toEqual(161); + expect(estimate.usingBaseFeeMutez).toEqual(161); expect(estimate.consumedMilligas).toEqual(100000); }); it('Verify .estimate.transfer for internal transfer to allocated implicit', async () => { const tx = contract.methods.do(MANAGER_LAMBDA.transferImplicit(knownBaker, 5)).toTransferParams(); const estimate = await LowAmountTez.estimate.transfer(tx); - expect(estimate.gasLimit).toEqual(1457); + expect(estimate.gasLimit).toEqual(1456); expect(estimate.storageLimit).toEqual(0); - expect(estimate.suggestedFeeMutez).toEqual(396); + expect(estimate.suggestedFeeMutez).toEqual(394); expect(estimate.burnFeeMutez).toEqual(0); - expect(estimate.minimalFeeMutez).toEqual(376); - expect(estimate.totalCost).toEqual(376); - expect(estimate.usingBaseFeeMutez).toEqual(376); - expect(estimate.consumedMilligas).toEqual(1456228); + expect(estimate.minimalFeeMutez).toEqual(374); + expect(estimate.totalCost).toEqual(374); + expect(estimate.usingBaseFeeMutez).toEqual(374); + expect(estimate.consumedMilligas).toEqual(1455798); }); it('Verify .estimate.transfer for multiple internal transfers to unallocated account', async () => { @@ -114,12 +114,12 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { const estimate = await LowAmountTez.estimate.transfer(tx); expect(estimate.gasLimit).toEqual(1571); expect(estimate.storageLimit).toEqual(534); - expect(estimate.suggestedFeeMutez).toEqual(467); + expect(estimate.suggestedFeeMutez).toEqual(465); expect(estimate.burnFeeMutez).toEqual(133500); - expect(estimate.minimalFeeMutez).toEqual(447); - expect(estimate.totalCost).toEqual(133947); - expect(estimate.usingBaseFeeMutez).toEqual(447); - expect(estimate.consumedMilligas).toEqual(1570757); + expect(estimate.minimalFeeMutez).toEqual(445); + expect(estimate.totalCost).toEqual(133945); + expect(estimate.usingBaseFeeMutez).toEqual(445); + expect(estimate.consumedMilligas).toEqual(1570327); }); it('Verify .estimate.transfer for internal origination', async () => { @@ -127,25 +127,25 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { const estimate = await LowAmountTez.estimate.transfer(tx); expect(estimate.gasLimit).toEqual(1867); expect(estimate.storageLimit).toEqual(337); - expect(estimate.suggestedFeeMutez).toEqual(443); + expect(estimate.suggestedFeeMutez).toEqual(441); expect(estimate.burnFeeMutez).toEqual(84250); - expect(estimate.minimalFeeMutez).toEqual(423); - expect(estimate.totalCost).toEqual(84673); - expect(estimate.usingBaseFeeMutez).toEqual(423); - expect(estimate.consumedMilligas).toEqual(1866852); + expect(estimate.minimalFeeMutez).toEqual(421); + expect(estimate.totalCost).toEqual(84671); + expect(estimate.usingBaseFeeMutez).toEqual(421); + expect(estimate.consumedMilligas).toEqual(1866422); }); it('Verify .estimate.transfer for multiple internal originations', async () => { const tx = contract.methods.do(originate2()).toTransferParams(); const estimate = await LowAmountTez.estimate.transfer(tx); - expect(estimate.gasLimit).toEqual(2393); + expect(estimate.gasLimit).toEqual(2392); expect(estimate.storageLimit).toEqual(654); - expect(estimate.suggestedFeeMutez).toEqual(561); + expect(estimate.suggestedFeeMutez).toEqual(559); expect(estimate.burnFeeMutez).toEqual(163500); - expect(estimate.minimalFeeMutez).toEqual(541); - expect(estimate.totalCost).toEqual(164041); - expect(estimate.usingBaseFeeMutez).toEqual(541); - expect(estimate.consumedMilligas).toEqual(2392005); + expect(estimate.minimalFeeMutez).toEqual(539); + expect(estimate.totalCost).toEqual(164039); + expect(estimate.usingBaseFeeMutez).toEqual(539); + expect(estimate.consumedMilligas).toEqual(2391575); // Do the actual operation const op2 = await contract.methods.do(originate2()).send(); await op2.confirmation(); @@ -176,11 +176,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => { let estimate = await LowAmountTez.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), mutez: true, amount: amt - (1382 + getRevealFee(await LowAmountTez.signer.publicKeyHash())) }); expect(estimate.gasLimit).toEqual(101); expect(estimate.storageLimit).toEqual(0); - expect(estimate.suggestedFeeMutez).toEqual(187); + expect(estimate.suggestedFeeMutez).toEqual(185); expect(estimate.burnFeeMutez).toEqual(0); - expect(estimate.minimalFeeMutez).toEqual(167); - expect(estimate.totalCost).toEqual(167); - expect(estimate.usingBaseFeeMutez).toEqual(167); + expect(estimate.minimalFeeMutez).toEqual(165); + expect(estimate.totalCost).toEqual(165); + expect(estimate.usingBaseFeeMutez).toEqual(165); expect(estimate.consumedMilligas).toEqual(100040); }); diff --git a/integration-tests/__tests__/contract/operations/staking.spec.ts b/integration-tests/__tests__/contract/operations/staking.spec.ts index 3fe41a086a..f2efd57afb 100644 --- a/integration-tests/__tests__/contract/operations/staking.spec.ts +++ b/integration-tests/__tests__/contract/operations/staking.spec.ts @@ -4,7 +4,7 @@ import { ProtoGreaterOrEqual } from '@taquito/michel-codec'; CONFIGS().forEach(({ lib, rpc, setup, knownBaker, protocol }) => { const Tezos = lib; - const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBQ) ? test : test.skip; + const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBx) ? test : test.skip; describe(`Staking pseudo operations: ${rpc}`, () => { diff --git a/integration-tests/__tests__/local-forging.spec.ts b/integration-tests/__tests__/local-forging.spec.ts index d5cd1634af..7d48812076 100644 --- a/integration-tests/__tests__/local-forging.spec.ts +++ b/integration-tests/__tests__/local-forging.spec.ts @@ -6,7 +6,7 @@ import { ProtoGreaterOrEqual } from '@taquito/michel-codec'; CONFIGS().forEach(({ rpc, protocol }) => { const Tezos = new TezosToolkit(rpc); - const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBQ) ? test : test.skip + const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBx) ? test : test.skip describe(`Test local forger: ${rpc}`, () => { parisCases.forEach(({ name, operation, expected }) => { diff --git a/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts b/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts index f6d241d129..94b6f3fded 100644 --- a/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts +++ b/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts @@ -5,7 +5,7 @@ import { ConstantsResponseProto019, ConstantsResponseProto020 } from '@taquito/r CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => { const Tezos = lib; - const parisnet = (networkType == NetworkType.TESTNET && protocol === Protocols.PtParisBQ) ? test : test.skip; + const parisnet = (networkType == NetworkType.TESTNET && protocol === Protocols.PtParisBx) ? test : test.skip; const weeklynet = (networkType == NetworkType.TESTNET && protocol === Protocols.ProtoALpha) ? test : test.skip; describe('Test fetching constants for all protocols on Mainnet', () => { const rpcUrl = 'https://mainnet.ecadinfra.com/'; diff --git a/integration-tests/__tests__/rpc/nodes.spec.ts b/integration-tests/__tests__/rpc/nodes.spec.ts index 55024b52d4..3dc85adba9 100644 --- a/integration-tests/__tests__/rpc/nodes.spec.ts +++ b/integration-tests/__tests__/rpc/nodes.spec.ts @@ -21,7 +21,7 @@ CONFIGS().forEach( }) => { const Tezos = lib; const unrestrictedRPCNode = rpc.endsWith("ecadinfra.com") ? test.skip : test; - const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBQ) ? test : test.skip; + const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBx) ? test : test.skip; let ticketContract: DefaultContractType; diff --git a/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts b/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts index 8662eb7337..c2bfaea3c8 100644 --- a/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts +++ b/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts @@ -5,7 +5,7 @@ import { InvalidStakingAddressError, InvalidFinalizeUnstakeAmountError } from '@ CONFIGS().forEach(({ lib, rpc, setup, protocol, knownBaker }) => { const Tezos = lib; - const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBQ) ? test : test.skip; + const parisAndAlpha = ProtoGreaterOrEqual(protocol, Protocols.PtParisBx) ? test : test.skip; describe(`Test staking pseudo operations using: ${rpc}`, () => { beforeAll(async () => { await setup(true); diff --git a/integration-tests/config.ts b/integration-tests/config.ts index daf75f09db..d8245cd0f0 100644 --- a/integration-tests/config.ts +++ b/integration-tests/config.ts @@ -7,7 +7,7 @@ import { RpcClient, RpcClientCache } from '@taquito/rpc'; import { KnownContracts } from './known-contracts'; import { knownContractsProtoALph } from './known-contracts-ProtoALph'; import { knownContractsPtGhostnet } from './known-contracts-PtGhostnet'; -import { knownContractsPtParisBQ } from './known-contracts-PtParisBQ'; +import { knownContractsPtParisBx } from './known-contracts-PtParisBx'; import { knownContractsPtNairobi } from './known-contracts-PtNairobi'; const nodeCrypto = require('crypto'); @@ -132,9 +132,9 @@ const defaultConfig = ({ const parisnetEphemeral: Config = defaultConfig({ networkName: 'PARISNET', - protocol: Protocols.PtParisBQ, + protocol: Protocols.PtParisBx, defaultRpc: 'http://parisnet.i.ecadinfra.com:8732/', - knownContracts: knownContractsPtParisBQ, + knownContracts: knownContractsPtParisBx, signerConfig: defaultEphemeralConfig('https://keygen.ecadinfra.com/parisnet') }); @@ -153,7 +153,7 @@ const nairobinetSecretKey: Config = const ghostnetEphemeral: Config = defaultConfig({ networkName: 'GHOSTNET', - protocol: Protocols.ProxfordY, + protocol: Protocols.PtParisBx, defaultRpc: 'http://ecad-ghostnet-rolling-2.i.tez.ie:8732', knownContracts: knownContractsPtGhostnet, signerConfig: defaultEphemeralConfig('https://keygen.ecadinfra.com/ghostnet') diff --git a/integration-tests/known-contracts-PtParisBQ.ts b/integration-tests/known-contracts-PtParisBQ.ts deleted file mode 100644 index 4ac3db653e..0000000000 --- a/integration-tests/known-contracts-PtParisBQ.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { KnownContracts } from './known-contracts'; -export const knownContractsPtParisBQ: KnownContracts = { - contract: "KT1PgBAc5e5vhzUyJoQxSEcCkZyqVadurQfN", - bigMapContract: "KT19SNmdj7frTk4gacoL6R96sRD455HUtryH", - tzip12BigMapOffChainContract: "KT1NJs9CnuYJY8wmKxscf8abmc9iHFk1X7fK", - saplingContract: "KT1U2ZBtHKD8ayWkRkrvLzJq5GAYiWEBUxhg", - onChainViewContractAddress: "KT1FmyfnNNggnhHZwJNTCqWFEN6pkXwpEv5T", -}; diff --git a/integration-tests/known-contracts-PtParisBx.ts b/integration-tests/known-contracts-PtParisBx.ts new file mode 100644 index 0000000000..75c50efb15 --- /dev/null +++ b/integration-tests/known-contracts-PtParisBx.ts @@ -0,0 +1,8 @@ +import { KnownContracts } from './known-contracts'; +export const knownContractsPtParisBx: KnownContracts = { + contract: "KT1ThHYHrNMiSuMG2Ba1HtHTWYyRtojWn44b", + bigMapContract: "KT1ACeLXs4fA3fakG4vhNumSfT7HxaApKjE3", + tzip12BigMapOffChainContract: "KT1HSPysYK1G2wLGPXjgbYTqpDyv49U3xVEo", + saplingContract: "KT1TirpKfRqAW1jXAr3RwAZB2kF3r5FJHuST", + onChainViewContractAddress: "KT1Ev43gMu5kwHNYp2kg6TXbQZtyKGMu2U9a", +}; diff --git a/packages/taquito-local-forging/src/taquito-local-forging.ts b/packages/taquito-local-forging/src/taquito-local-forging.ts index 6fefd5e487..41e70ff5b0 100644 --- a/packages/taquito-local-forging/src/taquito-local-forging.ts +++ b/packages/taquito-local-forging/src/taquito-local-forging.ts @@ -22,7 +22,7 @@ export * from './interface'; export { VERSION } from './version'; export { ProtocolsHash } from './protocols'; -const PROTOCOL_CURRENT = ProtocolsHash.PtParisBQ; +const PROTOCOL_CURRENT = ProtocolsHash.PtParisBx; export function getCodec(codec: CODEC, _proto: ProtocolsHash) { return { diff --git a/packages/taquito-rpc/test/taquito-rpc.spec.ts b/packages/taquito-rpc/test/taquito-rpc.spec.ts index 97ad9451d2..97dd62269b 100644 --- a/packages/taquito-rpc/test/taquito-rpc.spec.ts +++ b/packages/taquito-rpc/test/taquito-rpc.spec.ts @@ -3097,7 +3097,7 @@ describe('RpcClient test', () => { it('should query the right url and property for operation, proto 20, attestation_with_dal', async () => { httpBackend.createRequest.mockReturnValue( Promise.resolve({ - protocol: 'PtParisBQscdCm6Cfow6ndeU6wKJyA3aV1j4D3gQBQMsTQyJCrz', + protocol: 'PtParisBxoLz5gzMmn3d9WBQNoPSZakgnkMC2VNuQ3KXfUtUQeZ', chain_id: 'NetXo8SqH1c38SS', hash: 'BKsCfYZrh417adJiKbGsyhVG2XrvUBJDhhkCAkZQzWzkEHCejXr', header: { @@ -3121,7 +3121,7 @@ describe('RpcClient test', () => { operations: [ [ { - protocol: 'PtParisBQscdCm6Cfow6ndeU6wKJyA3aV1j4D3gQBQMsTQyJCrz', + protocol: 'PtParisBxoLz5gzMmn3d9WBQNoPSZakgnkMC2VNuQ3KXfUtUQeZ', chain_id: 'NetXo8SqH1c38SS', hash: 'opSmHyeasw4QcJ4Jc2qi6arNeSQMhFRjHBdFYWXGoMydLkgVRtb', branch: 'BLHyjaqV2FhuHLQL3CBjWJqgZZ77BxcNxh3ehXcNYMQjjqAPwqA', @@ -3164,7 +3164,7 @@ describe('RpcClient test', () => { it('should query the right url and property for operation, proto 20, dal_publish_commitment', async () => { httpBackend.createRequest.mockReturnValue( Promise.resolve({ - protocol: 'PtParisBQscdCm6Cfow6ndeU6wKJyA3aV1j4D3gQBQMsTQyJCrz', + protocol: 'PtParisBxoLz5gzMmn3d9WBQNoPSZakgnkMC2VNuQ3KXfUtUQeZ', chain_id: 'NetXo8SqH1c38SS', hash: 'BKsCfYZrh417adJiKbGsyhVG2XrvUBJDhhkCAkZQzWzkEHCejXr', header: {