fix bug with BT4's asset minting, and add new pools ipfs hash

centrifuge · Dec 12, 2023 · 0f41f98 · 0f41f98
1 parent 1a4fdc9
commit 0f41f98
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/tinlake-ui-deploy-to-dev.yml b/.github/workflows/tinlake-ui-deploy-to-dev.yml
@@ -140,7 +140,7 @@ jobs:
           NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io'
           NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033'
           NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction'
-          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'Qmcnh9ECTm5dQkt8sz3zSmiorxqfVfCEgLZ9MgwrVnyWpL'
+          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmddkTgX879eV9shYZ6R8MMKM6jjXS7RzpuBNrRt8anC7t'
           NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f'
           NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json'
           NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516'

diff --git a/.github/workflows/tinlake-ui-deploy-to-prod.yml b/.github/workflows/tinlake-ui-deploy-to-prod.yml
@@ -60,7 +60,7 @@ jobs:
           NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io'
           NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033'
           NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction'
-          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'Qmcnh9ECTm5dQkt8sz3zSmiorxqfVfCEgLZ9MgwrVnyWpL'
+          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmddkTgX879eV9shYZ6R8MMKM6jjXS7RzpuBNrRt8anC7t'
           NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f'
           NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json'
           NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516'

diff --git a/.github/workflows/tinlake-ui-deploy-to-staging.yml b/.github/workflows/tinlake-ui-deploy-to-staging.yml
@@ -136,7 +136,7 @@ jobs:
           NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io'
           NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033'
           NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction'
-          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'Qmcnh9ECTm5dQkt8sz3zSmiorxqfVfCEgLZ9MgwrVnyWpL'
+          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmddkTgX879eV9shYZ6R8MMKM6jjXS7RzpuBNrRt8anC7t'
           NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f'
           NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json'
           NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516'

diff --git a/.github/workflows/tinlake-ui-pull-request.yml b/.github/workflows/tinlake-ui-pull-request.yml
@@ -138,7 +138,7 @@ jobs:
           NEXT_PUBLIC_RWA_MARKET_ONBOARD_RETURN_URL: 'https://rwamarket.io'
           NEXT_PUBLIC_POOL_REGISTRY: '0xddf1c516cf87126c6c610b52fd8d609e67fb6033'
           NEXT_PUBLIC_POOLS_CONFIG: 'mainnetProduction'
-          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'Qmcnh9ECTm5dQkt8sz3zSmiorxqfVfCEgLZ9MgwrVnyWpL'
+          NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE: 'QmddkTgX879eV9shYZ6R8MMKM6jjXS7RzpuBNrRt8anC7t'
           NEXT_PUBLIC_PORTIS_KEY: 'bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f'
           NEXT_PUBLIC_REWARDS_TREE_URL: 'https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json'
           NEXT_PUBLIC_RPC_URL: 'https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516'

diff --git a/tinlake-ui/.env.mainnet-example b/tinlake-ui/.env.mainnet-example
@@ -10,7 +10,7 @@ NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS=0xeefba1e63905ef1d7acba5a8513c70307c1ce44
 NEXT_PUBLIC_ONBOARD_API_HOST=https://onboard-api.centrifuge.io/
 NEXT_PUBLIC_POOL_REGISTRY=0xddf1c516cf87126c6c610b52fd8d609e67fb6033
 NEXT_PUBLIC_POOLS_CONFIG=mainnetProduction
-NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE=Qmcnh9ECTm5dQkt8sz3zSmiorxqfVfCEgLZ9MgwrVnyWpL
+NEXT_PUBLIC_POOLS_IPFS_HASH_OVERRIDE=QmddkTgX879eV9shYZ6R8MMKM6jjXS7RzpuBNrRt8anC7t
 NEXT_PUBLIC_PORTIS_KEY=bc9e2922-2ebd-4e2b-86f6-7c7855bdf07f
 NEXT_PUBLIC_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-mainnet-production/latest.json
 NEXT_PUBLIC_RPC_URL=https://mainnet.infura.io/v3/ed5e0e19bcbc427cbf8f661736d44516

diff --git a/tinlake-ui/components/CreateNFT/index.tsx b/tinlake-ui/components/CreateNFT/index.tsx
@@ -55,7 +55,7 @@ const CreateNFT: React.FC = () => {
         tinlake.contractAddresses.ASSET_NFT!,
         value,
         riskGroup,
-        Math.floor(new Date(maturityDate).getTime() / 1000),
+        tinlake.contractAddresses['LEGACY_ACTIONS'] ? Math.floor(new Date(maturityDate).getTime() / 1000) : 0,
       ])
     ) as any
 

diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts
@@ -84,15 +84,15 @@ export function ProxyActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       nftRegistryAddress: string,
       price: string,
       riskGroup: string,
-      maturityDate?: number
+      maturityDate: number
     ) => {
       const proxy = this.contract('BORROWER_PROXY')
       let encoded = this.contract('ACTIONS').interface.encodeFunctionData(
         'mintIssuePriceLock(address,address,uint256,uint256)',
         [minterAddress, nftRegistryAddress, price, riskGroup]
       )
 
-      if (maturityDate) {
+      if (maturityDate > 0) {
         encoded = this.contract('ACTIONS').interface.encodeFunctionData(
           'mintIssuePriceLock(address,address,uint256,uint256,uint256)',
           [minterAddress, nftRegistryAddress, price, riskGroup, maturityDate]