From c87765586a13cc2a1905ce472508784ba7a04827 Mon Sep 17 00:00:00 2001 From: IshaVenikar Date: Tue, 30 Jul 2024 11:17:17 +0530 Subject: [PATCH 1/4] Replace photon with alnt --- README.md | 40 ++++++++++++++++++++-------------------- config.example.yml | 2 +- demo/README.md | 2 +- test/cli.test.ts | 2 +- test/helpers.ts | 2 +- test/run-tests.sh | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 1c98b03..9104154 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ The `gas` and `fees` can be set to some default values in the config, and can be Example: ```bash -$ laconic registry bond create --type photon --quantity 1000000000 --gas 200000 --fees 200000photon +$ laconic registry bond create --type alnt --quantity 1000000000 --gas 200000 --fees 200000alnt ``` ## Operations @@ -121,7 +121,7 @@ $ laconic registry account get --address laconic15za32wly5exgcrt2zfr8php4ya49n5y "sequence": "37", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "89998999999999991999799300" } ] @@ -132,7 +132,7 @@ $ laconic registry account get --address laconic15za32wly5exgcrt2zfr8php4ya49n5y Send tokens: ```bash -$ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k --type photon --quantity 1000000000 +$ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k --type alnt --quantity 1000000000 [ { "address": "laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd", @@ -141,7 +141,7 @@ $ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y "sequence": "16", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "99998999999999997973999700" } ] @@ -153,7 +153,7 @@ $ laconic registry tokens send --address laconic15za32wly5exgcrt2zfr8php4ya49n5y "sequence": "0", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "1000000000" } ] @@ -255,15 +255,15 @@ $ laconic registry authority whois laconic "commitsEndTime": "2022-04-26T11:44:45.679728594", "revealsEndTime": "2022-04-26T11:45:45.679728594", "commitFee": { - "type": "photon", + "type": "alnt", "quantity": "1000000" }, "revealFee": { - "type": "photon", + "type": "alnt", "quantity": "1000000" }, "minimumBid": { - "type": "photon", + "type": "alnt", "quantity": "5000000" }, "winnerAddress": "", @@ -294,15 +294,15 @@ $ laconic registry auction get 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2 "commitsEndTime": "2022-04-26T11:44:45.679728594", "revealsEndTime": "2022-04-26T11:45:45.679728594", "commitFee": { - "type": "photon", + "type": "alnt", "quantity": "1000000" }, "revealFee": { - "type": "photon", + "type": "alnt", "quantity": "1000000" }, "minimumBid": { - "type": "photon", + "type": "alnt", "quantity": "5000000" }, "winnerAddress": "", @@ -322,7 +322,7 @@ $ laconic registry auction get 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2 Commit an auction bid: ```bash -$ laconic registry auction bid commit 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2468d5d63abacd48 25000000 photon +$ laconic registry auction bid commit 0294fb2e3659c347b53a6faf4bef041fd934f0f3ab13df6d2468d5d63abacd48 25000000 alnt Reveal file: ./out/bafyreiay2rccax64yn4ljhvzvm3jkbebvzheyucuma5jlbpzpzd5i5gjuy.json ``` @@ -426,7 +426,7 @@ $ laconic registry name resolve lrn://laconic/watcher/erc20 Create bond: ```bash -$ laconic registry bond create --type photon --quantity 1000 +$ laconic registry bond create --type alnt --quantity 1000 ``` List bonds: @@ -439,7 +439,7 @@ $ laconic registry bond list "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "698000000" } ] @@ -449,7 +449,7 @@ $ laconic registry bond list "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "1000" } ] @@ -467,7 +467,7 @@ $ laconic registry bond get --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa1953 "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "691000000" } ] @@ -485,7 +485,7 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "684000000" } ] @@ -495,7 +495,7 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas "owner": "laconic15za32wly5exgcrt2zfr8php4ya49n5y7masu7k", "balance": [ { - "type": "photon", + "type": "alnt", "quantity": "1000" } ] @@ -506,13 +506,13 @@ $ laconic registry bond list --owner laconic15za32wly5exgcrt2zfr8php4ya49n5y7mas Refill bond: ```bash -$ laconic registry bond refill --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type photon --quantity 1000 +$ laconic registry bond refill --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type alnt --quantity 1000 ``` Withdraw funds from bond: ```bash -$ laconic registry bond withdraw --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type photon --quantity 500 +$ laconic registry bond withdraw --id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --type alnt --quantity 500 ``` Cancel bond: diff --git a/config.example.yml b/config.example.yml index 51ebe9e..c83f987 100644 --- a/config.example.yml +++ b/config.example.yml @@ -6,4 +6,4 @@ services: bondId: chainId: laconic_9000-1 gas: 200000 - fees: 200000photon + fees: 200000alnt diff --git a/demo/README.md b/demo/README.md index 98da29e..ae9dbe1 100644 --- a/demo/README.md +++ b/demo/README.md @@ -34,7 +34,7 @@ # userKey: # Create a bond - laconic --config config.yml registry bond create --type photon --quantity 100000000000 + laconic --config config.yml registry bond create --type alnt --quantity 100000000000 # Get the bond id laconic --config config.yml registry bond list | jq -r '.[].id' diff --git a/test/cli.test.ts b/test/cli.test.ts index b5d5ff5..37ee76b 100644 --- a/test/cli.test.ts +++ b/test/cli.test.ts @@ -397,7 +397,7 @@ describe('Test laconic CLI commands', () => { chainId: CHAIN_ID, auctionId: testAuctionId, bidderAddress: testAccount, - bidAmount: `${bidAmount}photon` + bidAmount: `${bidAmount}alnt` }); }, (AUCTION_COMMIT_DURATION + 5) * 1000); }); diff --git a/test/helpers.ts b/test/helpers.ts index f511091..0a1e733 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -3,7 +3,7 @@ import yaml from 'js-yaml'; import { SpawnSyncReturns, spawnSync } from 'child_process'; export const CHAIN_ID = 'laconic_9000-1'; -export const TOKEN_TYPE = 'photon'; +export const TOKEN_TYPE = 'alnt'; export const AUCTION_FEES = { commit: 1000000, diff --git a/test/run-tests.sh b/test/run-tests.sh index 6c692aa..ed33d19 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -28,7 +28,7 @@ services: bondId: chainId: $cosmos_chain_id gas: 200000 - fees: 200000photon + fees: 200000alnt EOL ) echo "$config" > "$config_file" -- 2.45.2 From e38ed06bad3a9f024e4b32afb2f2c8e2e15d5d06 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 30 Jul 2024 17:29:33 +0530 Subject: [PATCH 2/4] Upgrade SDK version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a2eade2..6fa89bc 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "typescript": "^4.6.3" }, "dependencies": { - "@cerc-io/registry-sdk": "^0.2.2", + "@cerc-io/registry-sdk": "^0.2.5", "fs-extra": "^10.1.0", "js-yaml": "^3.14.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index e29d3ef..ace5fad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -302,10 +302,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cerc-io/registry-sdk@^0.2.2": - version "0.2.2" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.2/registry-sdk-0.2.2.tgz#2e8a533f069b4bb9f4cd4798e783f52e29167d0d" - integrity sha512-ocRMbWtdewOg02ORfK1U+qbTqB46anHP4ApXokGkY4d+mFSApR3sdUEi2geHcs8oh+SG8YAp7LUJ9AAJneNY8g== +"@cerc-io/registry-sdk@^0.2.5": + version "0.2.5" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.5/registry-sdk-0.2.5.tgz#9ca19fecb2923520dd6a19946c309ecb2ec780a2" + integrity sha512-/KXAYf9gStaX/rRBMCEeDCexEIpTOFHeHzMK9B3xfCT+SyYZE9WC9GpX299LzBYJKKPsb0/JvnDfip9S1igJtA== dependencies: "@cosmjs/amino" "^0.28.1" "@cosmjs/crypto" "^0.28.1" -- 2.45.2 From 0a79e7b9b69028cacbee538bd2e2ca7c7c357cca Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 30 Jul 2024 17:45:40 +0530 Subject: [PATCH 3/4] Update package version --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9104154..b8dbdf4 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ The `gas` and `fees` can be set to some default values in the config, and can be Example: ```bash -$ laconic registry bond create --type alnt --quantity 1000000000 --gas 200000 --fees 200000alnt +$ laconic registry bond create --type alnt --quantity 100000000000 --gas 200000 --fees 200000alnt ``` ## Operations @@ -177,7 +177,7 @@ record: Publish record (see below for commands to create/query bonds): ```bash -$ laconic registry record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --gas 250000 +$ laconic registry record publish --filename watcher.yml --bond-id 58508984500aa2ed18e059fa8203b40fbc9828e3bfa195361335c4e4524c4785 --gas 250000 --fees 250000alnt { id: 'bafyreic3auqajvgszh3vfjsouew2rsctswukc346dmlf273ln4g6iyyhba' } ``` diff --git a/package.json b/package.json index 6fa89bc..b066699 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/laconic-registry-cli", - "version": "0.2.1", + "version": "0.2.2", "main": "index.js", "repository": "git@github.com:cerc-io/laconic-registry-cli.git", "author": "", -- 2.45.2 From 72be0db0e064c54de6d374d6d796396631b1cd19 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 30 Jul 2024 18:06:34 +0530 Subject: [PATCH 4/4] Update CLI tests --- test/cli.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/cli.test.ts b/test/cli.test.ts index 37ee76b..8ab2e7e 100644 --- a/test/cli.test.ts +++ b/test/cli.test.ts @@ -52,7 +52,7 @@ describe('Test laconic CLI commands', () => { const testAccount = process.env.TEST_ACCOUNT; assert(testAccount, 'TEST_ACCOUNT not set in env'); const testAccount2 = 'laconic1pmuxrcnuhhf8qdllzuf2ctj2tnwwcg6yswqnyd'; - const initialAccountBalance = Number('100000000000000000000000000'); + const initialAccountBalance = Number('1000000000000000000000000000000'); const testAuthorityName = 'laconic'; const testRecordFilePath = 'test/data/watcher-record.yml'; @@ -224,12 +224,13 @@ describe('Test laconic CLI commands', () => { describe('Record operations', () => { const gas = 250000; + const fees = `250000${TOKEN_TYPE}`; const bondBalance = 1000000000; - test('laconic registry record publish --filename --bond-id --gas ', async () => { + test('laconic registry record publish --filename --bond-id --gas --fees ', async () => { // Create a new bond to be associated with the record ({ bondId: testRecordBondId } = createBond(bondBalance)); - const result = spawnSync('laconic', ['registry', 'record', 'publish', '--filename', testRecordFilePath, '--bond-id', testRecordBondId, '--gas', gas.toString()]); + const result = spawnSync('laconic', ['registry', 'record', 'publish', '--filename', testRecordFilePath, '--bond-id', testRecordBondId, '--gas', gas.toString(), '--fees', fees]); const outputObj = checkResultAndRetrieveOutput(result); // Expect output object to resultant bond id -- 2.45.2