chore(node)!: require 7.1.0

BREAKING CHANGE: sdk requires aeternity node 7.1.0 and above
aeternity · Jun 8, 2024 · 0dd3b49 · 0dd3b49
1 parent f2c6d1d
commit 0dd3b49
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   node:
     # TODO: switch to master after merging https://github.com/aeternity/aeternity/pull/4303
-    image: aeternity/aeternity:v7.0.0-rc1-bundle
+    image: aeternity/aeternity:v7.1.0-bundle
     # TODO: remove 3313 port after merging https://github.com/aeternity/aeternity/pull/4303
     ports: [3013:3013, 3113:3113, 3014:3014, 3313:3313]
     # TODO: remove after releasing https://github.com/aeternity/aeternity/pull/4292

diff --git a/src/Node.ts b/src/Node.ts
@@ -137,7 +137,7 @@ export default class Node extends (NodeTransformed as unknown as NodeTransformed
     super(url, {
       allowInsecureConnection: true,
       additionalPolicies: [
-        ...ignoreVersion ? [] : [genVersionCheckPolicy('node', getVersion, '6.2.0', '8.0.0')],
+        ...ignoreVersion ? [] : [genVersionCheckPolicy('node', getVersion, '7.1.0', '8.0.0')],
         genRequestQueuesPolicy(),
         genCombineGetRequestsPolicy(),
         genRetryOnFailurePolicy(retryCount, retryOverallDelay),

diff --git a/src/tx/builder/field-types/gas-price.ts b/src/tx/builder/field-types/gas-price.ts
@@ -4,7 +4,6 @@ import { ArgumentError, IllegalArgumentError } from '../../../utils/errors';
 import { Int, MIN_GAS_PRICE } from '../constants';
 import Node from '../../../Node';
 import { AE_AMOUNT_FORMATS, formatAmount } from '../../../utils/amount-formatter';
-import semverSatisfies from '../../../utils/semver-satisfies';
 
 const gasPriceCache: WeakMap<Node, { time: number; gasPrice: bigint }> = new WeakMap();
 
@@ -14,10 +13,6 @@ export async function getCachedIncreasedGasPrice(node: Node): Promise<bigint> {
     return cache.gasPrice;
   }
 
-  // TODO: remove after requiring node@6.13.0
-  const { nodeVersion } = await node._getCachedStatus();
-  if (!semverSatisfies(nodeVersion, '6.13.0')) return 0n;
-
   const { minGasPrice, utilization } = (await node.getRecentGasPrices())[0];
   let gasPrice = utilization < 70 ? 0n : BigInt(
     new BigNumber(minGasPrice.toString()).times(1.01).integerValue().toFixed(),

diff --git a/test/integration/aens.ts b/test/integration/aens.ts
@@ -238,7 +238,8 @@ describe('Aens', () => {
       channel: encode(decode(address), Encoding.Channel),
       contract_pubkey: buildContractId(address, 13),
     };
-    pointersNode = Object.entries(pointers).map(([key, id]) => ({ key, id }));
+    pointersNode = Object.entries(pointers)
+      .map(([key, id]) => ({ key, id, encodedKey: encode(Buffer.from(key), Encoding.Bytearray) }));
   });
 
   it('updates', async () => {
@@ -294,7 +295,11 @@ describe('Aens', () => {
     assertNotNull(updateRes.tx);
     expect(updateRes.tx.pointers).to.be.eql([
       ...pointersNode.filter((pointer) => pointer.key !== 'contract_pubkey'),
-      { key: 'contract_pubkey', id: anotherContract },
+      {
+        key: 'contract_pubkey',
+        id: anotherContract,
+        encodedKey: 'ba_Y29udHJhY3RfcHVia2V5OCcARA==',
+      },
     ]);
   });
 

diff --git a/test/integration/delegation.ts b/test/integration/delegation.ts
@@ -139,6 +139,7 @@ contract DelegateTest =
       expect((await aeSdk.api.getNameEntryByName(name)).pointers).to.be.eql([{
         key: 'oracle',
         id: newOwner.replace('ak', 'ok'),
+        encodedKey: 'ba_b3JhY2xlzgFUsQ==',
       }]);
     });
 
@@ -151,6 +152,7 @@ contract DelegateTest =
       expect((await aeSdk.api.getNameEntryByName(name)).pointers[0]).to.be.eql({
         key: 'test key',
         id: encode(dataPt, Encoding.Bytearray),
+        encodedKey: 'ba_dGVzdCBrZXk//Xo5',
       });
     });
 

diff --git a/tooling/autorest/node.yaml b/tooling/autorest/node.yaml
@@ -159,7 +159,7 @@ version: ^3.7.1
 use-extension:
   '@autorest/typescript': ^6.0.15
   '@autorest/modelerfour': ^4.27.0
-input-file: https://raw.githubusercontent.com/aeternity/aeternity/v6.13.0/apps/aehttp/priv/oas3.yaml
+input-file: https://raw.githubusercontent.com/aeternity/aeternity/v7.1.0/apps/aehttp/priv/oas3.yaml
 output-folder: ../../src/apis/node
 source-code-folder-path: .
 generator: typescript