Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"

- name: Install project dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"

- name: Install ESLint
Expand All @@ -46,7 +46,7 @@ jobs:
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: eslint-results.sarif
wait-for-processing: true
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"

- name: Install project dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"

- name: Install project dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"

- name: Install project dependencies
Expand All @@ -35,7 +35,7 @@ jobs:
TEST_PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY }}

- name: Upload coverage to Codecov
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage.lcov
path: coverage/lcov.info
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "22"
cache: "yarn"
registry-url: "https://registry.npmjs.org"

Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metanames/sdk",
"version": "6.3.0",
"version": "6.3.1",
"description": "Meta Names SDK",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -18,9 +18,9 @@
"prepublishOnly": "yarn build"
},
"dependencies": {
"@ledgerhq/hw-transport": "^6.31.4",
"@partisiablockchain/abi-client": "^5.48.0",
"@secata-public/bitmanipulation-ts": "^3.2.0",
"@ledgerhq/hw-transport": "^6.34.0",
"@partisiablockchain/abi-client": "^6.0.0",
"@secata-public/bitmanipulation-ts": "^3.4.0",
"bip32-path": "^0.4.2",
"node-fetch": "2",
"partisia-blockchain-applications-crypto": "^1.0.34",
Expand All @@ -29,24 +29,24 @@
"tr46": "^4.1.1"
},
"devDependencies": {
"@types/jest": "^29.5.13",
"@types/node": "^18.19.56",
"@types/node-fetch": "^2.6.11",
"@types/jest": "^29.5.14",
"@types/node": "^18.19.130",
"@types/node-fetch": "^2.6.13",
"@types/tr46": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"dotenv": "^16.4.5",
"dotenv": "^16.6.1",
"eslint": "^8.57.1",
"eslint-config-standard-with-typescript": "^34.0.1",
"eslint-plugin-import": "^2.31.0",
"eslint-config-standard-with-typescript": "^39.0.0",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.6.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-jest": "^29.4.6",
"ts-node": "^10.9.2",
"typedoc": "^0.24.8",
"typescript": "5.0.4"
"typescript": "^5.4.0"
},
"publishConfig": {
"directory": "dist"
Expand Down
14 changes: 6 additions & 8 deletions src/actions/domain.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { BN, ContractAbi, FnRpcBuilder } from '@partisiablockchain/abi-client'
import { BN, ContractAbi, RpcContractBuilder } from '@partisiablockchain/abi-client'
import { IActionApproveMintFees, IActionDomainMintPayload, IActionDomainTransferPayload, IActionRenewDomainPayload } from '../interface'
import { builderToBytesBe } from '../transactions/helper'

export const actionDomainMintPayload = (contractAbi: ContractAbi, params: IActionDomainMintPayload): Buffer => {
if (!contractAbi.getFunctionByName('mint')) throw new Error('Function mint not found in contract abi')

const rpc = new FnRpcBuilder('mint', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'mint')
rpc.addString(params.domain)

const address = typeof params.to === 'string' ? Buffer.from(params.to, 'hex') : params.to
Expand All @@ -26,7 +24,7 @@ export const actionDomainMintPayload = (contractAbi: ContractAbi, params: IActio
}

export const actionDomainMintBatchPayload = (contractAbi: ContractAbi, params: IActionDomainMintPayload[]): Buffer => {
const rpc = new FnRpcBuilder('mint_batch', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'mint_batch')

const vecBuilder = rpc.addVec()
params.forEach((param) => {
Expand All @@ -53,7 +51,7 @@ export const actionDomainMintBatchPayload = (contractAbi: ContractAbi, params: I
}

export const actionApproveMintFeesPayload = (contractAbi: ContractAbi, params: IActionApproveMintFees): Buffer => {
const rpc = new FnRpcBuilder('approve', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'approve')

const spender = typeof params.address === 'string' ? Buffer.from(params.address, 'hex') : params.address
rpc.addAddress(spender)
Expand All @@ -65,7 +63,7 @@ export const actionApproveMintFeesPayload = (contractAbi: ContractAbi, params: I
}

export const actionDomainRenewalPayload = (contractAbi: ContractAbi, params: IActionRenewDomainPayload): Buffer => {
const rpc = new FnRpcBuilder('renew_subscription', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'renew_subscription')

rpc.addString(params.domain)
rpc.addU64(params.byocTokenId)
Expand All @@ -79,7 +77,7 @@ export const actionDomainRenewalPayload = (contractAbi: ContractAbi, params: IAc
}

export const actionDomainTransferFromPayload = (contractAbi: ContractAbi, params: IActionDomainTransferPayload): Buffer => {
const rpc = new FnRpcBuilder('transfer_from', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'transfer_from')

const { from, to, tokenId } = params

Expand Down
16 changes: 5 additions & 11 deletions src/actions/record.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { AbstractBuilder, ContractAbi, FnRpcBuilder } from '@partisiablockchain/abi-client'
import { AbstractBuilder, ContractAbi, RpcContractBuilder } from '@partisiablockchain/abi-client'
import { IActionRecordDelete, IActionRecordMint, IActionRecordUpdate } from '../interface'
import { builderToBytesBe } from '../transactions/helper'

export const actionRecordMintPayload = (contractAbi: ContractAbi, params: IActionRecordMint): Buffer => {
if (!contractAbi.getFunctionByName('mint_record')) throw new Error('Function mint_record not found in contract abi')

const rpc = new FnRpcBuilder('mint_record', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'mint_record')
addCommonRecordArgs(rpc, params)
addDataArg(rpc, params.data)

Expand All @@ -15,7 +13,7 @@ export const actionRecordMintPayload = (contractAbi: ContractAbi, params: IActio
export const actionRecordMintBatchPayload = (contractAbi: ContractAbi, params: IActionRecordMint[]): Buffer => {
if (!contractAbi.getFunctionByName('mint_record_batch')) throw new Error('Function mint_record_batch not found in contract abi')

const rpc = new FnRpcBuilder('mint_record_batch', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'mint_record_batch')
const vecBuilder = rpc.addVec()
params.forEach((param) => {
const structBuilder = vecBuilder.addStruct()
Expand All @@ -27,19 +25,15 @@ export const actionRecordMintBatchPayload = (contractAbi: ContractAbi, params: I
}

export const actionRecordUpdatePayload = (contractAbi: ContractAbi, params: IActionRecordUpdate): Buffer => {
if (!contractAbi.getFunctionByName('update_record')) throw new Error('Function update_record not found in contract abi')

const rpc = new FnRpcBuilder('update_record', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'update_record')
addCommonRecordArgs(rpc, params)
addDataArg(rpc, params.data)

return builderToBytesBe(rpc)
}

export const actionRecordDeletePayload = (contractAbi: ContractAbi, params: IActionRecordDelete): Buffer => {
if (!contractAbi.getFunctionByName('delete_record')) throw new Error('Function delete_record not found in contract abi')

const rpc = new FnRpcBuilder('delete_record', contractAbi)
const rpc = new RpcContractBuilder(contractAbi, 'delete_record')
addCommonRecordArgs(rpc, params)

return builderToBytesBe(rpc)
Expand Down
2 changes: 1 addition & 1 deletion src/partisia-name-system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function getDomainNamesByOwner(domains: ScValueAvlTreeMap, owners: ScValu
}

export function deserializeDomain(bytes: Buffer, contractAbi: ContractAbi, domainName: string, tld: string): IDomainPartial {
const reader = new StateReader(bytes, contractAbi)
const reader = StateReader.create(bytes, contractAbi)
const domainStructIndex = contractAbi.namedTypes.findIndex((t) => t.name === 'Domain')
const struct = reader.readStateValue({ typeIndex: TypeIndex.Named, index: domainStructIndex }).structValue()

Expand Down
14 changes: 7 additions & 7 deletions src/repositories/contract-repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class ContractRepository implements IContractRepository {
if (!('state' in serializedContract)) throw new Error('Contract state not found')

const contractAbi = contract.abi
const reader = new StateReader(Buffer.from(serializedContract.state.data, 'base64'), contractAbi, serializedContract.avlTrees)
const reader = StateReader.create(Buffer.from(serializedContract.state.data, 'base64'), contractAbi, serializedContract.avlTrees as unknown as Buffer | undefined)
const struct = reader.readStruct(contractAbi.getStateStruct())

return struct
Expand All @@ -65,7 +65,7 @@ export class ContractRepository implements IContractRepository {
entry = {
fetchedAt: Date.now(),
contract: {
abi: abi.contract
abi: abi.contract()
}
}

Expand Down Expand Up @@ -141,7 +141,7 @@ export class ContractRepository implements IContractRepository {
private async getContractFromRegistry({ contractAddress, force, withState, partial }: ContractParams): Promise<Contract | undefined> {
if (!contractAddress) throw new Error('Contract address not specified')

let contractEntry = this.contractRegistry.get(contractAddress)
const contractEntry = this.contractRegistry.get(contractAddress)

const serializedContract = contractEntry?.contract?.data?.serializedContract
const hasPartialState = serializedContract?.state !== undefined
Expand All @@ -158,17 +158,17 @@ export class ContractRepository implements IContractRepository {
if (!rawContract) return

const fileAbi = this.parseAbi(rawContract.abi)
contractEntry = {
const newContractEntry: ContractEntry = {
fetchedAt: Date.now(),
contract: {
data: rawContract,
abi: fileAbi.contract
abi: fileAbi.contract()
}
}

this.contractRegistry.set(contractAddress, contractEntry)
this.contractRegistry.set(contractAddress, newContractEntry)

return contractEntry.contract
return newContractEntry.contract
}

private parseAbi(abi: string) {
Expand Down
11 changes: 3 additions & 8 deletions src/transactions/helper.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import { AbiOutputBytes, FnRpcBuilder } from "@partisiablockchain/abi-client"
import { BigEndianByteOutput } from "@secata-public/bitmanipulation-ts"
import { RpcContractBuilder } from "@partisiablockchain/abi-client"
import { serializedTransaction } from "partisia-blockchain-applications-crypto/lib/main/transaction"
import { PartisiaAccountClass } from "partisia-blockchain-applications-rpc/lib/main/accountInfo"
import { PartisiaRpcClass } from "partisia-blockchain-applications-rpc/lib/main/rpc"

export const builderToBytesBe = (rpc: FnRpcBuilder) => {
const bitOutput = new BigEndianByteOutput()
const abiOutputBits = new AbiOutputBytes(bitOutput)
rpc.write(abiOutputBits)

return bitOutput.toBuffer()
export const builderToBytesBe = (rpc: RpcContractBuilder) => {
return rpc.getBytes()
}

export const getChainId = (isMainnet: boolean): string => `Partisia Blockchain${isMainnet ? '' : ' Testnet'}`
Expand Down
2 changes: 1 addition & 1 deletion src/transactions/ledger.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BN } from "@secata-public/bitmanipulation-ts"
// @ts-ignore - no types available when importing in external proj
// @ts-expect-error - no types available when importing in external proj
import BIPPath from 'bip32-path'
import type Transport from "@ledgerhq/hw-transport"
import type { Signature } from "./types"
Expand Down
Loading
Loading