From a07ef00ddf348032d485f9c6597976ac7e353f0a Mon Sep 17 00:00:00 2001 From: Jason Paulos Date: Tue, 21 Nov 2023 15:40:53 -0500 Subject: [PATCH] Update algosdk branch --- package-lock.json | 11 +++++++---- package.json | 2 +- src/common/utils.ts | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e43c27..9d3d81a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,22 @@ { - "name": "avm-debug", + "name": "avm-debug-adapter", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "avm-debug", + "name": "avm-debug-adapter", "version": "0.1.0", "license": "MIT", "dependencies": { "@vscode/debugadapter": "^1.64.0", - "algosdk": "github:jasonpaulos/js-algorand-sdk#teal-source-map-improvements", + "algosdk": "github:algorand/js-algorand-sdk#3.0.0", "await-notify": "^1.0.1", "json-bigint": "^1.0.0" }, + "bin": { + "avm-debug": "dist/cli.js" + }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/glob": "^7.2.0", @@ -1320,7 +1323,7 @@ }, "node_modules/algosdk": { "version": "2.6.0", - "resolved": "git+ssh://git@github.com/jasonpaulos/js-algorand-sdk.git#327f33ca75dc7c931820844a674fe763f9b88a16", + "resolved": "git+ssh://git@github.com/algorand/js-algorand-sdk.git#d52784019343077cc8cb6a3e8c9f8ce34ad3d509", "license": "MIT", "dependencies": { "algo-msgpack-with-bigint": "^2.1.1", diff --git a/package.json b/package.json index dbac4a9..e12c8a1 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@vscode/debugadapter": "^1.64.0", - "algosdk": "github:jasonpaulos/js-algorand-sdk#teal-source-map-improvements", + "algosdk": "github:algorand/js-algorand-sdk#3.0.0", "await-notify": "^1.0.1", "json-bigint": "^1.0.0" }, diff --git a/src/common/utils.ts b/src/common/utils.ts index 7ebe5b6..1399ac0 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -136,7 +136,7 @@ interface ProgramSourceEntry { export class ProgramSourceDescriptor { public readonly sourcemapFileLocation: string; - public readonly sourcemap: algosdk.SourceMap; + public readonly sourcemap: algosdk.ProgramSourceMap; public readonly hash: Uint8Array; constructor({ @@ -145,7 +145,7 @@ export class ProgramSourceDescriptor { hash, }: { sourcemapFileLocation: string; - sourcemap: algosdk.SourceMap; + sourcemap: algosdk.ProgramSourceMap; hash: Uint8Array; }) { this.sourcemapFileLocation = sourcemapFileLocation; @@ -179,7 +179,7 @@ export class ProgramSourceDescriptor { fileAccessor.readFile(sourcemapFileLocation), 'Could not read source map file', ); - const sourcemap = new algosdk.SourceMap( + const sourcemap = new algosdk.ProgramSourceMap( JSON.parse(new TextDecoder().decode(rawSourcemap)), );