Skip to content

Commit 4054d04

Browse files
lgalabrulgalabru
authored
Merge pull request #2237 from blockstack/next
Release Xenon
2 parents 2595ba1 + 8f662ef commit 4054d04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2337
-1054
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ features = ["std"]
8989
[dev-dependencies]
9090
assert-json-diff = "1.0.0"
9191
criterion = "0.3"
92+
stx_genesis = { package = "stx-genesis", path = "./stx-genesis/."}
9293

9394
[features]
9495
default = ["developer-mode"]

‎bns-test/jest.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
},
1212
},
1313
moduleFileExtensions: ['js', 'ts', 'd.ts'],
14+
testTimeout: 2000000
1415
// setupFiles: ['./tests/global-setup.ts'],
1516
// setupFilesAfterEnv: ['./tests/setup.ts'],
1617
};

‎bns-test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"lint": "tslint -p tsconfig.json 'src/**/*.ts' 'test/**/*.ts'",
1717
"lint-fix": "tslint --fix -p tsconfig.json 'src/**/*.ts' 'test/**/*.ts'",
1818
"test": "jest",
19-
"test:watch": "jest --watch --coverage=false --runInBand"
19+
"test:watch": "jest --watch --coverage=false"
2020
},
2121
"engines": {
2222
"node": ">=10"

‎bns-test/src/bns-client.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class BNSClient extends Client {
108108
}
109109

110110
// (name-import (namespace (buff 20))
111-
// (name (buff 16))
111+
// (name (buff 48))
112112
// (zonefile-hash (buff 20)))
113113
async nameImport(namespace: string,
114114
name: string,
@@ -168,7 +168,7 @@ export class BNSClient extends Client {
168168
}
169169

170170
// (name-register (namespace (buff 20))
171-
// (name (buff 16))
171+
// (name (buff 48))
172172
// (salt (buff 20))
173173
// (zonefile-hash (buff 20)))
174174
async nameRegister(namespace: string,
@@ -190,7 +190,7 @@ export class BNSClient extends Client {
190190
}
191191

192192
// (name-update (namespace (buff 20))
193-
// (name (buff 16))
193+
// (name (buff 48))
194194
// (zonefile-hash (buff 20)))
195195
async nameUpdate(namespace: string,
196196
name: string,
@@ -210,7 +210,7 @@ export class BNSClient extends Client {
210210
}
211211

212212
// (name-transfer (namespace (buff 20))
213-
// (name (buff 16))
213+
// (name (buff 48))
214214
// (new-owner principal)
215215
// (zonefile-hash (optional (buff 20))))
216216
async nameTransfer(namespace: string,
@@ -235,7 +235,7 @@ export class BNSClient extends Client {
235235
}
236236

237237
// (name-revoke (namespace (buff 20))
238-
// (name (buff 16)))
238+
// (name (buff 48)))
239239
async nameRevoke(namespace: string,
240240
name: string,
241241
params: {
@@ -253,7 +253,7 @@ export class BNSClient extends Client {
253253
}
254254

255255
// (name-renewal (namespace (buff 20))
256-
// (name (buff 16))
256+
// (name (buff 48))
257257
// (stx-to-burn uint)
258258
// (new-owner (optional principal))
259259
// (zonefile-hash (optional (buff 20))))
@@ -281,7 +281,7 @@ export class BNSClient extends Client {
281281
}
282282

283283
// (get-name-zonefile (namespace (buff 20))
284-
// (name (buff 16)))
284+
// (name (buff 48)))
285285
async getNameZonefile(namespace: string,
286286
name: string,
287287
params: {
@@ -299,7 +299,7 @@ export class BNSClient extends Client {
299299
}
300300

301301
// (can-name-be-registered (namespace (buff 20))
302-
// (name (buff 16))
302+
// (name (buff 48))
303303
async canNameBeRegistered(namespace: string,
304304
name: string): Promise<Receipt> {
305305
const args = [`0x${this.toHexString(namespace)}`, `0x${this.toHexString(name)}`];
@@ -315,7 +315,7 @@ export class BNSClient extends Client {
315315
}
316316

317317
// (get-name-price (namespace (buff 20))
318-
// (name (buff 16))
318+
// (name (buff 48))
319319
async getNamePrice(namespace: string,
320320
name: string): Promise<Receipt> {
321321
const args = [`0x${this.toHexString(namespace)}`, `0x${this.toHexString(name)}`];

‎bns-test/test/name_import.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describe("BNS Test Suite - NAME_IMPORT", () => {
103103
sender: cases[0].namespaceOwner
104104
});
105105
expect(receipt.success).eq(true);
106-
expect(receipt.result).include('Returned: u12');
106+
expect(receipt.result).include('Returned: u146');
107107

108108
receipt = await bns.namespaceReveal(
109109
cases[0].namespace,
@@ -222,7 +222,7 @@ describe("BNS Test Suite - NAME_IMPORT", () => {
222222
expect(receipt.success).eq(true);
223223

224224

225-
// Charlie trying to register 'alpha.blockstack' should fail
225+
// Charlie trying to register 'alpha.blockstack' should succeed
226226
receipt = await bns.namePreorder(
227227
cases[0].namespace,
228228
"alpha",
@@ -231,7 +231,7 @@ describe("BNS Test Suite - NAME_IMPORT", () => {
231231
sender: charlie
232232
});
233233
expect(receipt.success).eq(true);
234-
expect(receipt.result).include('u29');
234+
expect(receipt.result).include('u163');
235235

236236
receipt = await bns.nameRegister(
237237
cases[0].namespace,
@@ -280,7 +280,7 @@ describe("BNS Test Suite - NAME_IMPORT", () => {
280280
expect(receipt.success).eq(false);
281281

282282
// Resolving an imported name should fail after expiration
283-
await bns.mineBlocks(100);
283+
await bns.mineBlocks(5100);
284284

285285
receipt = await bns.getNameZonefile(
286286
cases[0].namespace,

‎bns-test/test/name_preorder.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe("BNS Test Suite - NAME_PREORDER", () => {
120120
sender: cases[0].nameOwner
121121
});
122122
expect(receipt.success).eq(true);
123-
expect(receipt.result).include('u33');
123+
expect(receipt.result).include('u167');
124124

125125
// should fail if the same order is being re-submitted by Bob
126126
receipt = await bns.namePreorder(
@@ -142,11 +142,11 @@ describe("BNS Test Suite - NAME_PREORDER", () => {
142142
sender: alice
143143
});
144144
expect(receipt.success).eq(true);
145-
expect(receipt.result).include('u35');
145+
expect(receipt.result).include('u169');
146146

147147

148148
// should succeed once claimability TTL expired
149-
await mineBlocks(bns, 10);
149+
await mineBlocks(bns, 154);
150150
receipt = await bns.namePreorder(
151151
cases[0].namespace,
152152
"bob",
@@ -155,7 +155,7 @@ describe("BNS Test Suite - NAME_PREORDER", () => {
155155
sender: cases[0].nameOwner
156156
});
157157
expect(receipt.success).eq(true);
158-
expect(receipt.result).include('u46');
158+
expect(receipt.result).include('u324');
159159
});
160160
});
161161
});

‎bns-test/test/name_prices.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,13 @@ import {
9494
await bns.deployContract();
9595
});
9696

97-
9897
it("Testing name prices", async () => {
9998
// Given a launched namespace 'blockstack', owned by Alice
10099
var receipt = await bns.namespacePreorder(cases[0].namespace, cases[0].salt, cases[0].value, {
101100
sender: cases[0].namespaceOwner
102101
});
103102
expect(receipt.success).eq(true);
104-
expect(receipt.result).include('u12');
103+
expect(receipt.result).include('u146');
105104

106105
receipt = await bns.namespaceReveal(
107106
cases[0].namespace,

‎bns-test/test/name_register.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
112112
sender: cases[1].namespaceOwner
113113
});
114114
expect(receipt.success).eq(true);
115-
expect(receipt.result).include('u33');
115+
expect(receipt.result).include('u167');
116116

117117
receipt = await bns.namespaceReveal(
118118
cases[1].namespace,
@@ -132,7 +132,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
132132
100, {
133133
sender: bob
134134
});
135-
expect(receipt.result).include('u35');
135+
expect(receipt.result).include('u169');
136136
expect(receipt.success).eq(true);
137137

138138
receipt = await bns.nameRegister(
@@ -152,7 +152,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
152152
sender: cases[0].namespaceOwner
153153
});
154154
expect(receipt.success).eq(true);
155-
expect(receipt.result).include('u37');
155+
expect(receipt.result).include('u171');
156156

157157
receipt = await bns.namespaceReveal(
158158
cases[0].namespace,
@@ -194,7 +194,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
194194
sender: bob
195195
});
196196
expect(receipt.success).eq(true);
197-
expect(receipt.result).include('u42');
197+
expect(receipt.result).include('u176');
198198

199199
// should fail
200200
receipt = await bns.nameRegister(
@@ -216,7 +216,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
216216
sender: cases[0].nameOwner
217217
});
218218
expect(receipt.success).eq(true);
219-
expect(receipt.result).include('u44');
219+
expect(receipt.result).include('u178');
220220

221221
// Bob registering the name 'Bob.blockstack' should fail
222222
receipt = await bns.nameRegister(
@@ -238,7 +238,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
238238
sender: cases[0].nameOwner
239239
});
240240
expect(receipt.success).eq(true);
241-
expect(receipt.result).include('u46');
241+
expect(receipt.result).include('u180');
242242

243243
// Bob registering the name 'bob.blockstack'
244244
// should succeed
@@ -282,7 +282,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
282282
sender: charlie
283283
});
284284
expect(receipt.success).eq(true);
285-
expect(receipt.result).include('u50');
285+
expect(receipt.result).include('u184');
286286

287287
receipt = await bns.nameRegister(
288288
cases[0].namespace,
@@ -309,7 +309,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
309309
sender: cases[0].nameOwner
310310
});
311311
expect(receipt.success).eq(true);
312-
expect(receipt.result).include('u53');
312+
expect(receipt.result).include('u187');
313313

314314
receipt = await bns.nameRegister(
315315
cases[0].namespace,
@@ -323,7 +323,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
323323

324324

325325
// should succeed once 'bob.blockstack' is expired
326-
await mineBlocks(bns, cases[0].renewalRule);
326+
await mineBlocks(bns, cases[0].renewalRule + 5000);
327327

328328
receipt = await bns.namePreorder(
329329
cases[0].namespace,
@@ -333,7 +333,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
333333
sender: cases[0].nameOwner
334334
});
335335
expect(receipt.success).eq(true);
336-
expect(receipt.result).include('u65');
336+
expect(receipt.result).include('u5199');
337337

338338
receipt = await bns.getNameZonefile(
339339
cases[0].namespace,
@@ -370,7 +370,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
370370
sender: charlie
371371
});
372372
expect(receipt.success).eq(true);
373-
expect(receipt.result).include('u69');
373+
expect(receipt.result).include('u5203');
374374

375375
receipt = await bns.nameRegister(
376376
cases[0].namespace,

‎bns-test/test/name_renewal.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ describe("BNS Test Suite - NAME_RENEWAL", () => {
275275

276276
// When Bob is renewing 'bob.blockstack' at block #56 (expired)
277277
// should fail renewing
278-
await mineBlocks(bns, 16);
278+
await mineBlocks(bns, 16 + 5000);
279279

280280
receipt = await bns.getNameZonefile(
281281
cases[0].namespace,
@@ -307,7 +307,7 @@ describe("BNS Test Suite - NAME_RENEWAL", () => {
307307
sender: dave
308308
});
309309
expect(receipt.success).eq(true);
310-
expect(receipt.result).include('u56');
310+
expect(receipt.result).include('u5190');
311311
block_height += 1;
312312

313313
receipt = await bns.nameRegister(

0 commit comments

Comments
 (0)