Skip to content

Commit 31bf431

Browse files
Merge branch 'dev' into dev
2 parents 251237d + e6f186c commit 31bf431

File tree

14 files changed

+1095
-196
lines changed

14 files changed

+1095
-196
lines changed

CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,33 @@ All notable changes to this project will be documented in this file.
44

55
The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7+
## [1.0.0] - 13-Mar-2021
8+
9+
**Milestone**: Symbol Mainnet
10+
Package | Version | Link
11+
---|---|---
12+
SDK Core| v1.0.0 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
13+
Catbuffer | v0.1.1 | [catbuffer-typescript](https://www.npmjs.com/package/catbuffer-typescript)
14+
Client Library | v0.11.1 | [symbol-openapi-typescript-fetch-client](https://www.npmjs.com/package/symbol-openapi-typescript-fetch-client)
15+
16+
- Added callback function in websocket listener for client to handle unsolicited websocket close event.
17+
- Release for Symbol mainnet.
18+
19+
## [0.23.3] - 5-Mar-2021
20+
21+
**Milestone**: Catapult-server main(0.10.0.8)
22+
Package | Version | Link
23+
---|---|---
24+
SDK Core| v0.23.3 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
25+
Catbuffer | v0.1.1 | [catbuffer-typescript](https://www.npmjs.com/package/catbuffer-typescript)
26+
Client Library | v0.11.1 | [symbol-openapi-typescript-fetch-client](https://www.npmjs.com/package/symbol-openapi-typescript-fetch-client)
27+
28+
- Fixed `NodeVersion` schema issue.
29+
- Added `onclose` event listener to capture unsolicited ws close event.
30+
731
## [0.23.2] - 15-Feb-2021
832

9-
**Milestone**: Catapult-server main(0.10.0.6)
33+
**Milestone**: Catapult-server main(0.10.0.7)
1034
Package | Version | Link
1135
---|---|---
1236
SDK Core| v0.23.2 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ The Symbol SDK for TypeScript / JavaScript allows you to develop web, mobile, an
99

1010
## Important Notes
1111

12-
### _Catapult-Server_ Network Compatibility ([email protected].7)
12+
### _Catapult-Server_ Network Compatibility ([email protected].8)
1313

14-
Symbol network pre-launch [catapult-server](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.7), **it is recommended to use this package's 0.23.2 version and upwards for the upcoming pre-release versions and final release**.
14+
Symbol network pre-launch [catapult-server](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.8), **it is recommended to use this package's 0.23.3 version and upwards for the upcoming pre-release versions and final release**.
1515

1616
Find the complete release notes [here](CHANGELOG.md).
1717

e2e/e2e-preset.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
throttlingBurst: 35
2+
throttlingRate: 1000
13
nemesis:
24
mosaics:
35
- accounts: 10
4-
symbolRestImage: symbolplatform/symbol-rest:2.1.1-alpha-202011061935

e2e/infrastructure/IntegrationTestHelper.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
import { map } from 'rxjs/operators';
17-
import { Addresses, BootstrapService, BootstrapUtils, Preset, StartParams } from 'symbol-bootstrap';
17+
import { Addresses, BootstrapService, BootstrapUtils, ConfigLoader, StartParams } from 'symbol-bootstrap';
1818
import { IListener, RepositoryFactory, RepositoryFactoryHttp } from '../../src/infrastructure';
1919
import { UInt64 } from '../../src/model';
2020
import { Account } from '../../src/model/account';
@@ -48,26 +48,10 @@ export class IntegrationTestHelper {
4848
public epochAdjustment: number;
4949
public bootstrapAddresses: Addresses;
5050

51-
private async startBootstrapServer(): Promise<{ accounts: string[]; apiUrl: string; addresses: Addresses }> {
52-
this.config = {
53-
report: false,
54-
preset: Preset.bootstrap,
55-
reset: this.startEachTime,
56-
customPreset: './e2e/e2e-preset.yml',
57-
timeout: 60000 * 3,
58-
target: 'target/bootstrap-test',
59-
detached: false,
60-
user: 'current',
61-
};
62-
63-
console.log('Starting bootstrap server');
64-
const configResult = await this.service.start({ ...this.config, detached: true });
65-
return this.toAccounts(configResult.addresses);
66-
}
6751
private async loadBootstrap(): Promise<{ accounts: string[]; apiUrl: string; addresses: Addresses }> {
68-
const target = process.env.REST_DEV || true ? '../catapult-rest/rest/target' : 'target/bootstrap-test';
52+
const target = process.env.REST_DEV ? '../catapult-rest/rest/target' : 'target/bootstrap-test';
6953
console.log('Loading bootstrap server');
70-
const addresses = BootstrapUtils.loadExistingAddresses(target);
54+
const addresses = new ConfigLoader().loadExistingAddresses(target, false);
7155
return this.toAccounts(addresses);
7256
}
7357

e2e/infrastructure/PersistentHarvesting.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('PersistentHarvesting', () => {
4242
vrfAccount = Account.createFromPrivateKey('AA798EA9A2D2D202AFCCC82C40A287780BCA3C7F7A2FD5B754832804C6BE1BAA', networkType);
4343
account = helper.account;
4444
generationHash = helper.generationHash;
45-
nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
45+
nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
4646
console.log('Remote: ', remoteAccount.publicAccount);
4747
console.log('VRF: ', vrfAccount.publicAccount);
4848
console.log('Node Public Key: ', nodePublicKey);
@@ -110,7 +110,7 @@ describe('PersistentHarvesting', () => {
110110

111111
describe('NodeKeyLinkTransaction', () => {
112112
it('standalone', async () => {
113-
const nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
113+
const nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
114114

115115
const accountInfo = await helper.repositoryFactory.createAccountRepository().getAccountInfo(account.address).toPromise();
116116

@@ -142,7 +142,7 @@ describe('PersistentHarvesting', () => {
142142

143143
describe('transactions', () => {
144144
it('should create delegated harvesting transaction', async () => {
145-
const nodePublicKey = helper.bootstrapAddresses.nodes![0].signing!.publicKey;
145+
const nodePublicKey = helper.bootstrapAddresses.nodes![0].transport!.publicKey;
146146
const tx = PersistentDelegationRequestTransaction.createPersistentDelegationRequestTransaction(
147147
Deadline.create(helper.epochAdjustment),
148148
remoteAccount.privateKey,

0 commit comments

Comments
 (0)