Skip to content

Commit

Permalink
Merge branch 'master' into add-multisig-type
Browse files Browse the repository at this point in the history
  • Loading branch information
Lbqds committed May 10, 2024
2 parents 1af102b + f70e68b commit 5a5743c
Show file tree
Hide file tree
Showing 173 changed files with 11,854 additions and 4,440 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3.0.0
with:
version: 7.19
version: 8.14
- run: pnpm audit
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
with:
node-version: 16

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3.0.0
with:
version: 7.19
version: 8.14

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3.0.0
with:
version: 7.19
version: 8.14
- run: cd packages/web3 && pnpm i
# Wait for this issue to be resolved: https://github.com/acacode/swagger-typescript-api/issues/370
- run: npm run update-schemas && test -z "$(git status --porcelain)"
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ on:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-test.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-leman.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
workflow_dispatch:

jobs:
Expand All @@ -29,11 +28,13 @@ jobs:
tag=$(echo ${GITHUB_REF/refs\/tags\//} | cut -c 2-)
dist_tag=$([[ $tag =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo latest || echo "")
dist_tag=$([[ $tag =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]] && echo rc || echo $dist_tag)
[ -z "$dist_tag" ] && echo "Distribution tag is not set to latest nor to rc" && exit 1
dist_tag=$([[ $tag =~ ^[0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+$ ]] && echo beta || echo $dist_tag)
[ -z "$dist_tag" ] && echo "Distribution tag is not set to latest nor to rc or beta" && exit 1
echo ::set-output name=DIST_TAG::$dist_tag
shell: bash
publish:
runs-on: ubuntu-latest
needs: get_dist_tag
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -44,12 +45,12 @@ jobs:
with:
node-version: 16
registry-url: 'https://registry.npmjs.org'
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3.0.0
with:
version: 7.19
version: 8.14
- run: pnpm install
- run: git status
- name: Publish to npm
run: npm run publish --tag ${{ needs.get_dist_tag.outputs.DIST_TAG }}
run: npm run publish -- --tag ${{ needs.get_dist_tag.outputs.DIST_TAG }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3.0.0
with:
version: 7.19
version: 8.14
- run: |
pushd docker
docker-compose up -d
Expand Down
147 changes: 121 additions & 26 deletions .project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"fullNodeVersion": "v2.5.5",
"fullNodeVersion": "v2.14.0",
"compilerOptionsUsed": {
"ignoreUnusedConstantsWarnings": false,
"ignoreUnusedVariablesWarnings": false,
Expand All @@ -11,49 +11,57 @@
"infos": {
"Add": {
"sourceFile": "add/add.ral",
"sourceCodeHash": "6c08da762c111145d8c876e36bb9f69dcbc86368a546b4c5bfe23f0f4db1975b",
"bytecodeDebugPatch": "",
"codeHashDebug": "2b9e382c20b4facf21eb745a46a72447dae221c274518e19c60b5ddfe478cc9c",
"sourceCodeHash": "95b2d5b3755f9a00b616a8beaccf7b42da269ae57a25ec825c333395cd2a23bc",
"bytecodeDebugPatch": "=8-2+48=3-1+d=2-2+7b=47+77e010a=1+1646450726976617465=172",
"codeHashDebug": "63d043ea1cf35f5c9d8a6012bb7aa2c7d1aec5ca0ea1a6501cfd38d12cf39543",
"warnings": [
"The return values of the function \"Add.copyCreateSubContract\" are not used. If this is intentional, consider using anonymous variables to suppress this warning.",
"No external caller check for function \"Add.createSubContract\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\".",
"No external caller check for function \"Add.add\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\"."
]
},
"Assert": {
"sourceFile": "test/assert.ral",
"sourceCodeHash": "6e29a32037532fe7c415d6a8076626ee81767ff3162d3d2f34d08f7e0594a914",
"sourceCodeHash": "65f8387941a38e88ef555f5d0b4992dab390d97ff97b2473fdea45b8d58a74a5",
"bytecodeDebugPatch": "",
"codeHashDebug": "5bd05924fb9a23ea105df065a8c2dfa463b9ee53cc14a60320140d19dd6151ca",
"codeHashDebug": "46dc5e3835be6551dacbf81565912ec67575aa77522312ceed88472817735d6b",
"warnings": [
"Found unused constants in Assert: A, Addresses.A, Addresses.B, B, ByteVecs.A, ByteVecs.B, C, Numbers.A, Numbers.B"
]
},
"Balances": {
"sourceFile": "test/struct.ral",
"sourceCodeHash": "7690ad7d8b8c4b952fc6f439eb75648164532e055e6a47881882097c0600bb6a",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"Debug": {
"sourceFile": "test/debug.ral",
"sourceCodeHash": "0d7cdfad264cf2009dd8907b716ba0d79cc4cf722b35773129645c5415bcb4dc",
"bytecodeDebugPatch": "=4-2+13=11+2ca7e=1+20748656c6c6f2c200121",
"codeHashDebug": "0ffc72054e3668c8933e53c892947dea1963c0c24cc006a4fb0aa028c13a7e13",
"bytecodeDebugPatch": "=4-2+18=11-1+3=10+ca7e020748656c6c6f2c200121",
"codeHashDebug": "eb4209d8f543d9f623d72578f7ed9b271d62cf396dcce42d10f5e68dba3cecd3",
"warnings": []
},
"DeprecatedNFTTest1": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "3d89da71c0a6e905dd54267f897137ec6beb9603bb787e0e4a36bfc76f7a712b",
"codeHashDebug": "cc6928c9c6777077abcb5b9c4f7c5d620d6cae07ec6f00f5e8b0efe6a7b913c4",
"warnings": []
},
"DeprecatedNFTTest2": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "c3e8a33252664e2f79903788d8abd79ee2c6785c580fa6911a0868436c59f59e",
"codeHashDebug": "ade9aee476ee752050a1e9e1b19039f05261cb3f53941152617174faf9eae572",
"warnings": []
},
"DeprecatedNFTTest3": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "75181639c8575ce108d1ecb0b1b73a373a8652ffe6f5f6621d9f9eee5a0b2eb4",
"codeHashDebug": "465bc3739cd1649e58e0470971bd2fabf21363ab9fc2c15052fb2440dd06ada5",
"warnings": [
"Found unused fields in DeprecatedNFTTest3: collectionId"
]
Expand All @@ -62,28 +70,28 @@
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "d8f8650c15cc96211608a52ae7d43a15d7b28306ac13acec672c0f1ed02a0538",
"codeHashDebug": "a5de0fa0b3580303ac63423f09ce5ed95fccbf789679b32130a53c26fef182e9",
"warnings": []
},
"DeprecatedNFTTest5": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "65c9d8a07f42939e84b4ae2fdc94dbbe3545c8ddb0832df08ef69b3cab50ebe3",
"codeHashDebug": "8b1374f39db98c485af3dd05d0b0ce861e9528f290ca9dc0d7108e8b48b50161",
"warnings": []
},
"DeprecatedNFTTest6": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "88822622be55e862a1759c4e0c02300da75fe9e3dbe73c8fbe0fa8714996629e",
"codeHashDebug": "8bc0d39f0607d4a771ec70ae1057b71dbcde404177cb3b25fd7d93d553a2b8cd",
"warnings": []
},
"DeprecatedNFTTest7": {
"sourceFile": "nft/deprecated_nft.ral",
"sourceCodeHash": "ef29c0be80692016b71dc5a400cf093884acef3e07ed2c7ead78bc3927e0f478",
"bytecodeDebugPatch": "",
"codeHashDebug": "33ddc42a153c6b9940924d989dcd107d7ff234ecbe9c494ece35ed06bd24450d",
"codeHashDebug": "b95c9acf088b090f5d9d34f28ab079cf22b9e53af8ae6864113c71172231ef4c",
"warnings": []
},
"DestroyAdd": {
Expand All @@ -97,12 +105,12 @@
"sourceFile": "token/fake_token_test.ral",
"sourceCodeHash": "c51d0d664dc1c0ff0e2c4f9c133bbd4d8cc6b8c55b44df42c98a19b43fe329e5",
"bytecodeDebugPatch": "",
"codeHashDebug": "88d74dcc19bfd075e97c90ab5f48d374f9ff982133d8257d4efc32305c5885b3",
"codeHashDebug": "52f971cb44d54a5353e94dc8db991d2726f76760af782e79bd8a66a9b5b294b7",
"warnings": []
},
"FungibleTokenUnimplemented": {
"sourceFile": "../packages/web3/std/fungible_token_unimplemented.ral",
"sourceCodeHash": "dc2d6de72bcb5f86cb30e0d3adf57566d8a9c99219843f357674bf71b2830aa4",
"sourceCodeHash": "df36ccc9548da207df716192341e864c7a8d0ea22ea9214b9cfad13bf324a0f6",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
Expand Down Expand Up @@ -144,21 +152,46 @@
},
"INFTCollection": {
"sourceFile": "../packages/web3/std/nft_collection_interface.ral",
"sourceCodeHash": "738a3440b686d94c9f7db58f23e22b7512d229540392b426ecb190b82db3fb4f",
"sourceCodeHash": "06648d34b65081500e038a943eb81d66301b43252b447d8cb96e0c8f2095edf8",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"INFTCollectionWithRoyalty": {
"sourceFile": "../packages/web3/std/nft_collection_with_royalty_interface.ral",
"sourceCodeHash": "6407fb10136b21e191c5cf1f695be89f9e427ce2b01c039dd525dac587f3fc05",
"sourceCodeHash": "9f325c739267074d442f0da4536fd68baeb9571ef220e29cca6bc173af24b232",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"InsertIntoMap": {
"sourceFile": "test/map.ral",
"sourceCodeHash": "f2f308aaa25fb2bfd984ce7e8f38ba846908a8c0e1a7396244d40e734327b77f",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"Main": {
"sourceFile": "add/add.ral",
"sourceCodeHash": "6c08da762c111145d8c876e36bb9f69dcbc86368a546b4c5bfe23f0f4db1975b",
"sourceCodeHash": "95b2d5b3755f9a00b616a8beaccf7b42da269ae57a25ec825c333395cd2a23bc",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": [
"The return values of the function \"Add.add\" are not used. If this is intentional, consider using anonymous variables to suppress this warning."
]
},
"MapTest": {
"sourceFile": "test/map.ral",
"sourceCodeHash": "f2f308aaa25fb2bfd984ce7e8f38ba846908a8c0e1a7396244d40e734327b77f",
"bytecodeDebugPatch": "=6-2+73=2-2+d8=2-2+69=11-1+a=50+7a7e0214696e73657274206174206d617020706174683a2000=56+7a7e0214696e73657274206174206d617020706174683a2000=227-1+9=124+7a7e021472656d6f7665206174206d617020706174683a2000=46+7a7e021472656d6f7665206174206d617020706174683a2000=6",
"codeHashDebug": "034dec32e1107787800ec476a31b11ed2f5c201c06aa9360d1a1a074d6b29098",
"warnings": [
"No external caller check for function \"MapTest.insert\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\"."
]
},
"MapValue": {
"sourceFile": "test/map.ral",
"sourceCodeHash": "f2f308aaa25fb2bfd984ce7e8f38ba846908a8c0e1a7396244d40e734327b77f",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
Expand All @@ -167,7 +200,7 @@
"sourceFile": "test/metadata.ral",
"sourceCodeHash": "79099ed139ae980aeb7010a648998ebeaf4ee4102cb76c40addb1a0d5dd9c684",
"bytecodeDebugPatch": "",
"codeHashDebug": "cade0de390b8e15960b263ac35aa013cb84f844bce6e3e53e6bfe2cc9166623f",
"codeHashDebug": "af0b3119565ef5f833f7b3514005a6b00ac9957d5a7779765edfc6e6ce6321c5",
"warnings": [
"No external caller check for function \"MetaData.foo\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\".",
"Private function \"MetaData.bar\" is not used",
Expand All @@ -179,13 +212,16 @@
"sourceCodeHash": "1fb25375808315eddf482b5e6bf58a9e4d6b1ee875c35f72c2b5692f024c8ba8",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
"warnings": [
"The return values of the function \"NFTCollectionWithRoyaltyTest.mint\" are not used. If this is intentional, consider using anonymous variables to suppress this warning.",
"The return values of the function \"NFTCollectionTest.mint\" are not used. If this is intentional, consider using anonymous variables to suppress this warning."
]
},
"NFTCollectionTest": {
"sourceFile": "nft/nft_collection_test.ral",
"sourceCodeHash": "ac1d8da86e8cb3e5c412c463d7cf0376db563d9cbc459eb034d3067dcaa2045e",
"bytecodeDebugPatch": "",
"codeHashDebug": "c84f4fd5d3fdee90b3421174c85011437a10c6f440e0c261b1f69ff77bc5ab70",
"codeHashDebug": "087f9292bb326a4d39a6fac09928cb25edf2837718f830f3a166a937f8724779",
"warnings": [
"No external caller check for function \"NFTCollectionTest.mint\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\"."
]
Expand All @@ -201,7 +237,7 @@
"sourceFile": "nft/nft_collection_with_royalty_test.ral",
"sourceCodeHash": "797c82a70c622eb1c8b06a1aade4e44050e9f198afd0496231b61c7cb7c4b1c7",
"bytecodeDebugPatch": "",
"codeHashDebug": "1c162da87d31289c9b392bd48767386336bb1d208101a8680d92b7dc74098ce0",
"codeHashDebug": "919808beff802a8043d62c5ff23249f22dbfdbd2fae56264f5f108af59eb171e",
"warnings": [
"No external caller check for function \"NFTCollectionWithRoyaltyTest.mint\". Please use \"checkCaller!(...)\" in the function or its callees, or disable it with \"@using(checkExternalCaller = false)\"."
]
Expand All @@ -213,11 +249,46 @@
"codeHashDebug": "4897086210869e612d82995b765a447c5319a55a56e8a0c3c07b4d9ca81e15b1",
"warnings": []
},
"OwnerOnly": {
"sourceFile": "test/owner.ral",
"sourceCodeHash": "fcf5f080df9ad62ec723c6127c3d9b153feff9669af0ecc46470526d46db1209",
"bytecodeDebugPatch": "",
"codeHashDebug": "c8ecfd7b7e1f3d0169d80e0abb59702516eeff301d47e0e7be70a631bd9414ca",
"warnings": []
},
"RemoveFromMap": {
"sourceFile": "test/map.ral",
"sourceCodeHash": "f2f308aaa25fb2bfd984ce7e8f38ba846908a8c0e1a7396244d40e734327b77f",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"Sub": {
"sourceFile": "sub/sub.ral",
"sourceCodeHash": "c8b669babea2f36bdb8f92afb17747bfb9eecb13ac17c5a02388426c91a4434e",
"bytecodeDebugPatch": "",
"codeHashDebug": "513645f5c95a28d55a51070f3d5c51edbda05a98f46b23cad59952e2ee4846a1",
"codeHashDebug": "3461ebfaca02ad0a3f587a5b67a461c0cbd82d14261407b1d9277ed4ad129234",
"warnings": []
},
"TemplateArrayVar": {
"sourceFile": "test/template_array_var.ral",
"sourceCodeHash": "9d4585b01c450c8602f797f63995d1a734a260ea5579d68b81ba84272c9de235",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"TestAssert": {
"sourceFile": "test/assert.ral",
"sourceCodeHash": "65f8387941a38e88ef555f5d0b4992dab390d97ff97b2473fdea45b8d58a74a5",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"TokenBalance": {
"sourceFile": "test/struct.ral",
"sourceCodeHash": "7690ad7d8b8c4b952fc6f439eb75648164532e055e6a47881882097c0600bb6a",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"TokenTest": {
Expand All @@ -227,11 +298,35 @@
"codeHashDebug": "a2800413eb2c5c23d48068db23df5f8eeaba04653e12c8ed59d589720d96dadd",
"warnings": []
},
"UpdateMapValue": {
"sourceFile": "test/map.ral",
"sourceCodeHash": "f2f308aaa25fb2bfd984ce7e8f38ba846908a8c0e1a7396244d40e734327b77f",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"UpdateUserAccount": {
"sourceFile": "test/struct.ral",
"sourceCodeHash": "7690ad7d8b8c4b952fc6f439eb75648164532e055e6a47881882097c0600bb6a",
"bytecodeDebugPatch": "",
"codeHashDebug": "",
"warnings": []
},
"UserAccount": {
"sourceFile": "test/struct.ral",
"sourceCodeHash": "7690ad7d8b8c4b952fc6f439eb75648164532e055e6a47881882097c0600bb6a",
"bytecodeDebugPatch": "",
"codeHashDebug": "4e9f7eac1b76eaa2268b5af6ebb5640252892dc170aad6c1ee7b639131a55816",
"warnings": [
"Function \"UserAccount.updateBalance\" updates fields. Please use \"@using(updateFields = true)\" for the function.",
"Function \"UserAccount.updateAddress\" updates fields. Please use \"@using(updateFields = true)\" for the function."
]
},
"Warnings": {
"sourceFile": "test/warnings.ral",
"sourceCodeHash": "974d69b74d3b88e9c5c23e8c8674d78dcd2e9b261fcae7be5adafddb777a3d01",
"bytecodeDebugPatch": "",
"codeHashDebug": "9a0c90d67d729a478062d6794cf7b75c27483c50f6fe2ad13c5ed8873ad1fde2",
"codeHashDebug": "873e095edb39cdb4b11b1157003daeacad06d259a938cd270e22b8e89b75feea",
"warnings": [
"Found unused variables in Warnings: foo.y",
"Found unused constants in Warnings: C",
Expand Down
Loading

0 comments on commit 5a5743c

Please sign in to comment.