diff --git a/.github/workflows/dapp-deploy.yml b/.github/workflows/dapp-deploy.yml index b63dfed..917ab57 100644 --- a/.github/workflows/dapp-deploy.yml +++ b/.github/workflows/dapp-deploy.yml @@ -133,11 +133,12 @@ jobs: - name: Add resource to whitelist env: - CONTRACT_ADDRESS: ${{ secrets.WEB3TELEGRAM_WHITELIST_CONTRACT_ADDRESS }} - WALLET_PRIVATE_KEY: ${{ secrets.WEB3TELEGRAM_APP_OWNER_PRIVATEKEY }} + CONTRACT_ADDRESS: ${{ vars.WEB3TELEGRAM_WHITELIST_CONTRACT_ADDRESS }} + PRIVATE_KEY: ${{ secrets.WEB3TELEGRAM_APP_OWNER_PRIVATEKEY }} run: | cd node_modules/whitelist-smart-contract - export ADDRESS_TO_ADD=$(cat ../../deployment-dapp/.app-address) && npm run addResourceToWhitelist + export ADDRESS_TO_ADD=$(cat ../../deployment-dapp/.app-address) + npm run addResourceToWhitelist -- --network ${{ vars.WHITELIST_NETWORK_NAME }} - name: Configure ENS if: ${{ vars.DAPP_ENS_NAME }} diff --git a/.github/workflows/dapp-release.yml b/.github/workflows/dapp-release.yml index 73adee5..5a6f9a3 100644 --- a/.github/workflows/dapp-release.yml +++ b/.github/workflows/dapp-release.yml @@ -118,11 +118,12 @@ jobs: - name: Add resource to whitelist env: - CONTRACT_ADDRESS: ${{ secrets.WEB3TELEGRAM_WHITELIST_CONTRACT_ADDRESS }} - WALLET_PRIVATE_KEY: ${{ secrets.WEB3TELEGRAM_APP_OWNER_PRIVATEKEY }} + CONTRACT_ADDRESS: ${{ vars.WEB3TELEGRAM_WHITELIST_CONTRACT_ADDRESS }} + PRIVATE_KEY: ${{ secrets.WEB3TELEGRAM_APP_OWNER_PRIVATEKEY }} run: | cd node_modules/whitelist-smart-contract - export ADDRESS_TO_ADD=$(cat ../../deployment-dapp/.app-address) && npm run addResourceToWhitelist + export ADDRESS_TO_ADD=$(cat ../../deployment-dapp/.app-address) + npm run addResourceToWhitelist -- --network ${{ vars.WHITELIST_NETWORK_NAME }} - name: Configure ENS if: ${{ vars.DAPP_ENS_NAME }} diff --git a/package-lock.json b/package-lock.json index d77ede0..3ae5739 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "prettier": "^2.8.4", "rimraf": "^5.0.7", "typescript": "^4.9.5", - "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#0.2.1" + "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#v1.0.0" } }, "node_modules/@adraffy/ens-normalize": { @@ -9566,12 +9566,19 @@ }, "node_modules/whitelist-smart-contract": { "version": "0.2.1", - "resolved": "git+ssh://git@github.com/iExecBlockchainComputing/whitelist-smart-contract.git#9a76574fa1fc8e748cffca25faa012f197d911e7", + "resolved": "git+ssh://git@github.com/iExecBlockchainComputing/whitelist-smart-contract.git#ce54919c4f9a677d82374986bf714036c5ea039c", "dev": true, "dependencies": { - "@openzeppelin/contracts": "^4.9.3" + "@openzeppelin/contracts": "^5.4.0" } }, + "node_modules/whitelist-smart-contract/node_modules/@openzeppelin/contracts": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.4.0.tgz", + "integrity": "sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A==", + "dev": true, + "license": "MIT" + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index d292cf0..ecea3f8 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,6 @@ "prettier": "^2.8.4", "rimraf": "^5.0.7", "typescript": "^4.9.5", - "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#0.2.1" + "whitelist-smart-contract": "github:iExecBlockchainComputing/whitelist-smart-contract#v1.0.0" } }