diff --git a/package.json b/package.json index 8038b09..2f84311 100644 --- a/package.json +++ b/package.json @@ -9,13 +9,13 @@ "lint": "next lint" }, "dependencies": { - "@cashscript/utils": "^0.12.0", + "@cashscript/utils": "^0.13.0-next.2", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", "@monaco-editor/react": "^3.6.2", "bootstrap": "^5.3.7", - "cashc": "^0.12.0", - "cashscript": "^0.12.0", + "cashc": "^0.13.0-next.2", + "cashscript": "^0.13.0-next.2", "next": "^15.5.4", "react": "18.2.0", "react-bootstrap": "^2.10.10", diff --git a/src/components/Contracts.tsx b/src/components/Contracts.tsx index c5bc95b..4a5d9e5 100644 --- a/src/components/Contracts.tsx +++ b/src/components/Contracts.tsx @@ -53,7 +53,7 @@ const Contracts: React.FC = ({ provider, contracts, setContracts, updateU
- Contract type: + Contract type: {contractInfo.contract.addressType}
Contract address {contractInfo.contract.address} @@ -108,7 +108,7 @@ const Contracts: React.FC = ({ provider, contracts, setContracts, updateU

{contractInfo.utxos?.reduce((acc, utxo) => acc + utxo.satoshis, 0n).toString()} satoshis

} Contract size -

{contractInfo.contract.bytesize} bytes (max 1650)

+

{contractInfo.contract.bytesize} bytes (max 10,000)

diff --git a/src/exampleContracts/examples.ts b/src/exampleContracts/examples.ts index c7dadf2..9744fec 100644 --- a/src/exampleContracts/examples.ts +++ b/src/exampleContracts/examples.ts @@ -1,4 +1,4 @@ -export const exampleTimeoutContract = `pragma cashscript ~0.12.0; +export const exampleTimeoutContract = `pragma cashscript ~0.13.0; // see https://cashscript.org/docs/basics/getting-started#writing-your-first-contract @@ -16,7 +16,7 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) { } ` -export const exampleEscrowContract = `pragma cashscript ~0.12.0; +export const exampleEscrowContract = `pragma cashscript ~0.13.0; // see https://cashscript.org/docs/guides/covenants#restricting-p2pkh-recipients @@ -40,7 +40,7 @@ contract Escrow(bytes20 arbiter, bytes20 buyer, bytes20 seller) { } ` -export const exampleStramingMecenasContract = `pragma cashscript ~0.12.0; +export const exampleStramingMecenasContract = `pragma cashscript ~0.13.0; // see https://cashscript.org/docs/guides/covenants#keeping-local-state-in-nfts @@ -100,7 +100,7 @@ contract StreamingMecenas( } ` -export const exampleDexContract = `pragma cashscript ~0.12.0; +export const exampleDexContract = `pragma cashscript ~0.13.0; // see https://cashscript.org/docs/language/examples#amm-dex diff --git a/yarn.lock b/yarn.lock index 1311e9b..bdea660 100644 --- a/yarn.lock +++ b/yarn.lock @@ -70,10 +70,10 @@ resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-3.1.0-next.8.tgz#d130e5db6c3c8b24731c8d04c4091be07f48b0ee" integrity sha512-Pm+Ju+YP3JeBLLTiVrBnia2wwE4G17r4XqpvPRMcklElJTe8J6x3JgKRg1by0Xm3ZY6UFxACkEAoSA+x419/zA== -"@cashscript/utils@^0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.12.0.tgz#d4e96428ecb09792fb87970f4675214d7e54f409" - integrity sha512-25sJQuEUBeZ3BwCRJ3bruqsyP/9P1VLy9gnqObB/Uz2rzW9OAmDQ5gDsx9ABywazoXmq5/mQ+gQBwlqt9qpgmA== +"@cashscript/utils@^0.13.0-next.2": + version "0.13.0-next.2" + resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.13.0-next.2.tgz#35ada1d262f77b2a0814f8ca2f5556345a8a46fc" + integrity sha512-0eRd/cksfm86gnXMSN2ciY3dTa4f3jsjRdEC6JKyF+HnlDjF7wsFpIOCku4Af5GwAsA0xrxWEf1tDrOg0Edsqw== dependencies: "@bitauth/libauth" "^3.1.0-next.8" @@ -1187,27 +1187,27 @@ caniuse-lite@^1.0.30001579: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz#ead1b155ea691d6a87938754d3cb119c24465b03" integrity sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w== -cashc@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.12.0.tgz#1e0674d569c5ae4119226032b792b226cf39457c" - integrity sha512-Cns6Xi+sRbURn7j8OwTAsVOp16BgUN3EmPNXMAj8DWhyofhJSPzkxtvynvKH10N1yDQBU8/Y9X/pz7JRA90UIg== +cashc@^0.13.0-next.2: + version "0.13.0-next.2" + resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.13.0-next.2.tgz#95d81c9dc49d6ee6279491a2d0be38ce381bbaa8" + integrity sha512-A6pxsPAxCNXoRKH9+p9jsEYeYDzilHe4u17dtzaBeTN0GkLHwH6VjpDMezDe94JdtksdMiiQKa1i+n6u/ogVrw== dependencies: "@bitauth/libauth" "^3.1.0-next.8" - "@cashscript/utils" "^0.12.0" + "@cashscript/utils" "^0.13.0-next.2" antlr4 "^4.13.2" commander "^14.0.0" semver "^7.7.2" -cashscript@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.12.0.tgz#66225524eb94fa657b4c68ac90e786d4348a848b" - integrity sha512-pdrBjdiBka8g/jVCtaku08R2xoFCMo2GG/pdVf/z+b95Yd0H1ioFSMlp9mx1xuxeYbvZx85ZGk643CAFm+Kzgg== +cashscript@^0.13.0-next.2: + version "0.13.0-next.2" + resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.13.0-next.2.tgz#61ce813b34673bb381f33d37289c3534736bf591" + integrity sha512-aO8tRBrIzltmiV/3xykdaGiPchr3x/ZgIqZY6JCyqYXjDRMTFZFMygewz4fO3w0xG43xFvazp/j8s4b11fECsQ== dependencies: "@bitauth/libauth" "^3.1.0-next.8" - "@cashscript/utils" "^0.12.0" + "@cashscript/utils" "^0.13.0-next.2" "@electrum-cash/network" "^4.1.3" "@mr-zwets/bchn-api-wrapper" "^1.0.1" - pako "^2.1.0" + fflate "^0.8.2" semver "^7.7.2" chalk@^2.0.0: @@ -1987,6 +1987,11 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" +fflate@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.2.tgz#fc8631f5347812ad6028bbe4a2308b2792aa1dea" + integrity sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A== + file-entry-cache@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f" @@ -3003,11 +3008,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -pako@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86" - integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"