diff --git a/.github/workflows/solana-js-test.yml b/.github/workflows/solana-js-test.yml index 80d3fa130..d0cf3879d 100644 --- a/.github/workflows/solana-js-test.yml +++ b/.github/workflows/solana-js-test.yml @@ -110,7 +110,7 @@ jobs: 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx --clone - FSD8p7tDkhffAiMgAvMXi9veJW1uSod4H3F3REn7nMNC --clone + BzqtGXZPiDSinP4xMFgPf6FLgSa6iPufK4m4JJFgMnTK --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd" - name: Run Tests @@ -177,7 +177,7 @@ jobs: 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx --clone - FSD8p7tDkhffAiMgAvMXi9veJW1uSod4H3F3REn7nMNC --clone + BzqtGXZPiDSinP4xMFgPf6FLgSa6iPufK4m4JJFgMnTK --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd" - name: Run Tests diff --git a/examples/functions/01_basic_oracle/Anchor.toml b/examples/functions/01_basic_oracle/Anchor.toml index 6daf99fa5..38b445e74 100644 --- a/examples/functions/01_basic_oracle/Anchor.toml +++ b/examples/functions/01_basic_oracle/Anchor.toml @@ -36,4 +36,4 @@ address = "7hkp1xfPBcD2t1vZMoWWQPzipHVcXeLAAaiGXdPSfDie" # [[test.validator.clone]] # sb devnet attestation IDL # address = "5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz" [[test.validator.clone]] # sb devnet attestation State -address = "EuCumvrswq5HZC4ME1wh7Q7V6dN8DRetP3eM1gU4RPYp" +address = "5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS" diff --git a/javascript/solana.js/init.ts b/javascript/solana.js/init.ts new file mode 100644 index 000000000..ff81f7dea --- /dev/null +++ b/javascript/solana.js/init.ts @@ -0,0 +1,29 @@ +import * as sbv2 from "./src"; + +import { Connection } from "@solana/web3.js"; + +async function main() { + const program = await sbv2.SwitchboardProgram.load( + "devnet", + new Connection( + "https://switchbo-switchbo-6225.devnet.rpcpool.com/f6fb9f02-0777-498b-b8f5-67cbb1fc0d14" + ), + sbv2.loadKeypair( + "~/switchboard_environments_v2/devnet/upgrade_authority/upgrade_authority.json" + ) + ); + + const [programState] = await sbv2.AttestationProgramStateAccount.getOrCreate( + program + ); + + console.log(`Initialized: ${programState.publicKey.toBase58()}`); +} + +main() + .then(() => { + // console.log("Executed successfully"); + }) + .catch((err) => { + console.error(err); + }); diff --git a/javascript/solana.js/package.json b/javascript/solana.js/package.json index 7376193e5..870a0b1e5 100644 --- a/javascript/solana.js/package.json +++ b/javascript/solana.js/package.json @@ -146,8 +146,8 @@ "keypair:create": "shx find ~/.config/solana/id.json || solana-keygen new -s --no-bip39-passphrase --outfile ~/.config/solana/id.json", "localnet:down": "kill -9 $(pgrep command solana-test-validator) || exit 0", "localnet": "tsx ./scripts/localnet.ts", - "local:validator": "shx mkdir -p .anchor/test-ledger || true; solana-test-validator -q -r --ledger .anchor/test-ledger --mint $(solana-keygen pubkey ~/.config/solana/id.json) --bind-address 0.0.0.0 --url https://api.devnet.solana.com --rpc-port 8899 --clone SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f `# programId` --clone 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF `# programDataAddress` --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk `# idlAddress` --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx `# sgxProgramId` --clone FSD8p7tDkhffAiMgAvMXi9veJW1uSod4H3F3REn7nMNC `# sgxProgramDataAddress` --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz `# sgxIdlAddress` --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd `# programState` --clone 7hkp1xfPBcD2t1vZMoWWQPzipHVcXeLAAaiGXdPSfDie `# switchboardVault`", - "local:validator:mainnet": "solana-test-validator -q -r --ledger .anchor/test-ledger --mint $(solana-keygen pubkey ~/.config/solana/id.json) --bind-address 0.0.0.0 --rpc-port 8899 --url https://api.mainnet-beta.solana.com --clone SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f --clone 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx --clone FSD8p7tDkhffAiMgAvMXi9veJW1uSod4H3F3REn7nMNC --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd --clone J7nSEX8ADf3pVVicd6yKy2Skvg8iLePEmkLUisAAaioD", + "local:validator": "shx mkdir -p .anchor/test-ledger || true; solana-test-validator -q -r --ledger .anchor/test-ledger --mint $(solana-keygen pubkey ~/.config/solana/id.json) --bind-address 0.0.0.0 --url https://api.devnet.solana.com --rpc-port 8899 --clone SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f `# programId` --clone 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF `# programDataAddress` --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk `# idlAddress` --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx `# sgxProgramId` --clone BzqtGXZPiDSinP4xMFgPf6FLgSa6iPufK4m4JJFgMnTK `# sgxProgramDataAddress` --clone 5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS `# sgxProgramState` --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz `# sgxIdlAddress` --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd `# programState` --clone 7hkp1xfPBcD2t1vZMoWWQPzipHVcXeLAAaiGXdPSfDie `# switchboardVault`", + "local:validator:mainnet": "solana-test-validator -q -r --ledger .anchor/test-ledger --mint $(solana-keygen pubkey ~/.config/solana/id.json) --bind-address 0.0.0.0 --rpc-port 8899 --url https://api.mainnet-beta.solana.com --clone SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f --clone 7nYabs9dUhvxYwdTnrWVBL9MYviKSfrEbdWCUbcnwkpF --clone Fi8vncGpNKbq62gPo56G4toCehWNy77GgqGkTaAF5Lkk --clone sbattyXrzedoNATfc4L31wC9Mhxsi1BmFhTiN8gDshx --clone BzqtGXZPiDSinP4xMFgPf6FLgSa6iPufK4m4JJFgMnTK --clone 5MFs7RGTjLi1wtKNBFRtuLipCkkjs4YQwRRU9sjnbQbS --clone 5ExuoQR69trmKQfB95fDsUGsUrrChbGq9PFgt8qouncz --clone CyZuD7RPDcrqCGbNvLCyqk6Py9cEZTKmNKujfPi3ynDd --clone J7nSEX8ADf3pVVicd6yKy2Skvg8iLePEmkLUisAAaioD", "generate": "tsx ./scripts/generate-client.ts", "build:old": "shx rm -rf lib || true; tsc -p tsconfig.cjs.json && tsc", "build": "node esbuild.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 326ac692e..8ddbec405 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -188,8 +188,8 @@ importers: specifier: ^1.73.3 version: 1.73.3 '@switchboard-xyz/common': - specifier: ^2.2.0 - version: 2.2.0 + specifier: ^2.2.4 + version: 2.2.4 '@switchboard-xyz/oracle': specifier: ^2.1.13 version: 2.1.13 @@ -380,8 +380,8 @@ importers: specifier: ^1.77.3 version: 1.77.3 '@switchboard-xyz/common': - specifier: ^2.2.3 - version: 2.2.3 + specifier: ^2.2.4 + version: 2.2.4 cron-validator: specifier: ^1.3.1 version: 1.3.1 @@ -1529,8 +1529,8 @@ packages: - utf-8-validate dev: false - /@switchboard-xyz/common@2.2.3: - resolution: {integrity: sha512-E4NQf9aXdOiul+sySAbFPAW9k0qz4wRTfqrU7cEa8nRIvUkg6VIZ+5JfajHv/VfK9UOD+6ZfMBxq2+dHkiz9zw==} + /@switchboard-xyz/common@2.2.4: + resolution: {integrity: sha512-T8m7jQYWL6CEjNLeosZ0mld9BaTzkhX2lemCKO46p5oFTExuClcY8C++Dz13dloBd9MZ9GONxxG7sQIyk6b1XQ==} engines: {node: '>=12'} dependencies: '@solana/web3.js': 1.77.3 @@ -6774,7 +6774,7 @@ packages: '@coral-xyz/borsh': 0.28.0(@solana/web3.js@1.77.3) '@solana/spl-token': 0.3.8(@solana/web3.js@1.77.3) '@solana/web3.js': 1.77.3 - '@switchboard-xyz/common': 2.2.3 + '@switchboard-xyz/common': 2.2.4 '@switchboard-xyz/oracle': 2.1.11 cron-validator: 1.3.1 dotenv: 16.3.1